Skip to content

Commit

Permalink
fix(mq): Use external name instead of metadata.name for user
Browse files Browse the repository at this point in the history
Signed-off-by: Maximilian Blatt (external expert on behalf of DB Netz) <maximilian.blatt-extern@deutschebahn.com>
  • Loading branch information
MisterMX committed Nov 22, 2023
1 parent 367e1be commit 16b93ff
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkg/controller/mq/user/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func SetupUser(mgr ctrl.Manager, o controller.Options) error {
}

reconcilerOpts := []managed.ReconcilerOption{
managed.WithInitializers(),
managed.WithInitializers(managed.NewNameAsExternalName(mgr.GetClient())),
managed.WithCriticalAnnotationUpdater(custommanaged.NewRetryingCriticalAnnotationUpdater(mgr.GetClient())),
managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
managed.WithPollInterval(o.PollInterval),
Expand Down Expand Up @@ -142,7 +142,7 @@ func (e *custom) preCreate(ctx context.Context, cr *svcapitypes.User, obj *svcsd
return errors.Wrap(err, "cannot get password from the given secret")
}
obj.Password = pointer.ToOrNilIfZeroValue(pw)
obj.Username = pointer.ToOrNilIfZeroValue(cr.Name)
obj.Username = pointer.ToOrNilIfZeroValue(meta.GetExternalName(cr))
obj.BrokerId = cr.Spec.ForProvider.BrokerID
return nil
}
Expand All @@ -151,13 +151,12 @@ func postCreate(_ context.Context, cr *svcapitypes.User, obj *svcsdk.CreateUserO
if err != nil {
return managed.ExternalCreation{}, err
}
meta.SetExternalName(cr, cr.Name)
return cre, nil
}

func (e *custom) preUpdate(ctx context.Context, cr *svcapitypes.User, obj *svcsdk.UpdateUserRequest) error {
obj.BrokerId = cr.Spec.ForProvider.BrokerID
obj.Username = pointer.ToOrNilIfZeroValue(cr.Name)
obj.Username = pointer.ToOrNilIfZeroValue(meta.GetExternalName(cr))

pw, pwchanged, err := mq.GetPassword(ctx, e.kube, &cr.Spec.ForProvider.PasswordSecretRef, cr.Spec.WriteConnectionSecretToReference)
if err != nil {
Expand Down

0 comments on commit 16b93ff

Please sign in to comment.