Integrate CR feedback - use prefixListID as the only filter

Author: alexcristi

apis/v1alpha1/ack-generate-metadata.yaml

@@ -7,7 +7,7 @@ api_directory_checksum: b558bf9c1a38a2d20a3521ab1048281ad80d5b29
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 32b9b52f3a9103c18e42ef8de5494bd046da56eb
+  file_checksum: e585554e1f3218c74b5ed72bc84804c2604a617c
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -233,6 +233,8 @@ operations:
     resource_name: LaunchTemplate
   DescribeLaunchTemplates:
     custom_check_required_fields_missing_method: checkForMissingRequiredFields
+  DescribeManagedPrefixLists:
+    custom_check_required_fields_missing_method: checkForMissingRequiredFields
   CreateNatGateway:
     output_wrapper_field_path: NatGateway
   CreateNetworkAcl:

generator.yaml

@@ -233,6 +233,8 @@ operations:
     resource_name: LaunchTemplate
   DescribeLaunchTemplates:
     custom_check_required_fields_missing_method: checkForMissingRequiredFields
+  DescribeManagedPrefixLists:
+    custom_check_required_fields_missing_method: checkForMissingRequiredFields
   CreateNatGateway:
     output_wrapper_field_path: NatGateway
   CreateNetworkAcl:

pkg/resource/managed_prefix_list/hooks.go

@@ -181,3 +181,10 @@ func (rm *resourceManager) customUpdateManagedPrefixList(
 
 	return desired, nil
 }
+
+// checkForMissingRequiredFields validates that PrefixListID is present in Status
+// before attempting a read. Prefix list names are not unique in AWS, so we require
+// the ID for safe lookups.
+func (rm *resourceManager) checkForMissingRequiredFields(r *resource) bool {
+	return r.ko.Status.PrefixListID == nil
+}

pkg/resource/managed_prefix_list/sdk.go

@@ -1,20 +1,6 @@
-	// If we have a PrefixListID, use it to filter the describe call
+	// Prefix list names are not unique in AWS, so we must filter by ID
+	// If we don't have a PrefixListID yet, the resource hasn't been created
 	if r.ko.Status.PrefixListID != nil {
 		input.PrefixListIds = []string{*r.ko.Status.PrefixListID}
-	} else if r.ko.Spec.PrefixListName != nil {
-		// If we don't have an ID yet, filter by both owner ID and prefix list name
-		// This prevents matching against AWS-managed prefix lists
-		// and other user-owned prefix lists with different names
-		filters := []svcsdktypes.Filter{
-			{
-				Name:   aws.String("owner-id"),
-				Values: []string{string(rm.awsAccountID)},
-			},
-			{
-				Name:   aws.String("prefix-list-name"),
-				Values: []string{*r.ko.Spec.PrefixListName},
-			},
-		}
-		input.Filters = filters
 	}
 

templates/hooks/managed_prefix_list/sdk_read_many_post_build_request.go.tpl

@@ -1,4 +1,7 @@
-	// Get the entries separately
+{{ $CRD := .CRD }}
+{{ $SDKAPI := .SDKAPI }}
+
+	// Get the entries separately - DON'T overwrite Spec.Entries
 	if ko.Status.PrefixListID != nil {
 		entriesResp, err := rm.sdkapi.GetManagedPrefixListEntries(
 			ctx,
@@ -27,5 +30,3 @@
 			ko.Spec.Entries = nil
 		}
 	}
-
-