Merge pull request #1890 from devopsmindset/kinesis-fix-1751

crossplane-contrib · Oct 10, 2023 · 1abd520 · 1abd520
2 parents fd9a103 + ab907bf
commit 1abd520
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/pkg/controller/kinesis/stream/setup.go b/pkg/controller/kinesis/stream/setup.go
@@ -57,6 +57,10 @@ func SetupStream(mgr ctrl.Manager, o controller.Options) error {
 
 	reconcilerOpts := []managed.ReconcilerOption{
 		managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
+		managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
+		managed.WithInitializers(
+			managed.NewDefaultProviderConfig(mgr.GetClient()),
+			managed.NewNameAsExternalName(mgr.GetClient())),
 		managed.WithPollInterval(o.PollInterval),
 		managed.WithLogger(o.Logger.WithValues("controller", name)),
 		managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
@@ -123,7 +127,6 @@ func postCreate(_ context.Context, cr *svcapitypes.Stream, obj *svcsdk.CreateStr
 	if err != nil {
 		return managed.ExternalCreation{}, err
 	}
-	meta.SetExternalName(cr, cr.Name)
 	return managed.ExternalCreation{ExternalNameAssigned: true}, nil
 }
 
@@ -188,7 +191,7 @@ func (u *updater) update(ctx context.Context, mg resource.Managed) (managed.Exte
 
 	// we need information from stream for decisions
 	obj, err := u.client.DescribeStreamWithContext(ctx, &svcsdk.DescribeStreamInput{
-		StreamName: &cr.Name,
+		StreamName: awsclients.String(meta.GetExternalName(cr)),
 	})
 	if err != nil {
 		return managed.ExternalUpdate{}, awsclients.Wrap(err, errCreate)
@@ -375,7 +378,7 @@ func (u *updater) ActiveShards(cr *svcapitypes.Stream) (int64, error) {
 	var count int64
 
 	shards, err := u.client.ListShards(&svcsdk.ListShardsInput{
-		StreamName: &cr.Name,
+		StreamName: awsclients.String(meta.GetExternalName(cr)),
 	})
 	if err != nil {
 		return count, err
@@ -394,7 +397,7 @@ func (u *updater) ActiveShards(cr *svcapitypes.Stream) (int64, error) {
 func (u *updater) ListTags(cr *svcapitypes.Stream) (*svcsdk.ListTagsForStreamOutput, error) {
 
 	tags, err := u.client.ListTagsForStream(&svcsdk.ListTagsForStreamInput{
-		StreamName: &cr.Name,
+		StreamName: awsclients.String(meta.GetExternalName(cr)),
 	})
 	if err != nil {
 		return nil, err