Skip to content

Commit 8514446

Browse files
Fixed unit tests
1 parent e2c8c21 commit 8514446

File tree

5 files changed

+911
-192
lines changed

5 files changed

+911
-192
lines changed

internal/controller/atlasorgsettings/atlasorgsettings_controller.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
1919
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
2020
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/indexer"
21+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/atlasorgsettings"
2122
ctrlstate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/state"
2223
mckpredicate "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/predicate"
2324
)
@@ -28,10 +29,14 @@ import (
2829
// +kubebuilder:rbac:groups=atlas.mongodb.com,namespace=default,resources=atlasorgsettings,verbs=get;list;watch;create;update;patch;delete
2930
// +kubebuilder:rbac:groups=atlas.mongodb.com,namespace=default,resources=atlasorgsettings/status,verbs=get;update;patch
3031
// +kubebuilder:rbac:groups=atlas.mongodb.com,namespace=default,resources=atlasorgsettings/finalizers,verbs=update
32+
33+
type serviceBuilderFunc func(*atlas.ClientSet) atlasorgsettings.AtlasOrgSettingsService
34+
3135
type AtlasOrgSettingsHandler struct {
3236
ctrlstate.StateHandler[akov2.AtlasOrgSettings]
3337
reconciler.AtlasReconciler
3438
deletionProtection bool
39+
serviceBuilder serviceBuilderFunc
3540
}
3641

3742
func NewAtlasOrgSettingsReconciler(
@@ -49,6 +54,10 @@ func NewAtlasOrgSettingsReconciler(
4954
Log: logger.Named("controllers").Named("AtlasOrgSettings").Sugar(),
5055
GlobalSecretRef: globalSecretRef,
5156
},
57+
deletionProtection: deletionProtection,
58+
serviceBuilder: func(clientSet *atlas.ClientSet) atlasorgsettings.AtlasOrgSettingsService {
59+
return atlasorgsettings.NewAtlasOrgSettingsService(clientSet.SdkClient20250312006.OrganizationsApi)
60+
},
5261
}
5362
return ctrlstate.NewStateReconciler(
5463
orgSettingsHandler,

internal/controller/atlasorgsettings/handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (h *AtlasOrgSettingsHandler) newReconcileContext(ctx context.Context, aos *
3838
return nil, err
3939
}
4040
return &reconcileContext{
41-
svc: atlasorgsettings.NewAtlasOrgSettingsService(atlasSdk.SdkClient20250312006.OrganizationsApi),
41+
svc: h.serviceBuilder(atlasSdk),
4242
aos: aos,
4343
}, nil
4444
}
@@ -59,11 +59,11 @@ func (h *AtlasOrgSettingsHandler) upsert(ctx context.Context, currentState, next
5959
return result.Error(currentState, fmt.Errorf("atlas returned OrgSettings which is nil after update"))
6060
}
6161

62-
return result.NextState(state.StateCreated, "Initialized")
62+
return result.NextState(nextState, "Initialized")
6363
}
6464

6565
func (h *AtlasOrgSettingsHandler) unmanage(orgID string) (ctrlstate.Result, error) {
66-
return result.NextState(state.StateDeleted, fmt.Sprintf("unmanaged is AtlasOrgSettings for orgID %s", orgID))
66+
return result.NextState(state.StateDeleted, fmt.Sprintf("unmanaged is AtlasOrgSettings for orgID %s.", orgID))
6767
}
6868

6969
func (h *AtlasOrgSettingsHandler) HandleInitial(ctx context.Context, aos *akov2.AtlasOrgSettings) (ctrlstate.Result, error) {

0 commit comments

Comments
 (0)