Tech debt: Reduce tags boilerplate code - Phase 2

.changelog/28489.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ssm_document: Correctly set `default_version`, `document_version`, `hash`, `latest_version` and `parameter` as Computed when `content` changes
+```

.changelog/30280.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ssm_activation: Fix IAM eventual consistency errors on resource Create
+```

internal/generate/servicepackages/main.go

@@ -133,7 +133,9 @@ func main() {
 type ResourceDatum struct {
 	FactoryName             string
 	Name                    string // Friendly name (without service name), e.g. "Topic", not "SNS Topic"
+	TransparentTagging      bool
 	TagsIdentifierAttribute string
+	TagsResourceType        string
 }
 
 type ServiceDatum struct {
@@ -222,15 +224,18 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
 		if m := annotation.FindStringSubmatch(line); len(m) > 0 && m[1] == "Tags" {
 			args := common.ParseArgs(m[3])
 
+			d.TransparentTagging = true
+
 			if attr, ok := args.Keyword["identifierAttribute"]; ok {
 				if d.TagsIdentifierAttribute != "" {
 					v.err = multierror.Append(v.err, fmt.Errorf("multiple Tags annotations: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
 				}
 
 				d.TagsIdentifierAttribute = attr
-			} else {
-				v.err = multierror.Append(v.err, fmt.Errorf("no Tags(identifierAttribute): %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
-				continue
+			}
+
+			if attr, ok := args.Keyword["resourceType"]; ok {
+				d.TagsResourceType = attr
 			}
 		}
 	}

internal/generate/servicepackages/spd.tmpl

@@ -21,9 +21,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv
 			{{- if ne .Name "" }}
 			Name:    "{{ .Name }}",
 			{{- end }}
-			{{- if ne .TagsIdentifierAttribute "" }}
+			{{- if .TransparentTagging }}
 			Tags: &types.ServicePackageResourceTags {
+				{{- if ne .TagsIdentifierAttribute "" }}
 				IdentifierAttribute: "{{ .TagsIdentifierAttribute }}",
+				{{- end }}
+				{{- if ne .TagsResourceType "" }}
+				ResourceType: "{{ .TagsResourceType }}",
+				{{- end }}
 			},
 			{{- end }}
 		},
@@ -39,9 +44,14 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.Servic
 			{{- if ne .Name "" }}
 			Name:    "{{ .Name }}",
 			{{- end }}
-			{{- if ne .TagsIdentifierAttribute "" }}
+			{{- if .TransparentTagging }}
 			Tags: &types.ServicePackageResourceTags {
+				{{- if ne .TagsIdentifierAttribute "" }}
 				IdentifierAttribute: "{{ .TagsIdentifierAttribute }}",
+				{{- end }}
+				{{- if ne .TagsResourceType "" }}
+				ResourceType: "{{ .TagsResourceType }}",
+				{{- end }}
 			},
 			{{- end }}
 		},
@@ -58,9 +68,14 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac
 			{{- if ne $value.Name "" }}
 			Name:     "{{ $value.Name }}",
 			{{- end }}
-			{{- if ne $value.TagsIdentifierAttribute "" }}
+			{{- if $value.TransparentTagging }}
 			Tags: &types.ServicePackageResourceTags {
+				{{- if ne $value.TagsIdentifierAttribute "" }}
 				IdentifierAttribute: "{{ $value.TagsIdentifierAttribute }}",
+				{{- end }}
+				{{- if ne .TagsResourceType "" }}
+				ResourceType: "{{ .TagsResourceType }}",
+				{{- end }}
 			},
 			{{- end }}
 		},
@@ -77,9 +92,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka
 			{{- if ne $value.Name "" }}
 			Name:     "{{ $value.Name }}",
 			{{- end }}
-			{{- if ne $value.TagsIdentifierAttribute "" }}
+			{{- if $value.TransparentTagging }}
 			Tags: &types.ServicePackageResourceTags {
+				{{- if ne $value.TagsIdentifierAttribute "" }}
 				IdentifierAttribute: "{{ $value.TagsIdentifierAttribute }}",
+				{{- end }}
+				{{- if ne .TagsResourceType "" }}
+				ResourceType: "{{ .TagsResourceType }}",
+				{{- end }}
 			},
 			{{- end }}
 		},

internal/provider/fwprovider/intercept.go

@@ -363,18 +363,27 @@ func (r tagsInterceptor) read(ctx context.Context, request resource.ReadRequest,
 
 		// If the R handler didn't set tags, try and read them from the service API.
 		if tagsInContext.TagsOut.IsNone() {
-			// If the service package has a generic resource list tags methods, call it.
-			if v, ok := sp.(interface {
-				ListTags(context.Context, any, string) error
-			}); ok {
+			if identifierAttribute := r.tags.IdentifierAttribute; identifierAttribute != "" {
 				var identifier string
-				diags.Append(request.State.GetAttribute(ctx, path.Root(r.tags.IdentifierAttribute), &identifier)...)
+
+				diags.Append(request.State.GetAttribute(ctx, path.Root(identifierAttribute), &identifier)...)
 
 				if diags.HasError() {
 					return ctx, diags
 				}
 
-				err := v.ListTags(ctx, meta, identifier) // Sets tags in Context
+				// If the service package has a generic resource list tags methods, call it.
+				var err error
+
+				if v, ok := sp.(interface {
+					ListTags(context.Context, any, string) error
+				}); ok {
+					err = v.ListTags(ctx, meta, identifier) // Sets tags in Context
+				} else if v, ok := sp.(interface {
+					ListTags(context.Context, any, string, string) error
+				}); ok && r.tags.ResourceType != "" {
+					err = v.ListTags(ctx, meta, identifier, r.tags.ResourceType) // Sets tags in Context
+				}
 
 				if err != nil {
 					diags.AddError(fmt.Sprintf("listing tags for %s %s (%s)", serviceName, resourceName, identifier), err.Error())
@@ -440,36 +449,63 @@ func (r tagsInterceptor) update(ctx context.Context, request resource.UpdateRequ
 		resourceName = "<thing>"
 	}
 
+	tagsInContext, ok := tftags.FromContext(ctx)
+	if !ok {
+		return ctx, diags
+	}
+
 	switch when {
 	case Before:
-		// If the service package has a generic resource update tags methods, call it.
-		if v, ok := sp.(interface {
-			UpdateTags(context.Context, any, string, any, any) error
-		}); ok {
-			var oldTagsAll, newTagsAll fwtypes.Map
+		var planTags fwtypes.Map
+		diags.Append(request.Plan.GetAttribute(ctx, path.Root(names.AttrTags), &planTags)...)
 
-			diags.Append(request.State.GetAttribute(ctx, path.Root(names.AttrTagsAll), &oldTagsAll)...)
+		if diags.HasError() {
+			return ctx, diags
+		}
 
-			if diags.HasError() {
-				return ctx, diags
-			}
+		// Merge the resource's configured tags with any provider configured default_tags.
+		tags := tagsInContext.DefaultConfig.MergeTags(tftags.New(ctx, planTags))
+		// Remove system tags.
+		tags = tags.IgnoreAWS()
 
-			diags.Append(request.Plan.GetAttribute(ctx, path.Root(names.AttrTagsAll), &newTagsAll)...)
+		tagsInContext.TagsIn = types.Some(tags)
 
-			if diags.HasError() {
-				return ctx, diags
-			}
+		var oldTagsAll, newTagsAll fwtypes.Map
+
+		diags.Append(request.State.GetAttribute(ctx, path.Root(names.AttrTagsAll), &oldTagsAll)...)
+
+		if diags.HasError() {
+			return ctx, diags
+		}
+
+		diags.Append(request.Plan.GetAttribute(ctx, path.Root(names.AttrTagsAll), &newTagsAll)...)
+
+		if diags.HasError() {
+			return ctx, diags
+		}
 
-			if !newTagsAll.Equal(oldTagsAll) {
+		if !newTagsAll.Equal(oldTagsAll) {
+			if identifierAttribute := r.tags.IdentifierAttribute; identifierAttribute != "" {
 				var identifier string
 
-				diags.Append(request.Plan.GetAttribute(ctx, path.Root(r.tags.IdentifierAttribute), &identifier)...)
+				diags.Append(request.Plan.GetAttribute(ctx, path.Root(identifierAttribute), &identifier)...)
 
 				if diags.HasError() {
 					return ctx, diags
 				}
 
-				err := v.UpdateTags(ctx, meta, identifier, oldTagsAll, newTagsAll)
+				// If the service package has a generic resource update tags methods, call it.
+				var err error
+
+				if v, ok := sp.(interface {
+					UpdateTags(context.Context, any, string, any, any) error
+				}); ok {
+					err = v.UpdateTags(ctx, meta, identifier, oldTagsAll, newTagsAll)
+				} else if v, ok := sp.(interface {
+					UpdateTags(context.Context, any, string, string, any, any) error
+				}); ok && r.tags.ResourceType != "" {
+					err = v.UpdateTags(ctx, meta, identifier, r.tags.ResourceType, oldTagsAll, newTagsAll)
+				}
 
 				if verify.ErrorISOUnsupported(meta.Partition, err) {
 					// ISO partitions may not support tagging, giving error

internal/provider/fwprovider/provider.go

@@ -304,6 +304,7 @@ func (p *fwprovider) DataSources(ctx context.Context) []func() datasource.DataSo
 		servicePackageName := sp.ServicePackageName()
 
 		for _, v := range sp.FrameworkDataSources(ctx) {
+			v := v
 			inner, err := v.Factory(ctx)
 
 			if err != nil {
@@ -347,6 +348,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
 		servicePackageName := sp.ServicePackageName()
 
 		for _, v := range sp.FrameworkResources(ctx) {
+			v := v
 			inner, err := v.Factory(ctx)
 
 			if err != nil {

internal/provider/intercept.go

@@ -218,27 +218,40 @@ func (r tagsInterceptor) run(ctx context.Context, d *schema.ResourceData, meta a
 	switch when {
 	case Before:
 		switch why {
-		case Create:
+		case Create, Update:
 			// Merge the resource's configured tags with any provider configured default_tags.
 			tags := tagsInContext.DefaultConfig.MergeTags(tftags.New(ctx, d.Get(names.AttrTags).(map[string]interface{})))
 			// Remove system tags.
 			tags = tags.IgnoreAWS()
 
 			tagsInContext.TagsIn = types.Some(tags)
-		case Update:
-			// If the service package has a generic resource update tags methods, call it.
-			if v, ok := sp.(interface {
-				UpdateTags(context.Context, any, string, any, any) error
-			}); ok {
-				if d.HasChange(names.AttrTagsAll) {
+
+			if why == Create {
+				break
+			}
+
+			if d.HasChange(names.AttrTagsAll) {
+				if identifierAttribute := r.tags.IdentifierAttribute; identifierAttribute != "" {
 					var identifier string
-					if key := r.tags.IdentifierAttribute; key == "id" {
+					if identifierAttribute == "id" {
 						identifier = d.Id()
 					} else {
-						identifier = d.Get(key).(string)
+						identifier = d.Get(identifierAttribute).(string)
 					}
 					o, n := d.GetChange(names.AttrTagsAll)
-					err := v.UpdateTags(ctx, meta, identifier, o, n)
+
+					// If the service package has a generic resource update tags methods, call it.
+					var err error
+
+					if v, ok := sp.(interface {
+						UpdateTags(context.Context, any, string, any, any) error
+					}); ok {
+						err = v.UpdateTags(ctx, meta, identifier, o, n)
+					} else if v, ok := sp.(interface {
+						UpdateTags(context.Context, any, string, string, any, any) error
+					}); ok && r.tags.ResourceType != "" {
+						err = v.UpdateTags(ctx, meta, identifier, r.tags.ResourceType, o, n)
+					}
 
 					if verify.ErrorISOUnsupported(meta.(*conns.AWSClient).Partition, err) {
 						// ISO partitions may not support tagging, giving error
@@ -271,19 +284,26 @@ func (r tagsInterceptor) run(ctx context.Context, d *schema.ResourceData, meta a
 		case Create, Update:
 			// If the R handler didn't set tags, try and read them from the service API.
 			if tagsInContext.TagsOut.IsNone() {
-				// If the service package has a generic resource list tags methods, call it.
-				if v, ok := sp.(interface {
-					ListTags(context.Context, any, string) error
-				}); ok {
+				if identifierAttribute := r.tags.IdentifierAttribute; identifierAttribute != "" {
 					var identifier string
-
-					if key := r.tags.IdentifierAttribute; key == "id" {
+					if identifierAttribute == "id" {
 						identifier = d.Id()
 					} else {
-						identifier = d.Get(key).(string)
+						identifier = d.Get(identifierAttribute).(string)
 					}
 
-					err := v.ListTags(ctx, meta, identifier) // Sets tags in Context
+					// If the service package has a generic resource list tags methods, call it.
+					var err error
+
+					if v, ok := sp.(interface {
+						ListTags(context.Context, any, string) error
+					}); ok {
+						err = v.ListTags(ctx, meta, identifier) // Sets tags in Context
+					} else if v, ok := sp.(interface {
+						ListTags(context.Context, any, string, string) error
+					}); ok && r.tags.ResourceType != "" {
+						err = v.ListTags(ctx, meta, identifier, r.tags.ResourceType) // Sets tags in Context
+					}
 
 					if verify.ErrorISOUnsupported(meta.(*conns.AWSClient).Partition, err) {
 						// ISO partitions may not support tagging, giving error

internal/provider/provider.go

@@ -261,6 +261,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
 		servicePackageMap[servicePackageName] = sp
 
 		for _, v := range sp.SDKDataSources(ctx) {
+			v := v
 			typeName := v.TypeName
 
 			if _, ok := provider.DataSourcesMap[typeName]; ok {
@@ -299,6 +300,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
 		}
 
 		for _, v := range sp.SDKResources(ctx) {
+			v := v
 			typeName := v.TypeName
 
 			if _, ok := provider.ResourcesMap[typeName]; ok {