Skip to content

Commit 9eb183b

Browse files
josvazgjosvazg
committed
Move provider to upstream reconciler
Signed-off-by: jose.vazquez <[email protected]>
1 parent 3bed0df commit 9eb183b

18 files changed

+88
-99
lines changed

‎internal/controller/atlascustomrole/atlascustomrole_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ type AtlasCustomRoleReconciler struct {
5050
reconciler.AtlasReconciler
5151
Scheme *runtime.Scheme
5252
EventRecorder record.EventRecorder
53-
AtlasProvider atlas.Provider
5453
GlobalPredicates []predicate.Predicate
5554
ObjectDeletionProtection bool
5655
SubObjectDeletionProtection bool
@@ -71,10 +70,10 @@ func NewAtlasCustomRoleReconciler(
7170
Client: c.GetClient(),
7271
Log: logger.Named("controllers").Named("AtlasCustomRoles").Sugar(),
7372
GlobalSecretRef: globalSecretRef,
73+
AtlasProvider: atlasProvider,
7474
},
7575
Scheme: c.GetScheme(),
7676
EventRecorder: c.GetEventRecorderFor("AtlasCustomRoles"),
77-
AtlasProvider: atlasProvider,
7877
GlobalPredicates: predicates,
7978
ObjectDeletionProtection: deletionProtection,
8079
independentSyncPeriod: independentSyncPeriod,

‎internal/controller/atlascustomrole/atlascustomrole_controller_test.go

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -368,48 +368,48 @@ func TestAtlasCustomRoleReconciler_Reconcile(t *testing.T) {
368368
AtlasReconciler: reconciler.AtlasReconciler{
369369
Client: k8sClient,
370370
Log: zap.S(),
371-
},
372-
Scheme: testScheme,
373-
EventRecorder: record.NewFakeRecorder(10),
374-
AtlasProvider: &atlasmocks.TestProvider{
375-
SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) {
376-
if tt.sdkShouldError {
377-
return nil, fmt.Errorf("failed to create sdk")
378-
}
379-
cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t)
380-
cdrAPI.EXPECT().GetCustomDatabaseRole(mock.Anything, "testProjectID", "TestRoleName").
381-
Return(admin.GetCustomDatabaseRoleApiRequest{ApiService: cdrAPI})
382-
cdrAPI.EXPECT().GetCustomDatabaseRoleExecute(admin.GetCustomDatabaseRoleApiRequest{ApiService: cdrAPI}).
383-
Return(&admin.UserCustomDBRole{}, &http.Response{StatusCode: http.StatusNotFound}, nil)
384-
cdrAPI.EXPECT().CreateCustomDatabaseRole(mock.Anything, "testProjectID",
385-
mock.AnythingOfType("*admin.UserCustomDBRole")).
386-
Return(admin.CreateCustomDatabaseRoleApiRequest{ApiService: cdrAPI})
387-
cdrAPI.EXPECT().CreateCustomDatabaseRoleExecute(admin.CreateCustomDatabaseRoleApiRequest{ApiService: cdrAPI}).
388-
Return(nil, nil, nil)
371+
AtlasProvider: &atlasmocks.TestProvider{
372+
SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) {
373+
if tt.sdkShouldError {
374+
return nil, fmt.Errorf("failed to create sdk")
375+
}
376+
cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t)
377+
cdrAPI.EXPECT().GetCustomDatabaseRole(mock.Anything, "testProjectID", "TestRoleName").
378+
Return(admin.GetCustomDatabaseRoleApiRequest{ApiService: cdrAPI})
379+
cdrAPI.EXPECT().GetCustomDatabaseRoleExecute(admin.GetCustomDatabaseRoleApiRequest{ApiService: cdrAPI}).
380+
Return(&admin.UserCustomDBRole{}, &http.Response{StatusCode: http.StatusNotFound}, nil)
381+
cdrAPI.EXPECT().CreateCustomDatabaseRole(mock.Anything, "testProjectID",
382+
mock.AnythingOfType("*admin.UserCustomDBRole")).
383+
Return(admin.CreateCustomDatabaseRoleApiRequest{ApiService: cdrAPI})
384+
cdrAPI.EXPECT().CreateCustomDatabaseRoleExecute(admin.CreateCustomDatabaseRoleApiRequest{ApiService: cdrAPI}).
385+
Return(nil, nil, nil)
389386

390-
pAPI := mockadmin.NewProjectsApi(t)
391-
if tt.akoCustomRole.Spec.ExternalProjectRef != nil {
392-
grp := &admin.Group{
393-
Id: &tt.akoCustomRole.Spec.ExternalProjectRef.ID,
394-
Name: tt.akoCustomRole.Spec.ExternalProjectRef.ID,
387+
pAPI := mockadmin.NewProjectsApi(t)
388+
if tt.akoCustomRole.Spec.ExternalProjectRef != nil {
389+
grp := &admin.Group{
390+
Id: &tt.akoCustomRole.Spec.ExternalProjectRef.ID,
391+
Name: tt.akoCustomRole.Spec.ExternalProjectRef.ID,
392+
}
393+
pAPI.EXPECT().GetProject(context.Background(), tt.akoCustomRole.Spec.ExternalProjectRef.ID).
394+
Return(admin.GetProjectApiRequest{ApiService: pAPI})
395+
pAPI.EXPECT().GetProjectExecute(admin.GetProjectApiRequest{ApiService: pAPI}).
396+
Return(grp, nil, nil)
395397
}
396-
pAPI.EXPECT().GetProject(context.Background(), tt.akoCustomRole.Spec.ExternalProjectRef.ID).
397-
Return(admin.GetProjectApiRequest{ApiService: pAPI})
398-
pAPI.EXPECT().GetProjectExecute(admin.GetProjectApiRequest{ApiService: pAPI}).
399-
Return(grp, nil, nil)
400-
}
401-
return &atlas.ClientSet{SdkClient20231115008: &admin.APIClient{
402-
CustomDatabaseRolesApi: cdrAPI,
403-
ProjectsApi: pAPI,
404-
}}, nil
405-
},
406-
IsCloudGovFunc: func() bool {
407-
return false
408-
},
409-
IsSupportedFunc: func() bool {
410-
return tt.isSupported
398+
return &atlas.ClientSet{SdkClient20231115008: &admin.APIClient{
399+
CustomDatabaseRolesApi: cdrAPI,
400+
ProjectsApi: pAPI,
401+
}}, nil
402+
},
403+
IsCloudGovFunc: func() bool {
404+
return false
405+
},
406+
IsSupportedFunc: func() bool {
407+
return tt.isSupported
408+
},
411409
},
412410
},
411+
Scheme: testScheme,
412+
EventRecorder: record.NewFakeRecorder(10),
413413
}
414414

415415
result, err := r.Reconcile(context.Background(), ctrl.Request{

‎internal/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ var ErrOIDCNotEnabled = fmt.Errorf("'OIDCAuthType' field is set but OIDC authent
5454
// AtlasDatabaseUserReconciler reconciles an AtlasDatabaseUser object
5555
type AtlasDatabaseUserReconciler struct {
5656
reconciler.AtlasReconciler
57-
AtlasProvider atlas.Provider
5857
Scheme *runtime.Scheme
5958
EventRecorder record.EventRecorder
6059
GlobalPredicates []predicate.Predicate
@@ -287,8 +286,8 @@ func NewAtlasDatabaseUserReconciler(
287286
Client: c.GetClient(),
288287
Log: logger.Named("controllers").Named("AtlasDatabaseUser").Sugar(),
289288
GlobalSecretRef: globalSecretRef,
289+
AtlasProvider: atlasProvider,
290290
},
291-
AtlasProvider: atlasProvider,
292291
Scheme: c.GetScheme(),
293292
EventRecorder: c.GetEventRecorderFor("AtlasDatabaseUser"),
294293
GlobalPredicates: predicates,

‎internal/controller/atlasdatabaseuser/atlasdatabaseuser_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ func TestReconcile(t *testing.T) {
162162
Build()
163163
r := &AtlasDatabaseUserReconciler{
164164
AtlasReconciler: reconciler.AtlasReconciler{
165-
Client: k8sClient,
166-
Log: zaptest.NewLogger(t).Sugar(),
165+
Client: k8sClient,
166+
Log: zaptest.NewLogger(t).Sugar(),
167+
AtlasProvider: DefaultTestProvider(t),
167168
},
168-
AtlasProvider: DefaultTestProvider(t),
169169
EventRecorder: record.NewFakeRecorder(10),
170170
}
171171

‎internal/controller/atlasdatabaseuser/databaseuser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ func TestHandleDatabaseUser(t *testing.T) {
310310
Namespace: "default",
311311
Name: "secret",
312312
},
313+
AtlasProvider: tt.atlasProvider,
313314
},
314-
AtlasProvider: tt.atlasProvider,
315315
}
316316
ctx := &workflow.Context{
317317
Context: context.Background(),

‎internal/controller/atlasdeployment/atlasdeployment_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ type AtlasDeploymentReconciler struct {
6060
Scheme *runtime.Scheme
6161
GlobalPredicates []predicate.Predicate
6262
EventRecorder record.EventRecorder
63-
AtlasProvider atlas.Provider
6463
ObjectDeletionProtection bool
6564
SubObjectDeletionProtection bool
6665
independentSyncPeriod time.Duration
@@ -422,11 +421,11 @@ func NewAtlasDeploymentReconciler(
422421
Client: c.GetClient(),
423422
Log: suggaredLogger,
424423
GlobalSecretRef: globalSecretref,
424+
AtlasProvider: atlasProvider,
425425
},
426426
Scheme: c.GetScheme(),
427427
EventRecorder: c.GetEventRecorderFor("AtlasDeployment"),
428428
GlobalPredicates: predicates,
429-
AtlasProvider: atlasProvider,
430429
ObjectDeletionProtection: deletionProtection,
431430
independentSyncPeriod: independentSyncPeriod,
432431
}

‎internal/controller/atlasdeployment/atlasdeployment_controller_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ func TestCleanupBindings(t *testing.T) {
106106
}
107107
r := &AtlasDeploymentReconciler{
108108
AtlasReconciler: reconciler.AtlasReconciler{
109-
Log: testLog(t),
110-
Client: testK8sClient(),
109+
Log: testLog(t),
110+
Client: testK8sClient(),
111+
AtlasProvider: atlasProvider,
111112
},
112-
AtlasProvider: atlasProvider,
113113
}
114114
policy := testBackupPolicy() // deployment -> schedule -> policy
115115
require.NoError(t, r.Client.Create(context.Background(), policy))
@@ -140,10 +140,10 @@ func TestCleanupBindings(t *testing.T) {
140140
}
141141
r := &AtlasDeploymentReconciler{
142142
AtlasReconciler: reconciler.AtlasReconciler{
143-
Log: testLog(t),
144-
Client: testK8sClient(),
143+
Log: testLog(t),
144+
Client: testK8sClient(),
145+
AtlasProvider: atlasProvider,
145146
},
146-
AtlasProvider: atlasProvider,
147147
}
148148
policy := testBackupPolicy() // deployment + deployment2 -> schedule -> policy
149149
require.NoError(t, r.Client.Create(context.Background(), policy))
@@ -179,10 +179,10 @@ func TestCleanupBindings(t *testing.T) {
179179
}
180180
r := &AtlasDeploymentReconciler{
181181
AtlasReconciler: reconciler.AtlasReconciler{
182-
Log: testLog(t),
183-
Client: testK8sClient(),
182+
Log: testLog(t),
183+
Client: testK8sClient(),
184+
AtlasProvider: atlasProvider,
184185
},
185-
AtlasProvider: atlasProvider,
186186
}
187187
policy := testBackupPolicy() // deployment -> schedule + schedule2 -> policy
188188
require.NoError(t, r.Client.Create(context.Background(), policy))
@@ -556,10 +556,10 @@ func TestRegularClusterReconciliation(t *testing.T) {
556556

557557
reconciler := &AtlasDeploymentReconciler{
558558
AtlasReconciler: reconciler.AtlasReconciler{
559-
Client: k8sClient,
560-
Log: logger.Sugar(),
559+
Client: k8sClient,
560+
Log: logger.Sugar(),
561+
AtlasProvider: atlasProvider,
561562
},
562-
AtlasProvider: atlasProvider,
563563
EventRecorder: record.NewFakeRecorder(10),
564564
ObjectDeletionProtection: false,
565565
SubObjectDeletionProtection: false,
@@ -693,10 +693,10 @@ func TestServerlessInstanceReconciliation(t *testing.T) {
693693

694694
reconciler := &AtlasDeploymentReconciler{
695695
AtlasReconciler: reconciler.AtlasReconciler{
696-
Client: k8sClient,
697-
Log: logger.Sugar(),
696+
Client: k8sClient,
697+
Log: logger.Sugar(),
698+
AtlasProvider: atlasProvider,
698699
},
699-
AtlasProvider: atlasProvider,
700700
EventRecorder: record.NewFakeRecorder(10),
701701
ObjectDeletionProtection: false,
702702
SubObjectDeletionProtection: false,
@@ -818,10 +818,10 @@ func TestFlexClusterReconciliation(t *testing.T) {
818818

819819
reconciler := &AtlasDeploymentReconciler{
820820
AtlasReconciler: reconciler.AtlasReconciler{
821-
Client: k8sClient,
822-
Log: logger.Sugar(),
821+
Client: k8sClient,
822+
Log: logger.Sugar(),
823+
AtlasProvider: atlasProvider,
823824
},
824-
AtlasProvider: atlasProvider,
825825
EventRecorder: record.NewFakeRecorder(10),
826826
ObjectDeletionProtection: false,
827827
SubObjectDeletionProtection: false,
@@ -1002,10 +1002,10 @@ func TestDeletionReconciliation(t *testing.T) {
10021002

10031003
reconciler := &AtlasDeploymentReconciler{
10041004
AtlasReconciler: reconciler.AtlasReconciler{
1005-
Client: k8sClient,
1006-
Log: logger,
1005+
Client: k8sClient,
1006+
Log: logger,
1007+
AtlasProvider: atlasProvider,
10071008
},
1008-
AtlasProvider: atlasProvider,
10091009
EventRecorder: record.NewFakeRecorder(10),
10101010
ObjectDeletionProtection: false,
10111011
SubObjectDeletionProtection: false,
@@ -1455,10 +1455,10 @@ func TestChangeDeploymentType(t *testing.T) {
14551455

14561456
r := &AtlasDeploymentReconciler{
14571457
AtlasReconciler: reconciler.AtlasReconciler{
1458-
Client: k8sClient,
1459-
Log: logger.Sugar(),
1458+
Client: k8sClient,
1459+
Log: logger.Sugar(),
1460+
AtlasProvider: tt.atlasProvider,
14601461
},
1461-
AtlasProvider: tt.atlasProvider,
14621462
EventRecorder: record.NewFakeRecorder(10),
14631463
}
14641464
result, err := r.Reconcile(

‎internal/controller/atlasipaccesslist/atlasipaccesslist_controller.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ import (
4545
// AtlasIPAccessListReconciler reconciles a AtlasIPAccessList object
4646
type AtlasIPAccessListReconciler struct {
4747
reconciler.AtlasReconciler
48-
4948
Scheme *runtime.Scheme
5049
EventRecorder record.EventRecorder
51-
AtlasProvider atlas.Provider
5250
GlobalPredicates []predicate.Predicate
5351
ObjectDeletionProtection bool
5452
independentSyncPeriod time.Duration
@@ -151,10 +149,10 @@ func NewAtlasIPAccessListReconciler(
151149
Client: c.GetClient(),
152150
Log: logger.Named("controllers").Named("AtlasIPAccessList").Sugar(),
153151
GlobalSecretRef: globalSecretRef,
152+
AtlasProvider: atlasProvider,
154153
},
155154
Scheme: c.GetScheme(),
156155
EventRecorder: c.GetEventRecorderFor("AtlasIPAccessList"),
157-
AtlasProvider: atlasProvider,
158156
GlobalPredicates: predicates,
159157
ObjectDeletionProtection: deletionProtection,
160158
independentSyncPeriod: independentSyncPeriod,

‎internal/controller/atlasipaccesslist/atlasipaccesslist_controller_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,13 @@ func TestReconcile(t *testing.T) {
157157
logger := zaptest.NewLogger(t).Sugar()
158158
ctx := &workflow.Context{
159159
Context: context.Background(),
160-
Log: logger,
161160
}
162161
r := &AtlasIPAccessListReconciler{
163162
AtlasReconciler: reconciler.AtlasReconciler{
164-
Client: k8sClient,
165-
Log: logger,
163+
Client: k8sClient,
164+
Log: logger,
165+
AtlasProvider: tt.provider,
166166
},
167-
AtlasProvider: tt.provider,
168167
EventRecorder: record.NewFakeRecorder(10),
169168
}
170169
result, err := r.Reconcile(ctx.Context, tt.request)

‎internal/controller/atlasipaccesslist/state_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,13 @@ func TestHandleCustomResource(t *testing.T) {
347347
logger := zaptest.NewLogger(t).Sugar()
348348
ctx := &workflow.Context{
349349
Context: context.Background(),
350-
Log: logger,
351350
}
352351
r := &AtlasIPAccessListReconciler{
353352
AtlasReconciler: reconciler.AtlasReconciler{
354-
Client: k8sClient,
355-
Log: logger,
353+
Client: k8sClient,
354+
Log: logger,
355+
AtlasProvider: tt.provider,
356356
},
357-
AtlasProvider: tt.provider,
358357
EventRecorder: record.NewFakeRecorder(10),
359358
}
360359
result := r.handleCustomResource(ctx.Context, &tt.ipAccessList)

‎internal/controller/atlasnetworkcontainer/atlasnetworkcontainer_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import (
4242
// AtlasNetworkContainerReconciler reconciles a AtlasNetworkContainer object
4343
type AtlasNetworkContainerReconciler struct {
4444
reconciler.AtlasReconciler
45-
AtlasProvider atlas.Provider
4645
Scheme *runtime.Scheme
4746
EventRecorder record.EventRecorder
4847
GlobalPredicates []predicate.Predicate
@@ -123,10 +122,10 @@ func NewAtlasNetworkContainerReconciler(
123122
Client: c.GetClient(),
124123
Log: logger.Named("controllers").Named("AtlasNetworkContainer").Sugar(),
125124
GlobalSecretRef: globalSecretRef,
125+
AtlasProvider: atlasProvider,
126126
},
127127
Scheme: c.GetScheme(),
128128
EventRecorder: c.GetEventRecorderFor("AtlasNetworkContainer"),
129-
AtlasProvider: atlasProvider,
130129
GlobalPredicates: predicates,
131130
ObjectDeletionProtection: deletionProtection,
132131
independentSyncPeriod: independentSyncPeriod,

‎internal/controller/atlasnetworkcontainer/state_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -884,10 +884,10 @@ func getConditions(networkContainer *akov2.AtlasNetworkContainer) []api.Conditio
884884
func testReconciler(k8sClient client.Client, provider atlas.Provider, logger *zap.Logger) *AtlasNetworkContainerReconciler {
885885
return &AtlasNetworkContainerReconciler{
886886
AtlasReconciler: reconciler.AtlasReconciler{
887-
Client: k8sClient,
888-
Log: logger.Sugar(),
887+
Client: k8sClient,
888+
Log: logger.Sugar(),
889+
AtlasProvider: provider,
889890
},
890-
AtlasProvider: provider,
891891
EventRecorder: record.NewFakeRecorder(10),
892892
}
893893
}

‎internal/controller/atlasnetworkpeering/atlasnetworkpeering_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
// AtlasNetworkPeeringReconciler reconciles a AtlasNetworkPeering object
4848
type AtlasNetworkPeeringReconciler struct {
4949
reconciler.AtlasReconciler
50-
AtlasProvider atlas.Provider
5150
Scheme *runtime.Scheme
5251
EventRecorder record.EventRecorder
5352
GlobalPredicates []predicate.Predicate
@@ -69,10 +68,10 @@ func NewAtlasNetworkPeeringsReconciler(
6968
Client: c.GetClient(),
7069
Log: logger.Named("controllers").Named("AtlasNetworkPeering").Sugar(),
7170
GlobalSecretRef: globalSecretRef,
71+
AtlasProvider: atlasProvider,
7272
},
7373
Scheme: c.GetScheme(),
7474
EventRecorder: c.GetEventRecorderFor("AtlasPrivateEndpoint"),
75-
AtlasProvider: atlasProvider,
7675
GlobalPredicates: predicates,
7776
ObjectDeletionProtection: deletionProtection,
7877
independentSyncPeriod: independentSyncPeriod,

0 commit comments

Comments
 (0)