Skip to content

Commit 98a62d8

Browse files
filipcirtogfilipcirtog
authored
Legacy ConnectionSecret refactoring (#2705)
* connectionsecret refactoring to free-up name * linter
1 parent 9d9bc30 commit 98a62d8

23 files changed

+92
-93
lines changed

‎internal/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
4040
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
4141
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
42-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
4342
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/customresource"
4443
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
4544
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/statushandler"
@@ -142,7 +141,7 @@ func (r *AtlasDatabaseUserReconciler) terminate(
142141

143142
// unmanage remove finalizer and release resource
144143
func (r *AtlasDatabaseUserReconciler) unmanage(ctx *workflow.Context, projectID string, atlasDatabaseUser *akov2.AtlasDatabaseUser) (ctrl.Result, error) {
145-
err := connectionsecret.RemoveStaleSecretsByUserName(ctx.Context, r.Client, projectID, atlasDatabaseUser.Spec.Username, *atlasDatabaseUser, r.Log)
144+
err := RemoveStaleSecretsByUserName(ctx.Context, r.Client, projectID, atlasDatabaseUser.Spec.Username, *atlasDatabaseUser, r.Log)
146145
if err != nil {
147146
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotDeleted, true, err)
148147
}

internal/controller/connectionsecret/connectionsecrets.go renamed to internal/controller/atlasdatabaseuser/connectionsecrets.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package connectionsecret
15+
package atlasdatabaseuser
1616

1717
import (
1818
"context"
@@ -26,6 +26,7 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727

2828
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
29+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
2930
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
3031
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
3132
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/stringutil"
@@ -37,7 +38,7 @@ const ConnectionSecretsEnsuredEvent = "ConnectionSecretsEnsured"
3738

3839
func ReapOrphanConnectionSecrets(ctx context.Context, k8sClient client.Client, projectID, namespace string, projectDeploymentNames []string) ([]string, error) {
3940
secretList := &corev1.SecretList{}
40-
labelSelector := labels.SelectorFromSet(labels.Set{TypeLabelKey: CredLabelVal, ProjectLabelKey: projectID})
41+
labelSelector := labels.SelectorFromSet(labels.Set{secretservice.TypeLabelKey: secretservice.CredLabelVal, secretservice.ProjectLabelKey: projectID})
4142
err := k8sClient.List(context.Background(), secretList, &client.ListOptions{
4243
LabelSelector: labelSelector,
4344
Namespace: namespace,
@@ -48,7 +49,7 @@ func ReapOrphanConnectionSecrets(ctx context.Context, k8sClient client.Client, p
4849

4950
removedOrphanSecrets := []string{}
5051
for _, secret := range secretList.Items {
51-
clusterName, ok := secret.Labels[ClusterLabelKey]
52+
clusterName, ok := secret.Labels[secretservice.ClusterLabelKey]
5253
if !ok {
5354
continue
5455
}
@@ -98,7 +99,7 @@ func createOrUpdateConnectionSecretsFromDeploymentSecrets(ctx *workflow.Context,
9899
if err != nil {
99100
return workflow.Terminate(workflow.DatabaseUserConnectionSecretsNotCreated, err)
100101
}
101-
data := ConnectionData{
102+
data := secretservice.ConnectionData{
102103
DBUserName: dbUser.Spec.Username,
103104
Password: password,
104105
ConnURL: di.ConnURL,
@@ -107,7 +108,7 @@ func createOrUpdateConnectionSecretsFromDeploymentSecrets(ctx *workflow.Context,
107108
FillPrivateConns(di, &data)
108109

109110
var secretName string
110-
if secretName, err = Ensure(ctx.Context, k8sClient, dbUser.Namespace, project.Name, project.ID, di.Name, data); err != nil {
111+
if secretName, err = secretservice.Ensure(ctx.Context, k8sClient, dbUser.Namespace, project.Name, project.ID, di.Name, data); err != nil {
111112
return workflow.Terminate(workflow.DatabaseUserConnectionSecretsNotCreated, err)
112113
}
113114
secrets = append(secrets, secretName)
@@ -146,12 +147,12 @@ func removeStaleByScope(ctx *workflow.Context, k8sClient client.Client, projectI
146147
if len(scopes) == 0 {
147148
return nil
148149
}
149-
secrets, err := ListByUserName(ctx.Context, k8sClient, user.Namespace, projectID, user.Spec.Username)
150+
secrets, err := secretservice.ListByUserName(ctx.Context, k8sClient, user.Namespace, projectID, user.Spec.Username)
150151
if err != nil {
151152
return err
152153
}
153154
for i, s := range secrets {
154-
deployment, ok := s.Labels[ClusterLabelKey]
155+
deployment, ok := s.Labels[secretservice.ClusterLabelKey]
155156
if !ok {
156157
continue
157158
}
@@ -167,7 +168,7 @@ func removeStaleByScope(ctx *workflow.Context, k8sClient client.Client, projectI
167168

168169
// RemoveStaleSecretsByUserName removes the stale secrets when the database user name changes (as it's used as a part of Secret name)
169170
func RemoveStaleSecretsByUserName(ctx context.Context, k8sClient client.Client, projectID, userName string, user akov2.AtlasDatabaseUser, log *zap.SugaredLogger) error {
170-
secrets, err := ListByUserName(ctx, k8sClient, user.Namespace, projectID, userName)
171+
secrets, err := secretservice.ListByUserName(ctx, k8sClient, user.Namespace, projectID, userName)
171172
if err != nil {
172173
return err
173174
}
@@ -188,23 +189,23 @@ func RemoveStaleSecretsByUserName(ctx context.Context, k8sClient client.Client,
188189
return lastError
189190
}
190191

191-
func FillPrivateConns(conn deployment.Connection, data *ConnectionData) {
192+
func FillPrivateConns(conn deployment.Connection, data *secretservice.ConnectionData) {
192193
if conn.PrivateURL != "" {
193-
data.PrivateConnURLs = append(data.PrivateConnURLs, PrivateLinkConnURLs{
194+
data.PrivateConnURLs = append(data.PrivateConnURLs, secretservice.PrivateLinkConnURLs{
194195
PvtConnURL: conn.PrivateURL,
195196
PvtSrvConnURL: conn.SrvPrivateURL,
196197
})
197198
}
198199

199200
if conn.Serverless {
200201
for _, pe := range conn.PrivateEndpoints {
201-
data.PrivateConnURLs = append(data.PrivateConnURLs, PrivateLinkConnURLs{
202+
data.PrivateConnURLs = append(data.PrivateConnURLs, secretservice.PrivateLinkConnURLs{
202203
PvtSrvConnURL: pe.ServerURL,
203204
})
204205
}
205206
} else {
206207
for _, pe := range conn.PrivateEndpoints {
207-
data.PrivateConnURLs = append(data.PrivateConnURLs, PrivateLinkConnURLs{
208+
data.PrivateConnURLs = append(data.PrivateConnURLs, secretservice.PrivateLinkConnURLs{
208209
PvtConnURL: pe.URL,
209210
PvtSrvConnURL: pe.ServerURL,
210211
PvtShardConnURL: pe.ShardURL,

internal/controller/connectionsecret/connectionsecrets_test.go renamed to internal/controller/atlasdatabaseuser/connectionsecrets_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package connectionsecret_test
15+
package atlasdatabaseuser
1616

1717
import (
1818
"context"
@@ -28,7 +28,7 @@ import (
2828
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2929

3030
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
31-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
31+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
3232
)
3333

3434
const (
@@ -72,7 +72,7 @@ func TestReapOrphanConnectionSecrets(t *testing.T) {
7272
fakeClient := fake.NewClientBuilder().
7373
WithScheme(scheme).
7474
WithObjects(tc.objects...).Build()
75-
removedOrphans, err := connectionsecret.ReapOrphanConnectionSecrets(
75+
removedOrphans, err := ReapOrphanConnectionSecrets(
7676
context.Background(),
7777
fakeClient,
7878
testProjectID,
@@ -96,9 +96,9 @@ func matchingSecrets() []client.Object {
9696
Name: "secret1",
9797
Namespace: testNamespace,
9898
Labels: map[string]string{
99-
connectionsecret.ClusterLabelKey: "cluster1",
100-
connectionsecret.ProjectLabelKey: testProjectID,
101-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
99+
secretservice.ClusterLabelKey: "cluster1",
100+
secretservice.ProjectLabelKey: testProjectID,
101+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
102102
},
103103
},
104104
},
@@ -108,9 +108,9 @@ func matchingSecrets() []client.Object {
108108
Name: "secret2",
109109
Namespace: testNamespace,
110110
Labels: map[string]string{
111-
connectionsecret.ClusterLabelKey: "serverless2",
112-
connectionsecret.ProjectLabelKey: testProjectID,
113-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
111+
secretservice.ClusterLabelKey: "serverless2",
112+
secretservice.ProjectLabelKey: testProjectID,
113+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
114114
},
115115
},
116116
},
@@ -124,9 +124,9 @@ func nonMatchingSecrets() []client.Object {
124124
Name: "secret3",
125125
Namespace: testNamespace,
126126
Labels: map[string]string{
127-
connectionsecret.ClusterLabelKey: "cluster3",
128-
connectionsecret.ProjectLabelKey: testProjectID,
129-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
127+
secretservice.ClusterLabelKey: "cluster3",
128+
secretservice.ProjectLabelKey: testProjectID,
129+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
130130
},
131131
},
132132
},
@@ -136,9 +136,9 @@ func nonMatchingSecrets() []client.Object {
136136
Name: "secret4",
137137
Namespace: testNamespace,
138138
Labels: map[string]string{
139-
connectionsecret.ClusterLabelKey: "serverless4",
140-
connectionsecret.ProjectLabelKey: testProjectID,
141-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
139+
secretservice.ClusterLabelKey: "serverless4",
140+
secretservice.ProjectLabelKey: testProjectID,
141+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
142142
},
143143
},
144144
},

‎internal/controller/atlasdatabaseuser/databaseuser.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
2727
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
28-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
2928
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/customresource"
3029
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
3130
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/timeutil"
@@ -89,7 +88,7 @@ func (r *AtlasDatabaseUserReconciler) dbuLifeCycle(ctx *workflow.Context, dbUser
8988
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserInvalidSpec, false, err)
9089
}
9190
if expired {
92-
err = connectionsecret.RemoveStaleSecretsByUserName(ctx.Context, r.Client, atlasProject.ID, atlasDatabaseUser.Spec.Username, *atlasDatabaseUser, r.Log)
91+
err = RemoveStaleSecretsByUserName(ctx.Context, r.Client, atlasProject.ID, atlasDatabaseUser.Spec.Username, *atlasDatabaseUser, r.Log)
9392
if err != nil {
9493
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotDeleted, true, err)
9594
}
@@ -139,7 +138,7 @@ func (r *AtlasDatabaseUserReconciler) create(ctx *workflow.Context, dbUserServic
139138
}
140139

141140
if wasRenamed(atlasDatabaseUser) {
142-
err = connectionsecret.RemoveStaleSecretsByUserName(ctx.Context, r.Client, projectID, atlasDatabaseUser.Status.UserName, *atlasDatabaseUser, r.Log)
141+
err = RemoveStaleSecretsByUserName(ctx.Context, r.Client, projectID, atlasDatabaseUser.Status.UserName, *atlasDatabaseUser, r.Log)
143142
if err != nil {
144143
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotDeleted, true, err)
145144
}
@@ -205,7 +204,7 @@ func (r *AtlasDatabaseUserReconciler) readiness(ctx *workflow.Context, deploymen
205204
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.Internal, true, err)
206205
}
207206

208-
removedOrphanSecrets, err := connectionsecret.ReapOrphanConnectionSecrets(
207+
removedOrphanSecrets, err := ReapOrphanConnectionSecrets(
209208
ctx.Context, r.Client, atlasProject.ID, atlasDatabaseUser.Namespace, allDeploymentNames)
210209
if err != nil {
211210
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.Internal, true, err)
@@ -244,7 +243,7 @@ func (r *AtlasDatabaseUserReconciler) readiness(ctx *workflow.Context, deploymen
244243
}
245244

246245
// TODO refactor connectionsecret package to follow state machine approach
247-
result := connectionsecret.CreateOrUpdateConnectionSecrets(ctx, r.Client, deploymentService, r.EventRecorder, atlasProject, *atlasDatabaseUser)
246+
result := CreateOrUpdateConnectionSecrets(ctx, r.Client, deploymentService, r.EventRecorder, atlasProject, *atlasDatabaseUser)
248247
if !result.IsOk() {
249248
return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotCreated, true, errors.New(result.GetMessage()))
250249
}

‎internal/controller/atlasdatafederation/connectionsecrets.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
2626
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
27-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
27+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
2828
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
2929
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/stringutil"
3030
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/datafederation"
@@ -77,7 +77,7 @@ func (r *AtlasDataFederationReconciler) ensureConnectionSecrets(ctx *workflow.Co
7777
var connURLs []string
7878
for _, host := range connectionHosts {
7979
baseURL := fmt.Sprintf("mongodb://%s?ssl=true", host)
80-
connURL, err := connectionsecret.AddCredentialsToConnectionURL(baseURL, dbUser.Spec.Username, password)
80+
connURL, err := secretservice.AddCredentialsToConnectionURL(baseURL, dbUser.Spec.Username, password)
8181
if err != nil {
8282
ctx.Log.Debugw("Failed to construct connection URL", "host", host, "error", err)
8383
continue
@@ -86,15 +86,15 @@ func (r *AtlasDataFederationReconciler) ensureConnectionSecrets(ctx *workflow.Co
8686
ctx.Log.Debugw("Connection URL created", "url", connURL)
8787
}
8888

89-
data := connectionsecret.ConnectionData{
89+
data := secretservice.ConnectionData{
9090
DBUserName: dbUser.Spec.Username,
9191
Password: password,
9292
ConnURL: strings.Join(connURLs, ","),
9393
}
9494

9595
ctx.Log.Debugw("Creating a connection Secret", "data", data)
9696

97-
secretName, err := connectionsecret.Ensure(ctx.Context, r.Client, dbUser.Namespace, project.Spec.Name, project.ID(), df.Spec.Name, data)
97+
secretName, err := secretservice.Ensure(ctx.Context, r.Client, dbUser.Namespace, project.Spec.Name, project.ID(), df.Spec.Name, data)
9898
if err != nil {
9999
return workflow.Terminate(workflow.DeploymentConnectionSecretsNotCreated, err)
100100
}

‎internal/controller/atlasdatafederation/datafederation_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
3838
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
3939
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
40-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
4140
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/customresource"
4241
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/reconciler"
42+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
4343
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/statushandler"
4444
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
4545
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/indexer"
@@ -308,7 +308,7 @@ func (r *AtlasDataFederationReconciler) deleteConnectionSecrets(ctx context.Cont
308308
log = log.With("projectID", project.Status.ID, "dataFederationName", dataFederation.Spec.Name)
309309

310310
// We always remove the connection secrets even if the deployment is not removed from Atlas
311-
secrets, err := connectionsecret.ListByDeploymentName(ctx, r.Client, dataFederation.Namespace, project.ID(), dataFederation.Spec.Name)
311+
secrets, err := secretservice.ListByDeploymentName(ctx, r.Client, dataFederation.Namespace, project.ID(), dataFederation.Spec.Name)
312312
if err != nil {
313313
return fmt.Errorf("failed to find connection secrets for the user: %w", err)
314314
}

‎internal/controller/atlasdatafederation/datafederation_controller_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
3535
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
3636
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
37-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
3837
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/customresource"
38+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
3939
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
4040
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/indexer"
4141
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/translation"
@@ -145,19 +145,19 @@ func TestDeleteConnectionSecrets(t *testing.T) {
145145
ObjectMeta: metav1.ObjectMeta{
146146
Name: "fooSecret", Namespace: "bar",
147147
Labels: map[string]string{
148-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
149-
connectionsecret.ProjectLabelKey: "123",
150-
connectionsecret.ClusterLabelKey: "data-federation-name",
148+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
149+
secretservice.ProjectLabelKey: "123",
150+
secretservice.ClusterLabelKey: "data-federation-name",
151151
},
152152
},
153153
},
154154
{
155155
ObjectMeta: metav1.ObjectMeta{
156156
Name: "keepSecret", Namespace: "bar",
157157
Labels: map[string]string{
158-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
159-
connectionsecret.ProjectLabelKey: "123",
160-
connectionsecret.ClusterLabelKey: "some-cluster",
158+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
159+
secretservice.ProjectLabelKey: "123",
160+
secretservice.ClusterLabelKey: "some-cluster",
161161
},
162162
},
163163
},
@@ -167,9 +167,9 @@ func TestDeleteConnectionSecrets(t *testing.T) {
167167
ObjectMeta: metav1.ObjectMeta{
168168
Name: "keepSecret", Namespace: "bar",
169169
Labels: map[string]string{
170-
connectionsecret.TypeLabelKey: connectionsecret.CredLabelVal,
171-
connectionsecret.ProjectLabelKey: "123",
172-
connectionsecret.ClusterLabelKey: "some-cluster",
170+
secretservice.TypeLabelKey: secretservice.CredLabelVal,
171+
secretservice.ProjectLabelKey: "123",
172+
secretservice.ClusterLabelKey: "some-cluster",
173173
},
174174
},
175175
},

‎internal/controller/atlasdeployment/advanced_deployment.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
2929
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
3030
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
31-
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/connectionsecret"
3231
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/customresource"
32+
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/secretservice"
3333
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow"
3434
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/indexer"
3535
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/stringutil"
@@ -187,21 +187,21 @@ func (r *AtlasDeploymentReconciler) ensureConnectionSecrets(ctx *workflow.Contex
187187
return err
188188
}
189189

190-
data := connectionsecret.ConnectionData{
190+
data := secretservice.ConnectionData{
191191
DBUserName: dbUser.Spec.Username,
192192
Password: password,
193193
ConnURL: connection.Standard,
194194
SrvConnURL: connection.StandardSrv,
195195
}
196196
if connection.Private != "" {
197-
data.PrivateConnURLs = append(data.PrivateConnURLs, connectionsecret.PrivateLinkConnURLs{
197+
data.PrivateConnURLs = append(data.PrivateConnURLs, secretservice.PrivateLinkConnURLs{
198198
PvtConnURL: connection.Private,
199199
PvtSrvConnURL: connection.PrivateSrv,
200200
})
201201
}
202202

203203
for _, pe := range connection.PrivateEndpoint {
204-
data.PrivateConnURLs = append(data.PrivateConnURLs, connectionsecret.PrivateLinkConnURLs{
204+
data.PrivateConnURLs = append(data.PrivateConnURLs, secretservice.PrivateLinkConnURLs{
205205
PvtConnURL: pe.ConnectionString,
206206
PvtSrvConnURL: pe.SRVConnectionString,
207207
PvtShardConnURL: pe.SRVShardOptimizedConnectionString,
@@ -214,7 +214,7 @@ func (r *AtlasDeploymentReconciler) ensureConnectionSecrets(ctx *workflow.Contex
214214
}
215215

216216
ctx.Log.Debugw("Creating a connection Secret", "data", data)
217-
secretName, err := connectionsecret.Ensure(ctx.Context, r.Client, dbUser.Namespace, project.Name, deploymentInAKO.GetProjectID(), deploymentInAKO.GetName(), data)
217+
secretName, err := secretservice.Ensure(ctx.Context, r.Client, dbUser.Namespace, project.Name, deploymentInAKO.GetProjectID(), deploymentInAKO.GetName(), data)
218218
if err != nil {
219219
return err
220220
}

0 commit comments

Comments
 (0)