provider: Introduce tag resource generator, new aws_dynamodb_tag and aws_ecs_tag resources

.changelog/13783.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_dynamodb_tag
+```
+
+```release-note:new-resource
+aws_ecs_tag
+```

.semgrep.yml

@@ -25,6 +25,7 @@ rules:
         - aws/resource_aws_transfer_server.go
         - aws/*_test.go
         - aws/internal/keyvaluetags/
+        - aws/internal/namevaluesfilters/
         - aws/internal/service/wafregional/
         # Legacy resource handling
         - aws/resource_aws_autoscaling_group.go

GNUmakefile

@@ -12,7 +12,9 @@ build: fmtcheck
 	go install
 
 gen:
+	rm -f aws/*_gen.go aws/*_gen_test.go
 	rm -f aws/internal/keyvaluetags/*_gen.go
+	rm -f aws/internal/namevaluesfilters/*_gen.go
 	rm -f aws/internal/service/**/lister/*_gen.go
 	go generate ./...
 

aws/internal/keyvaluetags/generators/createtags/main.go

@@ -32,20 +32,19 @@ func main() {
 		ServiceNames: serviceNames,
 	}
 	templateFuncMap := template.FuncMap{
-		"ClientType":                        keyvaluetags.ServiceClientType,
-		"ResourceNotFoundErrorCode":         keyvaluetags.ServiceResourceNotFoundErrorCode,
-		"ResourceNotFoundErrorCodeContains": keyvaluetags.ServiceResourceNotFoundErrorCodeContains,
-		"RetryCreationOnResourceNotFound":   keyvaluetags.ServiceRetryCreationOnResourceNotFound,
-		"TagFunction":                       keyvaluetags.ServiceTagFunction,
-		"TagFunctionBatchSize":              keyvaluetags.ServiceTagFunctionBatchSize,
-		"TagInputCustomValue":               keyvaluetags.ServiceTagInputCustomValue,
-		"TagInputIdentifierField":           keyvaluetags.ServiceTagInputIdentifierField,
-		"TagInputIdentifierRequiresSlice":   keyvaluetags.ServiceTagInputIdentifierRequiresSlice,
-		"TagInputTagsField":                 keyvaluetags.ServiceTagInputTagsField,
-		"TagPackage":                        keyvaluetags.ServiceTagPackage,
-		"TagResourceTypeField":              keyvaluetags.ServiceTagResourceTypeField,
-		"TagTypeIdentifierField":            keyvaluetags.ServiceTagTypeIdentifierField,
-		"Title":                             strings.Title,
+		"ClientType":                      keyvaluetags.ServiceClientType,
+		"ParentResourceNotFoundError":     keyvaluetags.ServiceParentResourceNotFoundError,
+		"RetryCreationOnResourceNotFound": keyvaluetags.ServiceRetryCreationOnResourceNotFound,
+		"TagFunction":                     keyvaluetags.ServiceTagFunction,
+		"TagFunctionBatchSize":            keyvaluetags.ServiceTagFunctionBatchSize,
+		"TagInputCustomValue":             keyvaluetags.ServiceTagInputCustomValue,
+		"TagInputIdentifierField":         keyvaluetags.ServiceTagInputIdentifierField,
+		"TagInputIdentifierRequiresSlice": keyvaluetags.ServiceTagInputIdentifierRequiresSlice,
+		"TagInputTagsField":               keyvaluetags.ServiceTagInputTagsField,
+		"TagPackage":                      keyvaluetags.ServiceTagPackage,
+		"TagResourceTypeField":            keyvaluetags.ServiceTagResourceTypeField,
+		"TagTypeIdentifierField":          keyvaluetags.ServiceTagTypeIdentifierField,
+		"Title":                           strings.Title,
 	}
 
 	tmpl, err := template.New("createtags").Funcs(templateFuncMap).Parse(templateBody)
@@ -133,31 +132,13 @@ func {{ . | Title }}CreateTags(conn {{ . | ClientType }}, identifier string{{ if
 
 	{{- if . | RetryCreationOnResourceNotFound }}
 
-	err := resource.Retry(EventualConsistencyTimeout, func() *resource.RetryError {
-		_, err := conn.{{ . | TagFunction }}(input)
+	_, err := tfresource.RetryWhenNotFound(EventualConsistencyTimeout, func() (interface{}, error) {
+		output, err := conn.{{ . | TagFunction }}(input)
 
-		{{- if . | ResourceNotFoundErrorCodeContains }}
+		{{ . | ParentResourceNotFoundError }}
 
-		if tfawserr.ErrCodeContains(err, "{{ . | ResourceNotFoundErrorCodeContains }}") {
-
-		{{- else }}
-
-		if tfawserr.ErrCodeEquals(err, {{ . | ResourceNotFoundErrorCode }}) {
-
-		{{- end }}
-			return resource.RetryableError(err)
-		}
-
-		if err != nil {
-			return resource.NonRetryableError(err)
-		}
-
-		return nil
+		return output, err
 	})
-
-	if tfresource.TimedOut(err) {
-		_, err = conn.{{ . | TagFunction }}(input)
-	}
 	{{- else }}
 	_, err := conn.{{ . | TagFunction }}(input)
 	{{- end }}

aws/internal/keyvaluetags/generators/gettag/main.go

@@ -92,19 +92,20 @@ import (
 {{- range .ServiceNames }}
 	"github.com/aws/aws-sdk-go/service/{{ . }}"
 {{- end }}
+    "github.com/terraform-providers/terraform-provider-aws/aws/internal/tfresource"
 )
 
 {{- range .ServiceNames }}
 
 // {{ . | Title }}GetTag fetches an individual {{ . }} service tag for a resource.
-// Returns whether the key exists, the key value, and any errors.
+// Returns whether the key value and any errors. A NotFoundError is used to signal that no value was found.
 // This function will optimise the handling over {{ . | Title }}ListTags, if possible.
 // The identifier is typically the Amazon Resource Name (ARN), although
 // it may also be a different identifier depending on the service.
 {{- if or ( . | TagTypeIdentifierField ) ( . | TagTypeAdditionalBoolFields) }}
-func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . | TagResourceTypeField }}, resourceType string{{ end }}, key string) (bool, *TagData, error) {
+func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . | TagResourceTypeField }}, resourceType string{{ end }}, key string) (*TagData, error) {
 {{- else }}
-func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . | TagResourceTypeField }}, resourceType string{{ end }}, key string) (bool, *string, error) {
+func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . | TagResourceTypeField }}, resourceType string{{ end }}, key string) (*string, error) {
 {{- end }}
 	{{- if . | ListTagsInputFilterIdentifierName }}
 	input := &{{ . | TagPackage  }}.{{ . | ListTagsFunction }}Input{
@@ -123,22 +124,26 @@ func {{ . | Title }}GetTag(conn {{ . | ClientType }}, identifier string{{ if . |
 	output, err := conn.{{ . | ListTagsFunction }}(input)
 
 	if err != nil {
-		return false, nil, err
+		return nil, err
 	}
 
 	listTags := {{ . | Title }}KeyValueTags(output.{{ . | ListTagsOutputTagsField }}{{ if . | TagTypeIdentifierField }}, identifier{{ if . | TagResourceTypeField }}, resourceType{{ end }}{{ end }})
 	{{- else }}
 	listTags, err := {{ . | Title }}ListTags(conn, identifier{{ if . | TagResourceTypeField }}, resourceType{{ end }})
 
 	if err != nil {
-		return false, nil, err
+		return nil, err
 	}
 	{{- end }}
 
+	if !listTags.KeyExists(key) {
+		return nil, tfresource.NewEmptyResultError(nil)
+	}
+
 	{{ if or ( . | TagTypeIdentifierField ) ( . | TagTypeAdditionalBoolFields) }}
-	return listTags.KeyExists(key), listTags.KeyTagData(key), nil
+	return listTags.KeyTagData(key), nil
 	{{- else }}
-	return listTags.KeyExists(key), listTags.KeyValue(key), nil
+	return listTags.KeyValue(key), nil
 	{{- end }}
 }
 {{- end }}

aws/internal/keyvaluetags/generators/listtags/main.go

@@ -147,6 +147,7 @@ func main() {
 		"ListTagsInputIdentifierField":         keyvaluetags.ServiceListTagsInputIdentifierField,
 		"ListTagsInputIdentifierRequiresSlice": keyvaluetags.ServiceListTagsInputIdentifierRequiresSlice,
 		"ListTagsOutputTagsField":              keyvaluetags.ServiceListTagsOutputTagsField,
+		"ParentResourceNotFoundError":          keyvaluetags.ServiceParentResourceNotFoundError,
 		"TagPackage":                           keyvaluetags.ServiceTagPackage,
 		"TagResourceTypeField":                 keyvaluetags.ServiceTagResourceTypeField,
 		"TagTypeIdentifierField":               keyvaluetags.ServiceTagTypeIdentifierField,
@@ -197,6 +198,8 @@ import (
 {{- range .ServiceNames }}
 	"github.com/aws/aws-sdk-go/service/{{ . }}"
 {{- end }}
+    "github.com/hashicorp/aws-sdk-go-base/tfawserr"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 {{ range .ServiceNames }}
 
@@ -226,6 +229,8 @@ func {{ . | Title }}ListTags(conn {{ . | ClientType }}, identifier string{{ if .
 
 	output, err := conn.{{ . | ListTagsFunction }}(input)
 
+	{{ . | ParentResourceNotFoundError }}
+
 	if err != nil {
 		return New(nil), err
 	}