fix: ensure Synced is generated

apis/v1alpha1/ack-generate-metadata.yaml

@@ -7,7 +7,7 @@ api_directory_checksum: 01de06bb7dff101d9ebdbc6e252f3e526b493fb2
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 8f51ccb0fdf00c0900f3cd0641fe851d5909686e
+  file_checksum: 68ba2404c86e1c8b1f0bd0730312a146a6c4188f
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -25,6 +25,10 @@ model_name: elasticfilesystem
 controller_name: efs
 resources:
   FileSystem:
+    synced:
+      when:
+        - path: Status.LifeCycleState
+          in: [ "available" ]
     fields:
       Backup:
         compare:
@@ -107,6 +111,10 @@ resources:
         type: string
         index: 30
   MountTarget:
+    synced:
+      when:
+        - path: Status.LifeCycleState
+          in: [ "available" ]
     tags:
       ignore: true
     fields:
@@ -127,8 +135,6 @@ resources:
     update_operation:
       custom_method_name: customUpdateMountTarget
     hooks:
-      sdk_create_post_set_output:
-        template_path: hooks/mount_target/sdk_create_post_set_output.go.tpl
       sdk_read_many_post_build_request:
         template_path: hooks/mount_target/sdk_read_many_post_build_request.go.tpl
       sdk_read_many_post_set_output:

generator.yaml

@@ -25,6 +25,10 @@ model_name: elasticfilesystem
 controller_name: efs
 resources:
   FileSystem:
+    synced:
+      when:
+        - path: Status.LifeCycleState
+          in: [ "available" ]
     fields:
       Backup:
         compare:
@@ -107,6 +111,10 @@ resources:
         type: string
         index: 30
   MountTarget:
+    synced:
+      when:
+        - path: Status.LifeCycleState
+          in: [ "available" ]
     tags:
       ignore: true
     fields:
@@ -127,8 +135,6 @@ resources:
     update_operation:
       custom_method_name: customUpdateMountTarget
     hooks:
-      sdk_create_post_set_output:
-        template_path: hooks/mount_target/sdk_create_post_set_output.go.tpl
       sdk_read_many_post_build_request:
         template_path: hooks/mount_target/sdk_read_many_post_build_request.go.tpl
       sdk_read_many_post_set_output:

pkg/resource/mount_target/hooks.go

@@ -146,13 +146,18 @@ func (rm *resourceManager) customUpdateMountTarget(
 	rlog := ackrtlog.FromContext(ctx)
 	exit := rlog.Trace("rm.sdkUpdate")
 	defer func() { exit(err) }()
+	updated = rm.concreteResource(desired.DeepCopy())
+	updated.SetStatus(latest)
+	if !mountTargetActive(updated) {
+		return updated, requeueWaitState(updated)
+	}
 
 	if delta.DifferentAt("Spec.SecurityGroups") {
-		err := rm.putSecurityGroups(ctx, desired)
+		err := rm.putSecurityGroups(ctx, updated)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	return desired, nil
+	return updated, nil
 }

templates/hooks/file_system/sdk_read_many_post_set_output.go.tpl

@@ -1,6 +1,3 @@
 	if err := rm.setResourceAdditionalFields(ctx, ko); err != nil {
-		return nil, err
-	}
-	if !filesystemActive(&resource{ko}) {
-		return &resource{ko}, requeueWaitState(&resource{ko})
+		return &resource{ko}, err
 	}

templates/hooks/mount_target/sdk_read_many_post_set_output.go.tpl

@@ -1,6 +1,3 @@
 	if err := rm.setResourceAdditionalFields(ctx, ko); err != nil {
-		return nil, err
-	}
-	if !mountTargetActive(&resource{ko}) {
-		return &resource{ko}, requeueWaitState(r)
+		return &resource{ko}, err
 	}

test/e2e/resources/mount_target.yaml

@@ -5,4 +5,3 @@ metadata:
 spec:
   fileSystemID: $FILE_SYSTEM_ID
   subnetID: $PRIVATE_SUBNET
-  ipAddress: $IP_ADDRESS

test/e2e/tests/test_mount_target.py

@@ -43,7 +43,6 @@ def simple_mount_target(efs_client, simple_file_system):
     replacements = REPLACEMENT_VALUES.copy()
     replacements["MOUNT_TARGET_NAME"] = resource_name
     replacements["FILE_SYSTEM_ID"] = file_system_id
-    replacements["IP_ADDRESS"] = "10.0.0.100"
 
     # Load efs CR
     resource_data = load_efs_resource(
@@ -87,8 +86,12 @@ def simple_mount_target(efs_client, simple_file_system):
 @pytest.mark.canary
 class TestMountTarget:
     def test_create_delete(self, efs_client, simple_mount_target):
-        (_, _, mount_target_id) = simple_mount_target
+        (ref, _, mount_target_id) = simple_mount_target
         assert mount_target_id is not None
 
         validator = EFSValidator(efs_client)
-        assert validator.mount_target_exists(mount_target_id)
+        assert validator.mount_target_exists(mount_target_id)
+
+        cr = k8s.get_resource(ref)
+        assert 'spec' in cr
+        assert 'ipAddress' in cr['spec']