88
99 "github.com/stretchr/testify/assert"
1010 "github.com/stretchr/testify/require"
11+
12+ "github.com/thc1006/nephoran-intent-operator/pkg/auth"
1113 testutil "github.com/thc1006/nephoran-intent-operator/pkg/testutil/auth"
1214)
1315
@@ -20,15 +22,15 @@ func TestRBACManager_CreateRole(t *testing.T) {
2022
2123 tests := []struct {
2224 name string
23- role * Role
25+ role *auth. Role
2426 expectError bool
25- checkRole func (* testing.T , * Role )
27+ checkRole func(*testing.T, *auth. Role)
2628 }{
2729 {
2830 name: "Valid role creation",
29- role : rf . CreateBasicRole () ,
31+ role: &auth.Role{Name: "test-role", Description: "Test role"} ,
3032 expectError: false,
31- checkRole : func (t * testing.T , created * Role ) {
33+ checkRole: func(t *testing.T, created *auth. Role) {
3234 assert.NotEmpty(t, created.ID)
3335 assert.NotEmpty(t, created.Name)
3436 assert.NotZero(t, created.CreatedAt)
@@ -38,17 +40,17 @@ func TestRBACManager_CreateRole(t *testing.T) {
3840 },
3941 {
4042 name: "Role with hierarchical structure",
41- role : rf . CreateHierarchicalRole ([] string { "parent -role"}, [] string { "child- role" }) ,
43+ role: &auth.Role{Name: "hierarchical -role", Description: "Hierarchical role"},
4244 expectError: false,
43- checkRole : func (t * testing.T , created * Role ) {
45+ checkRole: func(t *testing.T, created *auth. Role) {
4446 assert.Contains(t, created.ParentRoles, "parent-role")
4547 assert.Contains(t, created.ChildRoles, "child-role")
4648 },
4749 },
4850 {
4951 name: "Role with duplicate name",
50- role : func () * Role {
51- role := rf . CreateBasicRole ()
52+ role: func() *auth. Role {
53+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
5254 role.Name = "duplicate-name"
5355 return role
5456 }(),
@@ -61,8 +63,8 @@ func TestRBACManager_CreateRole(t *testing.T) {
6163 },
6264 {
6365 name: "Role with empty name",
64- role : func () * Role {
65- role := rf . CreateBasicRole ()
66+ role: func() *auth. Role {
67+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
6668 role.Name = ""
6769 return role
6870 }(),
@@ -71,7 +73,7 @@ func TestRBACManager_CreateRole(t *testing.T) {
7173 }
7274
7375 // Create a role to test duplicate name scenario
74- duplicateRole := rf . CreateBasicRole ()
76+ duplicateRole := &auth.Role{Name: "basic-role", Description: "Basic role"}
7577 duplicateRole.Name = "duplicate-name"
7678 _, err := manager.CreateRole(context.Background(), duplicateRole)
7779 require.NoError(t, err)
@@ -96,7 +98,7 @@ func TestRBACManager_CreateRole(t *testing.T) {
9698 // Additional test for duplicate name
9799 if tt.name == "Role with duplicate name" {
98100 // Try to create another role with same name
99- duplicateRole2 := rf . CreateBasicRole ()
101+ duplicateRole2 := &auth.Role{Name: "basic-role", Description: "Basic role"}
100102 duplicateRole2.Name = "duplicate-name"
101103 _, err := manager.CreateRole(ctx, duplicateRole2)
102104 assert.Error(t, err, "Should not allow duplicate role names")
@@ -113,7 +115,7 @@ func TestRBACManager_GetRole(t *testing.T) {
113115 rf := testutil.NewRoleFactory()
114116
115117 // Create a test role
116- testRole := rf . CreateBasicRole ()
118+ testRole := &auth.Role{Name: "basic-role", Description: "Basic role"}
117119 createdRole, err := manager.CreateRole(context.Background(), testRole)
118120 require.NoError(t, err)
119121
@@ -122,14 +124,14 @@ func TestRBACManager_GetRole(t *testing.T) {
122124 roleID string
123125 expectError bool
124126 expectNil bool
125- checkRole func (* testing.T , * Role )
127+ checkRole func(*testing.T, *auth. Role)
126128 }{
127129 {
128130 name: "Get existing role by ID",
129131 roleID: createdRole.ID,
130132 expectError: false,
131133 expectNil: false,
132- checkRole : func (t * testing.T , role * Role ) {
134+ checkRole: func(t *testing.T, role *auth. Role) {
133135 assert.Equal(t, createdRole.ID, role.ID)
134136 assert.Equal(t, createdRole.Name, role.Name)
135137 assert.Equal(t, createdRole.Description, role.Description)
@@ -140,7 +142,7 @@ func TestRBACManager_GetRole(t *testing.T) {
140142 roleID: createdRole.Name,
141143 expectError: false,
142144 expectNil: false,
143- checkRole : func (t * testing.T , role * Role ) {
145+ checkRole: func(t *testing.T, role *auth. Role) {
144146 assert.Equal(t, createdRole.Name, role.Name)
145147 },
146148 },
@@ -189,27 +191,27 @@ func TestRBACManager_UpdateRole(t *testing.T) {
189191 rf := testutil.NewRoleFactory()
190192
191193 // Create a test role
192- originalRole := rf . CreateBasicRole ()
194+ originalRole := &auth.Role{Name: "basic-role", Description: "Basic role"}
193195 createdRole, err := manager.CreateRole(context.Background(), originalRole)
194196 require.NoError(t, err)
195197
196198 tests := []struct {
197199 name string
198200 roleID string
199- updates * Role
201+ updates *auth. Role
200202 expectError bool
201- checkRole func (* testing.T , * Role , * Role )
203+ checkRole func(*testing.T, *auth. Role, *auth. Role)
202204 }{
203205 {
204206 name: "Update role description",
205207 roleID: createdRole.ID,
206- updates : func () * Role {
208+ updates: func() *auth. Role {
207209 updated := *createdRole
208210 updated.Description = "Updated description"
209211 return &updated
210212 }(),
211213 expectError: false,
212- checkRole : func (t * testing.T , original , updated * Role ) {
214+ checkRole: func(t *testing.T, original, updated *auth. Role) {
213215 assert.Equal(t, "Updated description", updated.Description)
214216 assert.Equal(t, original.ID, updated.ID)
215217 assert.True(t, updated.UpdatedAt.After(original.UpdatedAt))
@@ -218,21 +220,21 @@ func TestRBACManager_UpdateRole(t *testing.T) {
218220 {
219221 name: "Update role permissions",
220222 roleID: createdRole.ID,
221- updates : func () * Role {
223+ updates: func() *auth. Role {
222224 updated := *createdRole
223225 updated.Permissions = []string{"read:advanced", "write:advanced"}
224226 return &updated
225227 }(),
226228 expectError: false,
227- checkRole : func (t * testing.T , original , updated * Role ) {
229+ checkRole: func(t *testing.T, original, updated *auth. Role) {
228230 assert.Contains(t, updated.Permissions, "read:advanced")
229231 assert.Contains(t, updated.Permissions, "write:advanced")
230232 },
231233 },
232234 {
233235 name: "Update non-existent role",
234236 roleID: "non-existent-role",
235- updates : rf . CreateBasicRole () ,
237+ updates: &auth.Role{Name: "basic-role", Description: "Basic role"} ,
236238 expectError: true,
237239 },
238240 {
@@ -244,7 +246,7 @@ func TestRBACManager_UpdateRole(t *testing.T) {
244246 {
245247 name: "Empty role ID",
246248 roleID: "",
247- updates : rf . CreateBasicRole () ,
249+ updates: &auth.Role{Name: "basic-role", Description: "Basic role"} ,
248250 expectError: true,
249251 },
250252 }
@@ -285,7 +287,7 @@ func TestRBACManager_DeleteRole(t *testing.T) {
285287 {
286288 name: "Delete existing role",
287289 setupRole: func() string {
288- role := rf . CreateBasicRole ()
290+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
289291 createdRole, err := manager.CreateRole(context.Background(), role)
290292 require.NoError(t, err)
291293 return createdRole.ID
@@ -301,7 +303,7 @@ func TestRBACManager_DeleteRole(t *testing.T) {
301303 {
302304 name: "Delete role with user assignments",
303305 setupRole: func() string {
304- role := rf . CreateBasicRole ()
306+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
305307 createdRole, err := manager.CreateRole(context.Background(), role)
306308 require.NoError(t, err)
307309
@@ -450,7 +452,7 @@ func TestRBACManager_AssignRoleToUser(t *testing.T) {
450452 rf := testutil.NewRoleFactory()
451453
452454 // Create test roles
453- basicRole := rf . CreateBasicRole ()
455+ basicRole := &auth.Role{Name: "basic-role", Description: "Basic role"}
454456 createdBasicRole, err := manager.CreateRole(context.Background(), basicRole)
455457 require.NoError(t, err)
456458
@@ -579,7 +581,7 @@ func TestRBACManager_RevokeRoleFromUser(t *testing.T) {
579581 rf := testutil.NewRoleFactory()
580582
581583 // Create and assign test role
582- role := rf . CreateBasicRole ()
584+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
583585 createdRole, err := manager.CreateRole(context.Background(), role)
584586 require.NoError(t, err)
585587
@@ -828,7 +830,7 @@ func TestRBACManager_HierarchicalRoles(t *testing.T) {
828830 require.NoError(t, err)
829831
830832 // Super admin role that inherits from admin
831- superAdminRole := rf . CreateBasicRole ()
833+ superAdminRole := &auth.Role{Name: "basic-role", Description: "Basic role"}
832834 superAdminRole.Name = "superadmin"
833835 superAdminRole.ParentRoles = []string{createdAdminRole.ID}
834836 createdSuperAdminRole, err := manager.CreateRole(ctx, superAdminRole)
@@ -929,7 +931,7 @@ func TestRBACManager_ListOperations(t *testing.T) {
929931 ctx := context.Background()
930932
931933 // Create roles
932- role1 := rf . CreateBasicRole ()
934+ role1 := &auth.Role{Name: "basic-role", Description: "Basic role"}
933935 role1.Name = "test-role-1"
934936 createdRole1, err := manager.CreateRole(ctx, role1)
935937 require.NoError(t, err)
@@ -959,7 +961,7 @@ func TestRBACManager_ListOperations(t *testing.T) {
959961 return manager.ListRoles(ctx)
960962 },
961963 checkFunc: func(t *testing.T, result interface{}) {
962- roles := result .([]* Role )
964+ roles := result.([]*auth. Role)
963965 assert.GreaterOrEqual(t, len(roles), 2) // At least our test roles plus defaults
964966
965967 roleNames := make([]string, len(roles))
@@ -1066,7 +1068,7 @@ func BenchmarkRBACManager_GetUserRoles(b *testing.B) {
10661068
10671069 // Create and assign multiple roles
10681070 for i := 0; i < 10; i++ {
1069- role := rf . CreateBasicRole ()
1071+ role := &auth.Role{Name: "basic-role", Description: "Basic role"}
10701072 createdRole, err := manager.CreateRole(ctx, role)
10711073 if err != nil {
10721074 b.Fatal(err)
0 commit comments