Merge pull request #1019 from haarchri/feat-glue

feat(glue): followup cleanup cr.name to external.name
crossplane-contrib · Jan 5, 2022 · f097d7d · f097d7d
2 parents 17f1ae9 + b6142d8
commit f097d7d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/pkg/controller/glue/classifier/setup.go b/pkg/controller/glue/classifier/setup.go
@@ -54,7 +54,6 @@ func SetupClassifier(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateL
 		For(&svcapitypes.Classifier{}).
 		Complete(managed.NewReconciler(mgr,
 			resource.ManagedKind(svcapitypes.ClassifierGroupVersionKind),
-			managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())),
 			managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
 			managed.WithPollInterval(poll),
 			managed.WithLogger(l.WithValues("controller", name)),
@@ -91,7 +90,7 @@ func preCreate(_ context.Context, cr *svcapitypes.Classifier, obj *svcsdk.Create
 
 	if cr.Spec.ForProvider.CustomCsvClassifier != nil {
 		obj.CsvClassifier = &svcsdk.CreateCsvClassifierRequest{
-			Name:                 &cr.Name,
+			Name:                 awsclients.String(meta.GetExternalName(cr)),
 			AllowSingleColumn:    cr.Spec.ForProvider.CustomCsvClassifier.AllowSingleColumn,
 			ContainsHeader:       cr.Spec.ForProvider.CustomCsvClassifier.ContainsHeader,
 			Delimiter:            cr.Spec.ForProvider.CustomCsvClassifier.Delimiter,
@@ -103,15 +102,15 @@ func preCreate(_ context.Context, cr *svcapitypes.Classifier, obj *svcsdk.Create
 
 	if cr.Spec.ForProvider.CustomXMLClassifier != nil {
 		obj.XMLClassifier = &svcsdk.CreateXMLClassifierRequest{
-			Name:           &cr.Name,
+			Name:           awsclients.String(meta.GetExternalName(cr)),
 			Classification: cr.Spec.ForProvider.CustomXMLClassifier.Classification,
 			RowTag:         cr.Spec.ForProvider.CustomXMLClassifier.RowTag,
 		}
 	}
 
 	if cr.Spec.ForProvider.CustomGrokClassifier != nil {
 		obj.GrokClassifier = &svcsdk.CreateGrokClassifierRequest{
-			Name:           &cr.Name,
+			Name:           awsclients.String(meta.GetExternalName(cr)),
 			Classification: cr.Spec.ForProvider.CustomGrokClassifier.Classification,
 			CustomPatterns: cr.Spec.ForProvider.CustomGrokClassifier.CustomPatterns,
 			GrokPattern:    cr.Spec.ForProvider.CustomGrokClassifier.GrokPattern,
@@ -120,7 +119,7 @@ func preCreate(_ context.Context, cr *svcapitypes.Classifier, obj *svcsdk.Create
 
 	if cr.Spec.ForProvider.CustomJSONClassifier != nil {
 		obj.JsonClassifier = &svcsdk.CreateJsonClassifierRequest{
-			Name:     &cr.Name,
+			Name:     awsclients.String(meta.GetExternalName(cr)),
 			JsonPath: cr.Spec.ForProvider.CustomJSONClassifier.JSONPath,
 		}
 	}

diff --git a/pkg/controller/glue/connection/setup.go b/pkg/controller/glue/connection/setup.go
@@ -54,7 +54,6 @@ func SetupConnection(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateL
 		For(&svcapitypes.Connection{}).
 		Complete(managed.NewReconciler(mgr,
 			resource.ManagedKind(svcapitypes.ConnectionGroupVersionKind),
-			managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())),
 			managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
 			managed.WithPollInterval(poll),
 			managed.WithLogger(l.WithValues("controller", name)),
@@ -91,7 +90,7 @@ func preCreate(_ context.Context, cr *svcapitypes.Connection, obj *svcsdk.Create
 
 	if cr.Spec.ForProvider.CustomConnectionInput != nil && cr.Spec.ForProvider.CustomConnectionInput.CustomPhysicalConnectionRequirements != nil {
 		obj.ConnectionInput = &svcsdk.ConnectionInput{
-			Name:                 &cr.Name,
+			Name:                 awsclients.String(meta.GetExternalName(cr)),
 			ConnectionProperties: cr.Spec.ForProvider.CustomConnectionInput.ConnectionProperties,
 			ConnectionType:       cr.Spec.ForProvider.CustomConnectionInput.ConnectionType,
 			Description:          cr.Spec.ForProvider.CustomConnectionInput.Description,

diff --git a/pkg/controller/glue/crawler/setup.go b/pkg/controller/glue/crawler/setup.go
@@ -53,7 +53,6 @@ func SetupCrawler(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateLimi
 		For(&svcapitypes.Crawler{}).
 		Complete(managed.NewReconciler(mgr,
 			resource.ManagedKind(svcapitypes.CrawlerGroupVersionKind),
-			managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())),
 			managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
 			managed.WithPollInterval(poll),
 			managed.WithLogger(l.WithValues("controller", name)),
@@ -80,7 +79,7 @@ func postObserve(_ context.Context, cr *svcapitypes.Crawler, _ *svcsdk.GetCrawle
 
 func preCreate(_ context.Context, cr *svcapitypes.Crawler, obj *svcsdk.CreateCrawlerInput) error {
 	obj.Name = awsclients.String(meta.GetExternalName(cr))
-	obj.Role = &cr.Spec.ForProvider.RoleArn
+	obj.Role = awsclients.String(cr.Spec.ForProvider.RoleArn)
 	obj.Schedule = cr.Spec.ForProvider.Schedule
 	return nil
 }
diff --git a/pkg/controller/glue/database/setup.go b/pkg/controller/glue/database/setup.go
@@ -54,7 +54,6 @@ func SetupDatabase(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateLim
 		For(&svcapitypes.Database{}).
 		Complete(managed.NewReconciler(mgr,
 			resource.ManagedKind(svcapitypes.DatabaseGroupVersionKind),
-			managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())),
 			managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
 			managed.WithPollInterval(poll),
 			managed.WithLogger(l.WithValues("controller", name)),
@@ -91,11 +90,11 @@ func preCreate(_ context.Context, cr *svcapitypes.Database, obj *svcsdk.CreateDa
 
 	if cr.Spec.ForProvider.CustomDatabaseInput == nil {
 		obj.DatabaseInput = &svcsdk.DatabaseInput{
-			Name: &cr.Name,
+			Name: awsclients.String(meta.GetExternalName(cr)),
 		}
 	} else {
 		obj.DatabaseInput = &svcsdk.DatabaseInput{
-			Name:        &cr.Name,
+			Name:        awsclients.String(meta.GetExternalName(cr)),
 			Description: cr.Spec.ForProvider.CustomDatabaseInput.Description,
 			LocationUri: cr.Spec.ForProvider.CustomDatabaseInput.LocationURI,
 			Parameters:  cr.Spec.ForProvider.CustomDatabaseInput.Parameters,

diff --git a/pkg/controller/glue/job/setup.go b/pkg/controller/glue/job/setup.go
@@ -55,7 +55,6 @@ func SetupJob(mgr ctrl.Manager, l logging.Logger, limiter workqueue.RateLimiter,
 		For(&svcapitypes.Job{}).
 		Complete(managed.NewReconciler(mgr,
 			resource.ManagedKind(svcapitypes.JobGroupVersionKind),
-			managed.WithInitializers(managed.NewDefaultProviderConfig(mgr.GetClient())),
 			managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), opts: opts}),
 			managed.WithPollInterval(poll),
 			managed.WithLogger(l.WithValues("controller", name)),
@@ -89,7 +88,7 @@ func postCreate(_ context.Context, cr *svcapitypes.Job, obj *svcsdk.CreateJobOut
 }
 
 func preCreate(_ context.Context, cr *svcapitypes.Job, obj *svcsdk.CreateJobInput) error {
-	obj.Name = &cr.Name
-	obj.Role = &cr.Spec.ForProvider.RoleArn
+	obj.Name = awsclients.String(meta.GetExternalName(cr))
+	obj.Role = awsclients.String(cr.Spec.ForProvider.RoleArn)
 	return nil
 }