fix: ensure we check the latest resource for status (#35)

michaelhtm · web-flow · commit 3f66109d3273 · 2025-04-13T03:05:09.000Z
Issue [#2180](aws-controllers-k8s/community#2180) Description of changes: Currently we have been checking the desired status in post_set_output. At that point the desired resource will not have been updated with the latest Status from the describe output, leading the controller to be in an endless reconciliation loop 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,8 +1,8 @@
 ack_generate_info:
-  build_date: "2025-03-27T16:36:00Z"
-  build_hash: 980cb1e4734f673d16101cf55206b84ca639ec01
+  build_date: "2025-04-11T22:07:51Z"
+  build_hash: 0909e7f0adb8ffe4120a8c20d5d58b991f2539e9
   go_version: go1.24.1
-  version: v0.44.0
+  version: v0.44.0-3-g0909e7f
 api_directory_checksum: ebeb6f826282ad9134ca78efd74dc9125898fddf
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -58,8 +58,6 @@ resources:
         code: customPreCompare(delta, a, b)
       sdk_update_post_request:
         code: return desired, nil
-      sdk_create_post_set_output:
-        template_path: hooks/file_system/sdk_create_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/file_system/sdk_create_post_build_request.go.tpl
       sdk_read_many_post_set_output:
diff --git a/generator.yaml b/generator.yaml
@@ -58,8 +58,6 @@ resources:
         code: customPreCompare(delta, a, b)
       sdk_update_post_request:
         code: return desired, nil
-      sdk_create_post_set_output:
-        template_path: hooks/file_system/sdk_create_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/file_system/sdk_create_post_build_request.go.tpl
       sdk_read_many_post_set_output:
diff --git a/pkg/resource/file_system/hooks.go b/pkg/resource/file_system/hooks.go
@@ -82,7 +82,7 @@ func filesystemActive(r *resource) bool {
 		return false
 	}
 	cs := *r.ko.Status.LifeCycleState
-	lifeCycleState := string(svcapitypes.LifeCycleState_available)
+	lifeCycleState := string(svcsdktypes.LifeCycleStateAvailable)
 	return cs == lifeCycleState
 }
 
diff --git a/pkg/resource/file_system/sdk.go b/pkg/resource/file_system/sdk.go
diff --git a/templates/hooks/file_system/sdk_create_post_set_output.go.tpl b/templates/hooks/file_system/sdk_create_post_set_output.go.tpl
diff --git a/templates/hooks/file_system/sdk_read_many_post_set_output.go.tpl b/templates/hooks/file_system/sdk_read_many_post_set_output.go.tpl
@@ -2,5 +2,5 @@
 		return nil, err
 	}
 	if !filesystemActive(&resource{ko}) {
-		return &resource{ko}, requeueWaitState(r)
+		return &resource{ko}, requeueWaitState(&resource{ko})
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func filesystemActive(r *resource) bool {`
`82`	`82`	`return false`
`83`	`83`	`}`
`84`	`84`	`cs := *r.ko.Status.LifeCycleState`
`85`		`- lifeCycleState := string(svcapitypes.LifeCycleState_available)`
	`85`	`+ lifeCycleState := string(svcsdktypes.LifeCycleStateAvailable)`
`86`	`86`	`return cs == lifeCycleState`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`return nil, err`
`3`	`3`	`}`
`4`	`4`	`if !filesystemActive(&resource{ko}) {`
`5`		`- return &resource{ko}, requeueWaitState(r)`
	`5`	`+ return &resource{ko}, requeueWaitState(&resource{ko})`
`6`	`6`	`}`