diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index 5f91370..2f2acb9 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,13 +1,13 @@ ack_generate_info: - build_date: "2025-12-11T23:39:26Z" - build_hash: 5c8b9050006ef6c7d3a97c279e7b1bc163f20a0a + build_date: "2025-12-23T20:35:23Z" + build_hash: 43713d4546b29b09ac85cbb3da854425045237bd go_version: go1.25.4 - version: v0.56.0-3-g5c8b905 + version: v0.56.0-4-g43713d4 api_directory_checksum: 2627dc306e3a83c86c04050c6c4336451459e728 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 generator_config_info: - file_checksum: 7d19f3bad5c4ff9efc3550284a2e9284212afb28 + file_checksum: 022a45cf8564ebeaeb4fee6816d3a1bf540046bf original_file_name: generator.yaml last_modification: reason: API generation diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml index 97f3552..bfe239c 100644 --- a/apis/v1alpha1/generator.yaml +++ b/apis/v1alpha1/generator.yaml @@ -4,6 +4,11 @@ resources: errors: 404: code: AWS.SimpleQueueService.NonExistentQueue + terminal_codes: + - InvalidAttributeName + - InvalidAttributeValue + - InvalidParameterValue + - InvalidParameterCombination unpack_attributes_map: set_attributes_single_attribute: false get_attributes_input: diff --git a/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml b/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml index 9477c90..803a75c 100644 --- a/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml +++ b/config/crd/common/bases/services.k8s.aws_iamroleselectors.yaml @@ -63,6 +63,16 @@ spec: required: - names type: object + resourceLabelSelector: + description: LabelSelector is a label query over a set of resources. + properties: + matchLabels: + additionalProperties: + type: string + type: object + required: + - matchLabels + type: object resourceTypeSelector: items: properties: diff --git a/config/crd/common/kustomization.yaml b/config/crd/common/kustomization.yaml index 8165534..65cb01b 100644 --- a/config/crd/common/kustomization.yaml +++ b/config/crd/common/kustomization.yaml @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - bases/services.k8s.aws_iamroleselectors.yaml - bases/services.k8s.aws_fieldexports.yaml + - bases/services.k8s.aws_iamroleselectors.yaml diff --git a/generator.yaml b/generator.yaml index 97f3552..bfe239c 100644 --- a/generator.yaml +++ b/generator.yaml @@ -4,6 +4,11 @@ resources: errors: 404: code: AWS.SimpleQueueService.NonExistentQueue + terminal_codes: + - InvalidAttributeName + - InvalidAttributeValue + - InvalidParameterValue + - InvalidParameterCombination unpack_attributes_map: set_attributes_single_attribute: false get_attributes_input: diff --git a/pkg/resource/queue/sdk.go b/pkg/resource/queue/sdk.go index 4173f9a..fbd9f12 100644 --- a/pkg/resource/queue/sdk.go +++ b/pkg/resource/queue/sdk.go @@ -587,6 +587,21 @@ func (rm *resourceManager) updateConditions( // and if the exception indicates that it is a Terminal exception // 'Terminal' exception are specified in generator configuration func (rm *resourceManager) terminalAWSError(err error) bool { - // No terminal_errors specified for this resource in generator config - return false + if err == nil { + return false + } + + var terminalErr smithy.APIError + if !errors.As(err, &terminalErr) { + return false + } + switch terminalErr.ErrorCode() { + case "InvalidAttributeName", + "InvalidAttributeValue", + "InvalidParameterValue", + "InvalidParameterCombination": + return true + default: + return false + } }