mitigate controller panic when adopting resources (#132)

michaelhtm · web-flow · commit b6f5ba570dbc · 2024-10-01T23:32:18.000Z
Description of changes:
When adopting resources, the desired status arn is nil, 
and it causes the controller to panic and exit
To ensure this doesn't happen, we are retrieving
the resource ARN from AWS API

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,5 +1,5 @@
 ack_generate_info:
-  build_date: "2024-09-30T17:24:49Z"
+  build_date: "2024-10-01T19:56:53Z"
   build_hash: f8f98563404066ac3340db0a049d2e530e5c51cc
   go_version: go1.23.0
   version: v0.38.1
diff --git a/pkg/resource/access_entry/sdk.go b/pkg/resource/access_entry/sdk.go
diff --git a/pkg/resource/fargate_profile/hook.go b/pkg/resource/fargate_profile/hook.go
@@ -76,7 +76,7 @@ func (rm *resourceManager) customUpdate(
 	if delta.DifferentAt("Spec.Tags") {
 		if err := tags.SyncTags(
 			ctx, rm.sdkapi, rm.metrics,
-			string(*desired.ko.Status.ACKResourceMetadata.ARN),
+			string(*latest.ko.Status.ACKResourceMetadata.ARN),
 			desired.ko.Spec.Tags, latest.ko.Spec.Tags,
 		); err != nil {
 			return nil, err
diff --git a/pkg/resource/nodegroup/hook.go b/pkg/resource/nodegroup/hook.go
@@ -265,7 +265,7 @@ func (rm *resourceManager) customUpdate(
 	if delta.DifferentAt("Spec.Tags") {
 		err := tags.SyncTags(
 			ctx, rm.sdkapi, rm.metrics,
-			string(*desired.ko.Status.ACKResourceMetadata.ARN),
+			string(*latest.ko.Status.ACKResourceMetadata.ARN),
 			desired.ko.Spec.Tags, latest.ko.Spec.Tags,
 		)
 		if err != nil {
diff --git a/templates/hooks/access_entry/sdk_update_pre_build_request.go.tpl b/templates/hooks/access_entry/sdk_update_pre_build_request.go.tpl
@@ -7,7 +7,7 @@
 	if delta.DifferentAt("Spec.Tags") {
 		err := syncTags(
 			ctx, rm.sdkapi, rm.metrics, 
-			string(*desired.ko.Status.ACKResourceMetadata.ARN), 
+			string(*latest.ko.Status.ACKResourceMetadata.ARN), 
 			desired.ko.Spec.Tags, latest.ko.Spec.Tags,
 		)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ func (rm *resourceManager) customUpdate(`
`265`	`265`	`if delta.DifferentAt("Spec.Tags") {`
`266`	`266`	`err := tags.SyncTags(`
`267`	`267`	`ctx, rm.sdkapi, rm.metrics,`
`268`		`- string(*desired.ko.Status.ACKResourceMetadata.ARN),`
	`268`	`+ string(*latest.ko.Status.ACKResourceMetadata.ARN),`
`269`	`269`	`desired.ko.Spec.Tags, latest.ko.Spec.Tags,`
`270`	`270`	`)`
`271`	`271`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`if delta.DifferentAt("Spec.Tags") {`
`8`	`8`	`err := syncTags(`
`9`	`9`	`ctx, rm.sdkapi, rm.metrics,`
`10`		`- string(*desired.ko.Status.ACKResourceMetadata.ARN),`
	`10`	`+ string(*latest.ko.Status.ACKResourceMetadata.ARN),`
`11`	`11`	`desired.ko.Spec.Tags, latest.ko.Spec.Tags,`
`12`	`12`	`)`
`13`	`13`	`if err != nil {`