From 70c0c23e98f84051bca51e3bf6caf553e1662595 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 08:39:07 -0500 Subject: [PATCH 001/232] semgrep rule to find transparent tagging CustomizeDiff. --- .ci/semgrep/framework/transparent_tagging.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .ci/semgrep/framework/transparent_tagging.yml diff --git a/.ci/semgrep/framework/transparent_tagging.yml b/.ci/semgrep/framework/transparent_tagging.yml new file mode 100644 index 000000000000..ad705796b6d1 --- /dev/null +++ b/.ci/semgrep/framework/transparent_tagging.yml @@ -0,0 +1,13 @@ +rules: + - id: transparent-tagging-customizediff-in-wrapper + languages: [go] + message: Don't implement a transparent tagging CustomizeDiff function + paths: + include: + - "internal/service/*/*.go" + exclude: + - "internal/service/*/*_test.go" + patterns: + - pattern-regex: CustomizeDiff:\s+verify\.SetTagsDiff, + fix: "" + severity: WARNING From f4569ebcbb513d4d8c2ea9f15765b282204dc5c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 12:37:30 -0500 Subject: [PATCH 002/232] provider: Add 'setTagsAll'. --- internal/provider/provider.go | 5 +- internal/provider/wrap.go | 136 ++++++++++++++++++++++++++++------ 2 files changed, 115 insertions(+), 26 deletions(-) diff --git a/internal/provider/provider.go b/internal/provider/provider.go index 5b40b2f443e0..19c9cd71902e 100644 --- a/internal/provider/provider.go +++ b/internal/provider/provider.go @@ -402,8 +402,9 @@ func New(ctx context.Context) (*schema.Provider, error) { return ctx }, - interceptors: interceptors, - typeName: typeName, + interceptors: interceptors, + typeName: typeName, + usesTransparentTagging: v.Tags != nil, } wrapResource(r, opts) provider.ResourcesMap[typeName] = r diff --git a/internal/provider/wrap.go b/internal/provider/wrap.go index e9589a9bb49f..85bdeaf24bdd 100644 --- a/internal/provider/wrap.go +++ b/internal/provider/wrap.go @@ -5,8 +5,13 @@ package provider import ( "context" + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/names" ) // contextFunc augments Context. @@ -40,9 +45,10 @@ func (w *wrappedDataSource) read(f schema.ReadContextFunc) schema.ReadContextFun type wrappedResourceOptions struct { // bootstrapContext is run on all wrapped methods before any interceptors. - bootstrapContext contextFunc - interceptors interceptorItems - typeName string + bootstrapContext contextFunc + interceptors interceptorItems + typeName string + usesTransparentTagging bool } // wrappedResource represents an interceptor dispatcher for a Plugin SDK v2 resource. @@ -55,50 +61,56 @@ func wrapResource(r *schema.Resource, opts wrappedResourceOptions) { opts: opts, } - if v := r.CreateWithoutTimeout; v != nil { - r.CreateWithoutTimeout = w.create(v) - } - if v := r.ReadWithoutTimeout; v != nil { - r.ReadWithoutTimeout = w.read(v) - } - if v := r.UpdateWithoutTimeout; v != nil { - r.UpdateWithoutTimeout = w.update(v) - } - if v := r.DeleteWithoutTimeout; v != nil { - r.DeleteWithoutTimeout = w.delete(v) - } + r.CreateWithoutTimeout = w.create(r.CreateWithoutTimeout) + r.ReadWithoutTimeout = w.read(r.ReadWithoutTimeout) + r.UpdateWithoutTimeout = w.update(r.UpdateWithoutTimeout) + r.DeleteWithoutTimeout = w.delete(r.DeleteWithoutTimeout) if v := r.Importer; v != nil { - if v := v.StateContext; v != nil { - r.Importer.StateContext = w.state(v) - } - } - if v := r.CustomizeDiff; v != nil { - r.CustomizeDiff = w.customizeDiff(v) + r.Importer.StateContext = w.state(v.StateContext) } + r.CustomizeDiff = w.customizeDiff(r.CustomizeDiff) for i, v := range r.StateUpgraders { - if v := v.Upgrade; v != nil { - r.StateUpgraders[i].Upgrade = w.stateUpgrade(v) - } + r.StateUpgraders[i].Upgrade = w.stateUpgrade(v.Upgrade) } } func (w *wrappedResource) create(f schema.CreateContextFunc) schema.CreateContextFunc { + if f == nil { + return nil + } + return interceptedHandler(w.opts.bootstrapContext, w.opts.interceptors, f, Create) } func (w *wrappedResource) read(f schema.ReadContextFunc) schema.ReadContextFunc { + if f == nil { + return nil + } + return interceptedHandler(w.opts.bootstrapContext, w.opts.interceptors, f, Read) } func (w *wrappedResource) update(f schema.UpdateContextFunc) schema.UpdateContextFunc { + if f == nil { + return nil + } + return interceptedHandler(w.opts.bootstrapContext, w.opts.interceptors, f, Update) } func (w *wrappedResource) delete(f schema.DeleteContextFunc) schema.DeleteContextFunc { + if f == nil { + return nil + } + return interceptedHandler(w.opts.bootstrapContext, w.opts.interceptors, f, Delete) } func (w *wrappedResource) state(f schema.StateContextFunc) schema.StateContextFunc { + if f == nil { + return nil + } + return func(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { ctx = w.opts.bootstrapContext(ctx, meta) return f(ctx, d, meta) @@ -106,6 +118,24 @@ func (w *wrappedResource) state(f schema.StateContextFunc) schema.StateContextFu } func (w *wrappedResource) customizeDiff(f schema.CustomizeDiffFunc) schema.CustomizeDiffFunc { + if w.opts.usesTransparentTagging { + if f == nil { + return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { + ctx = w.opts.bootstrapContext(ctx, meta) + return setTagsAll(ctx, d, meta) + } + } else { + return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { + ctx = w.opts.bootstrapContext(ctx, meta) + return customdiff.Sequence(setTagsAll, f)(ctx, d, meta) + } + } + } + + if f == nil { + return nil + } + return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { ctx = w.opts.bootstrapContext(ctx, meta) return f(ctx, d, meta) @@ -113,8 +143,66 @@ func (w *wrappedResource) customizeDiff(f schema.CustomizeDiffFunc) schema.Custo } func (w *wrappedResource) stateUpgrade(f schema.StateUpgradeFunc) schema.StateUpgradeFunc { + if f == nil { + return nil + } + return func(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) { ctx = w.opts.bootstrapContext(ctx, meta) return f(ctx, rawState, meta) } } + +// setTagsAll is a CustomizeDiff function that calculates the new value for the `tags_all` attribute. +func setTagsAll(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error { + c := meta.(*conns.AWSClient) + + if !d.GetRawPlan().GetAttr(names.AttrTags).IsWhollyKnown() { + if err := d.SetNewComputed(names.AttrTagsAll); err != nil { + return fmt.Errorf("setting tags_all to Computed: %w", err) + } + return nil + } + + newTags := tftags.New(ctx, d.Get(names.AttrTags).(map[string]interface{})) + allTags := c.DefaultTagsConfig(ctx).MergeTags(newTags).IgnoreConfig(c.IgnoreTagsConfig(ctx)) + if d.HasChange(names.AttrTags) { + if newTags.HasZeroValue() { + if err := d.SetNewComputed(names.AttrTagsAll); err != nil { + return fmt.Errorf("setting tags_all to Computed: %w", err) + } + } + + if len(allTags) > 0 && (!newTags.HasZeroValue() || !allTags.HasZeroValue()) { + if err := d.SetNew(names.AttrTagsAll, allTags.Map()); err != nil { + return fmt.Errorf("setting new tags_all diff: %w", err) + } + } + + if len(allTags) == 0 { + if err := d.SetNew(names.AttrTagsAll, allTags.Map()); err != nil { + return fmt.Errorf("setting new tags_all diff: %w", err) + } + } + } else { + if len(allTags) > 0 && !allTags.HasZeroValue() { + if err := d.SetNew(names.AttrTagsAll, allTags.Map()); err != nil { + return fmt.Errorf("setting new tags_all diff: %w", err) + } + return nil + } + + var newTagsAll tftags.KeyValueTags + if v, ok := d.Get(names.AttrTagsAll).(map[string]interface{}); ok { + newTagsAll = tftags.New(ctx, v) + } + if len(allTags) > 0 && !newTagsAll.DeepEqual(allTags) && allTags.HasZeroValue() { + if err := d.SetNewComputed(names.AttrTagsAll); err != nil { + return fmt.Errorf("setting tags_all to Computed: %w", err) + } + return nil + } + } + + return nil +} From c2806e014fa66f84bbc843b575feb2b914e4e1cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:43 -0500 Subject: [PATCH 003/232] Remove transparent tagging-only CustomizeDiff - accessanalyzer. --- internal/service/accessanalyzer/analyzer.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/accessanalyzer/analyzer.go b/internal/service/accessanalyzer/analyzer.go index 64f12ae1ce72..eeaf984f38e6 100644 --- a/internal/service/accessanalyzer/analyzer.go +++ b/internal/service/accessanalyzer/analyzer.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -98,8 +97,6 @@ func resourceAnalyzer() *schema.Resource { ValidateDiagFunc: enum.Validate[types.Type](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 4c19c56e71b7de29c51f0556bb6608a3c6928aeb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:43 -0500 Subject: [PATCH 004/232] Remove transparent tagging-only CustomizeDiff - acmpca. --- internal/service/acmpca/certificate_authority.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/acmpca/certificate_authority.go b/internal/service/acmpca/certificate_authority.go index b1c12f9c2390..f9b9e1d04a8c 100644 --- a/internal/service/acmpca/certificate_authority.go +++ b/internal/service/acmpca/certificate_authority.go @@ -331,8 +331,6 @@ func resourceCertificateAuthority() *schema.Resource { ValidateDiagFunc: enum.Validate[types.CertificateAuthorityUsageMode](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 0bf82ceed683aa1c68cb6f5273bf643def2af497 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:43 -0500 Subject: [PATCH 005/232] Remove transparent tagging-only CustomizeDiff - amplify. --- internal/service/amplify/branch.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/amplify/branch.go b/internal/service/amplify/branch.go index 0a0cae64c00e..b83781b8880c 100644 --- a/internal/service/amplify/branch.go +++ b/internal/service/amplify/branch.go @@ -42,8 +42,6 @@ func resourceBranch() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "app_id": { Type: schema.TypeString, From ae42c2563a554dfce4ee380b8dbb11675c2e7a31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 006/232] Remove transparent tagging-only CustomizeDiff - apigateway. --- internal/service/apigateway/api_key.go | 3 --- internal/service/apigateway/client_certificate.go | 3 --- internal/service/apigateway/domain_name.go | 2 -- internal/service/apigateway/rest_api.go | 2 -- internal/service/apigateway/stage.go | 2 -- internal/service/apigateway/usage_plan.go | 3 --- internal/service/apigateway/vpc_link.go | 3 --- 7 files changed, 18 deletions(-) diff --git a/internal/service/apigateway/api_key.go b/internal/service/apigateway/api_key.go index 6351d6ff42b0..347d68b8fa35 100644 --- a/internal/service/apigateway/api_key.go +++ b/internal/service/apigateway/api_key.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -81,8 +80,6 @@ func resourceAPIKey() *schema.Resource { ValidateFunc: validation.StringLenBetween(20, 128), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/client_certificate.go b/internal/service/apigateway/client_certificate.go index 8075eb07a11e..dab8eee1e88b 100644 --- a/internal/service/apigateway/client_certificate.go +++ b/internal/service/apigateway/client_certificate.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -62,8 +61,6 @@ func resourceClientCertificate() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/domain_name.go b/internal/service/apigateway/domain_name.go index 2673104247e2..d70b872664ae 100644 --- a/internal/service/apigateway/domain_name.go +++ b/internal/service/apigateway/domain_name.go @@ -186,8 +186,6 @@ func resourceDomainName() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/rest_api.go b/internal/service/apigateway/rest_api.go index 0efcdfa0992f..7c4109352503 100644 --- a/internal/service/apigateway/rest_api.go +++ b/internal/service/apigateway/rest_api.go @@ -172,8 +172,6 @@ func resourceRestAPI() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/stage.go b/internal/service/apigateway/stage.go index 32b7171e16c1..154796ff1735 100644 --- a/internal/service/apigateway/stage.go +++ b/internal/service/apigateway/stage.go @@ -164,8 +164,6 @@ func resourceStage() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/usage_plan.go b/internal/service/apigateway/usage_plan.go index 0a7da7602278..e2bfa55bd0b0 100644 --- a/internal/service/apigateway/usage_plan.go +++ b/internal/service/apigateway/usage_plan.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -142,8 +141,6 @@ func resourceUsagePlan() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigateway/vpc_link.go b/internal/service/apigateway/vpc_link.go index 26690dfb717e..b455c8da9d5c 100644 --- a/internal/service/apigateway/vpc_link.go +++ b/internal/service/apigateway/vpc_link.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -63,8 +62,6 @@ func resourceVPCLink() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From ff8ccd58f61a708ff63bfedbf24ebb4a06902249 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 007/232] Remove transparent tagging-only CustomizeDiff - apigatewayv2. --- internal/service/apigatewayv2/api.go | 2 -- internal/service/apigatewayv2/domain_name.go | 2 -- internal/service/apigatewayv2/stage.go | 2 -- internal/service/apigatewayv2/vpc_link.go | 3 --- 4 files changed, 9 deletions(-) diff --git a/internal/service/apigatewayv2/api.go b/internal/service/apigatewayv2/api.go index 88a4d7600881..9f7cf62ffbd8 100644 --- a/internal/service/apigatewayv2/api.go +++ b/internal/service/apigatewayv2/api.go @@ -166,8 +166,6 @@ func resourceAPI() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 64), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigatewayv2/domain_name.go b/internal/service/apigatewayv2/domain_name.go index a6c389e0a82f..1b7e7b066873 100644 --- a/internal/service/apigatewayv2/domain_name.go +++ b/internal/service/apigatewayv2/domain_name.go @@ -123,8 +123,6 @@ func resourceDomainName() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigatewayv2/stage.go b/internal/service/apigatewayv2/stage.go index 10e0c959b92a..b91f27517c04 100644 --- a/internal/service/apigatewayv2/stage.go +++ b/internal/service/apigatewayv2/stage.go @@ -184,8 +184,6 @@ func resourceStage() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apigatewayv2/vpc_link.go b/internal/service/apigatewayv2/vpc_link.go index ef086c5886cd..d6820069d8a4 100644 --- a/internal/service/apigatewayv2/vpc_link.go +++ b/internal/service/apigatewayv2/vpc_link.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -66,8 +65,6 @@ func resourceVPCLink() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 41b75d64b528abf7aee9bfcfe94f4a4489e9edce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 008/232] Remove transparent tagging-only CustomizeDiff - appautoscaling. --- internal/service/appautoscaling/target.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/appautoscaling/target.go b/internal/service/appautoscaling/target.go index cf6ebb7b8b8a..f43aa1952111 100644 --- a/internal/service/appautoscaling/target.go +++ b/internal/service/appautoscaling/target.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -102,8 +101,6 @@ func resourceTarget() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 6d33639ea847722f5675fc2efd566d83c92ecd77 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 009/232] Remove transparent tagging-only CustomizeDiff - appconfig. --- internal/service/appconfig/application.go | 2 -- internal/service/appconfig/configuration_profile.go | 1 - internal/service/appconfig/deployment.go | 1 - internal/service/appconfig/deployment_strategy.go | 2 -- internal/service/appconfig/extension.go | 2 -- 5 files changed, 8 deletions(-) diff --git a/internal/service/appconfig/application.go b/internal/service/appconfig/application.go index 691e008a8ee3..826749e7c467 100644 --- a/internal/service/appconfig/application.go +++ b/internal/service/appconfig/application.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -53,7 +52,6 @@ func ResourceApplication() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appconfig/configuration_profile.go b/internal/service/appconfig/configuration_profile.go index 2797a8bcd101..af8d313b0512 100644 --- a/internal/service/appconfig/configuration_profile.go +++ b/internal/service/appconfig/configuration_profile.go @@ -115,7 +115,6 @@ func ResourceConfigurationProfile() *schema.Resource { }, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appconfig/deployment.go b/internal/service/appconfig/deployment.go index 8e2a51dac9ae..bc0882abb5bc 100644 --- a/internal/service/appconfig/deployment.go +++ b/internal/service/appconfig/deployment.go @@ -106,7 +106,6 @@ func ResourceDeployment() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appconfig/deployment_strategy.go b/internal/service/appconfig/deployment_strategy.go index b3c72d1ebba4..3926b53e4e31 100644 --- a/internal/service/appconfig/deployment_strategy.go +++ b/internal/service/appconfig/deployment_strategy.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,7 +81,6 @@ func ResourceDeploymentStrategy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appconfig/extension.go b/internal/service/appconfig/extension.go index 5c444cd4fd49..24b1afa114c4 100644 --- a/internal/service/appconfig/extension.go +++ b/internal/service/appconfig/extension.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -121,7 +120,6 @@ func ResourceExtension() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } From 5957d24b85b5f81f0a7e3dd7754d5099dbff390a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 010/232] Remove transparent tagging-only CustomizeDiff - appflow. --- internal/service/appflow/flow.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/appflow/flow.go b/internal/service/appflow/flow.go index 682fc4afd28e..0f124896ced1 100644 --- a/internal/service/appflow/flow.go +++ b/internal/service/appflow/flow.go @@ -1343,8 +1343,6 @@ func resourceFlow() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From fe91ef9b9acb4f50f83cc537a4c698213ed3ff65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 011/232] Remove transparent tagging-only CustomizeDiff - appintegrations. --- internal/service/appintegrations/data_integration.go | 3 --- internal/service/appintegrations/event_integration.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/appintegrations/data_integration.go b/internal/service/appintegrations/data_integration.go index 63af73ae5d6f..9bb2b843ca69 100644 --- a/internal/service/appintegrations/data_integration.go +++ b/internal/service/appintegrations/data_integration.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -106,8 +105,6 @@ func resourceDataIntegration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appintegrations/event_integration.go b/internal/service/appintegrations/event_integration.go index 53b0de826cb7..02177d66d7f4 100644 --- a/internal/service/appintegrations/event_integration.go +++ b/internal/service/appintegrations/event_integration.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -76,7 +75,6 @@ func resourceEventIntegration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 9ccb6fed6feef03f8cc03caf389e893e46bdde14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 012/232] Remove transparent tagging-only CustomizeDiff - applicationinsights. --- internal/service/applicationinsights/application.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/applicationinsights/application.go b/internal/service/applicationinsights/application.go index d13013536928..59db63d73777 100644 --- a/internal/service/applicationinsights/application.go +++ b/internal/service/applicationinsights/application.go @@ -80,8 +80,6 @@ func resourceApplication() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From d57965d79b30142424dd83528d99f6e102b31699 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 013/232] Remove transparent tagging-only CustomizeDiff - appmesh. --- internal/service/appmesh/gateway_route.go | 2 -- internal/service/appmesh/mesh.go | 2 -- internal/service/appmesh/route.go | 2 -- internal/service/appmesh/virtual_gateway.go | 2 -- internal/service/appmesh/virtual_node.go | 2 -- internal/service/appmesh/virtual_router.go | 2 -- internal/service/appmesh/virtual_service.go | 2 -- 7 files changed, 14 deletions(-) diff --git a/internal/service/appmesh/gateway_route.go b/internal/service/appmesh/gateway_route.go index 479826ef7890..0f6e4d55abed 100644 --- a/internal/service/appmesh/gateway_route.go +++ b/internal/service/appmesh/gateway_route.go @@ -91,8 +91,6 @@ func resourceGatewayRoute() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/mesh.go b/internal/service/appmesh/mesh.go index f697138370f4..b4b2422af519 100644 --- a/internal/service/appmesh/mesh.go +++ b/internal/service/appmesh/mesh.go @@ -73,8 +73,6 @@ func resourceMesh() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/route.go b/internal/service/appmesh/route.go index e416bbdccc2c..f876fe9b6a41 100644 --- a/internal/service/appmesh/route.go +++ b/internal/service/appmesh/route.go @@ -92,8 +92,6 @@ func resourceRoute() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/virtual_gateway.go b/internal/service/appmesh/virtual_gateway.go index 6832931aedc1..872ed8c7f4e6 100644 --- a/internal/service/appmesh/virtual_gateway.go +++ b/internal/service/appmesh/virtual_gateway.go @@ -86,8 +86,6 @@ func resourceVirtualGateway() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/virtual_node.go b/internal/service/appmesh/virtual_node.go index e4987d390a1c..599c56356e7b 100644 --- a/internal/service/appmesh/virtual_node.go +++ b/internal/service/appmesh/virtual_node.go @@ -89,8 +89,6 @@ func resourceVirtualNode() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/virtual_router.go b/internal/service/appmesh/virtual_router.go index ffc254c236a0..810023ca4c9b 100644 --- a/internal/service/appmesh/virtual_router.go +++ b/internal/service/appmesh/virtual_router.go @@ -89,8 +89,6 @@ func resourceVirtualRouter() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/appmesh/virtual_service.go b/internal/service/appmesh/virtual_service.go index bf18b9ddf58f..f3d128fcc107 100644 --- a/internal/service/appmesh/virtual_service.go +++ b/internal/service/appmesh/virtual_service.go @@ -84,8 +84,6 @@ func resourceVirtualService() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } From 04063dd260d089486e908055188d381d22344418 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:44 -0500 Subject: [PATCH 014/232] Remove transparent tagging-only CustomizeDiff - apprunner. --- .../service/apprunner/auto_scaling_configuration_version.go | 3 --- internal/service/apprunner/connection.go | 3 --- internal/service/apprunner/observability_configuration.go | 3 --- internal/service/apprunner/service.go | 2 -- internal/service/apprunner/vpc_connector.go | 3 --- internal/service/apprunner/vpc_ingress_connection.go | 2 -- 6 files changed, 16 deletions(-) diff --git a/internal/service/apprunner/auto_scaling_configuration_version.go b/internal/service/apprunner/auto_scaling_configuration_version.go index 2118d902b0a5..8cc162ffa68a 100644 --- a/internal/service/apprunner/auto_scaling_configuration_version.go +++ b/internal/service/apprunner/auto_scaling_configuration_version.go @@ -21,7 +21,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -92,8 +91,6 @@ func resourceAutoScalingConfigurationVersion() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apprunner/connection.go b/internal/service/apprunner/connection.go index 2f8048920bc8..40420aa958eb 100644 --- a/internal/service/apprunner/connection.go +++ b/internal/service/apprunner/connection.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -60,8 +59,6 @@ func resourceConnection() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apprunner/observability_configuration.go b/internal/service/apprunner/observability_configuration.go index f54330f23596..3e1fb0d2a3d3 100644 --- a/internal/service/apprunner/observability_configuration.go +++ b/internal/service/apprunner/observability_configuration.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -76,8 +75,6 @@ func resourceObservabilityConfiguration() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apprunner/service.go b/internal/service/apprunner/service.go index 0474130f53ac..ff5f2b00f6e6 100644 --- a/internal/service/apprunner/service.go +++ b/internal/service/apprunner/service.go @@ -426,8 +426,6 @@ func resourceService() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apprunner/vpc_connector.go b/internal/service/apprunner/vpc_connector.go index 972cde124f3b..f7f8268b871a 100644 --- a/internal/service/apprunner/vpc_connector.go +++ b/internal/service/apprunner/vpc_connector.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -73,8 +72,6 @@ func resourceVPCConnector() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/apprunner/vpc_ingress_connection.go b/internal/service/apprunner/vpc_ingress_connection.go index 012b80c8b03c..598ffc7df05d 100644 --- a/internal/service/apprunner/vpc_ingress_connection.go +++ b/internal/service/apprunner/vpc_ingress_connection.go @@ -84,8 +84,6 @@ func resourceVPCIngressConnection() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7c8eabb3e22afcbbf14ae339e6f20f21b9a57524 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:45 -0500 Subject: [PATCH 015/232] Remove transparent tagging-only CustomizeDiff - appstream. --- internal/service/appstream/image_builder.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/appstream/image_builder.go b/internal/service/appstream/image_builder.go index 1e9c82cd72e6..c9227015df37 100644 --- a/internal/service/appstream/image_builder.go +++ b/internal/service/appstream/image_builder.go @@ -176,8 +176,6 @@ func ResourceImageBuilder() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 179ce2430de0ec5da9094dd6d8e1cb16a90afb59 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:45 -0500 Subject: [PATCH 016/232] Remove transparent tagging-only CustomizeDiff - appsync. --- internal/service/appsync/graphql_api.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index 4fe10975da4c..868004d7ab68 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.go @@ -320,8 +320,6 @@ func resourceGraphQLAPI() *schema.Resource { Optional: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From f575f2491f2ce4ce95e0fbdbee56adaee0199b40 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:45 -0500 Subject: [PATCH 017/232] Remove transparent tagging-only CustomizeDiff - athena. --- internal/service/athena/data_catalog.go | 3 --- internal/service/athena/workgroup.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/athena/data_catalog.go b/internal/service/athena/data_catalog.go index d54c5d1d3a6f..2513325ce39e 100644 --- a/internal/service/athena/data_catalog.go +++ b/internal/service/athena/data_catalog.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -41,8 +40,6 @@ func resourceDataCatalog() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/athena/workgroup.go b/internal/service/athena/workgroup.go index 7a417943ab7a..14e188205f26 100644 --- a/internal/service/athena/workgroup.go +++ b/internal/service/athena/workgroup.go @@ -179,8 +179,6 @@ func resourceWorkGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 6ce14f2b4c9b7863c80e491e301164c1a92ab753 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:45 -0500 Subject: [PATCH 018/232] Remove transparent tagging-only CustomizeDiff - backup. --- internal/service/backup/framework.go | 3 --- internal/service/backup/plan.go | 2 -- internal/service/backup/report_plan.go | 3 --- internal/service/backup/vault.go | 2 -- 4 files changed, 10 deletions(-) diff --git a/internal/service/backup/framework.go b/internal/service/backup/framework.go index e21f544a4302..7c42bce4bdaf 100644 --- a/internal/service/backup/framework.go +++ b/internal/service/backup/framework.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -143,8 +142,6 @@ func resourceFramework() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/backup/plan.go b/internal/service/backup/plan.go index 6e1345ae85d6..f36dff923119 100644 --- a/internal/service/backup/plan.go +++ b/internal/service/backup/plan.go @@ -196,8 +196,6 @@ func resourcePlan() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/backup/report_plan.go b/internal/service/backup/report_plan.go index 404dfcd57a27..0365ed9454a8 100644 --- a/internal/service/backup/report_plan.go +++ b/internal/service/backup/report_plan.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -141,8 +140,6 @@ func resourceReportPlan() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/backup/vault.go b/internal/service/backup/vault.go index 743b82979973..a2b49094e4d4 100644 --- a/internal/service/backup/vault.go +++ b/internal/service/backup/vault.go @@ -81,8 +81,6 @@ func resourceVault() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 85e2ca660c4a80ac1a1539d0590af819f653a4c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:45 -0500 Subject: [PATCH 019/232] Remove transparent tagging-only CustomizeDiff - batch. --- internal/service/batch/scheduling_policy.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/batch/scheduling_policy.go b/internal/service/batch/scheduling_policy.go index 3352d10dcd2f..c03859f57d26 100644 --- a/internal/service/batch/scheduling_policy.go +++ b/internal/service/batch/scheduling_policy.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -89,8 +88,6 @@ func resourceSchedulingPolicy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 8e7fa62275bde473589c4affa04aba1956e0986f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 020/232] Remove transparent tagging-only CustomizeDiff - budgets. --- internal/service/budgets/budget.go | 1 - internal/service/budgets/budget_action.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/budgets/budget.go b/internal/service/budgets/budget.go index e55e52e2aec6..36cbb4c2f63e 100644 --- a/internal/service/budgets/budget.go +++ b/internal/service/budgets/budget.go @@ -295,7 +295,6 @@ func ResourceBudget() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.TimeUnit](), }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/budgets/budget_action.go b/internal/service/budgets/budget_action.go index 4d50cae04018..b0ad38d3d582 100644 --- a/internal/service/budgets/budget_action.go +++ b/internal/service/budgets/budget_action.go @@ -227,7 +227,6 @@ func ResourceBudgetAction() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 59c576fda3af8e6255a188d0180bf828ee87a3fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 021/232] Remove transparent tagging-only CustomizeDiff - ce. --- internal/service/ce/anomaly_monitor.go | 2 -- internal/service/ce/anomaly_subscription.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/ce/anomaly_monitor.go b/internal/service/ce/anomaly_monitor.go index e25282f2154e..27d4e48d9453 100644 --- a/internal/service/ce/anomaly_monitor.go +++ b/internal/service/ce/anomaly_monitor.go @@ -77,8 +77,6 @@ func resourceAnomalyMonitor() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ce/anomaly_subscription.go b/internal/service/ce/anomaly_subscription.go index 02778f2c13d0..4186e09463b7 100644 --- a/internal/service/ce/anomaly_subscription.go +++ b/internal/service/ce/anomaly_subscription.go @@ -103,8 +103,6 @@ func resourceAnomalySubscription() *schema.Resource { Elem: expressionElem(anomalySubscriptionRootElementSchemaLevel), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 0acd716d6a60977fa1f62af7aedd213467b9263d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 022/232] Remove transparent tagging-only CustomizeDiff - chimesdkmediapipelines. --- .../media_insights_pipeline_configuration.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go index 7c0975622f92..c993b5dd499d 100644 --- a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go +++ b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go @@ -105,8 +105,6 @@ func ResourceMediaInsightsPipelineConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 4be32bfa702bf4efd4da7c8cf0275fd1d4fddf3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 023/232] Remove transparent tagging-only CustomizeDiff - chimesdkvoice. --- internal/service/chimesdkvoice/sip_media_application.go | 1 - internal/service/chimesdkvoice/voice_profile_domain.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/chimesdkvoice/sip_media_application.go b/internal/service/chimesdkvoice/sip_media_application.go index 0db3ff0507b9..095ff5efda8e 100644 --- a/internal/service/chimesdkvoice/sip_media_application.go +++ b/internal/service/chimesdkvoice/sip_media_application.go @@ -68,7 +68,6 @@ func ResourceSipMediaApplication() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/chimesdkvoice/voice_profile_domain.go b/internal/service/chimesdkvoice/voice_profile_domain.go index a59bbd63421d..e421b5e8b935 100644 --- a/internal/service/chimesdkvoice/voice_profile_domain.go +++ b/internal/service/chimesdkvoice/voice_profile_domain.go @@ -89,8 +89,6 @@ func ResourceVoiceProfileDomain() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 90e32069cdc3ec8e1c1d1805700664d57ed44028 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 024/232] Remove transparent tagging-only CustomizeDiff - cleanrooms. --- internal/service/cleanrooms/collaboration.go | 2 -- internal/service/cleanrooms/configured_table.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/cleanrooms/collaboration.go b/internal/service/cleanrooms/collaboration.go index 1b165b400056..87ad18134498 100644 --- a/internal/service/cleanrooms/collaboration.go +++ b/internal/service/cleanrooms/collaboration.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -149,7 +148,6 @@ func ResourceCollaboration() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/cleanrooms/configured_table.go b/internal/service/cleanrooms/configured_table.go index 1b5637039459..bb511d6cc4c0 100644 --- a/internal/service/cleanrooms/configured_table.go +++ b/internal/service/cleanrooms/configured_table.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -103,7 +102,6 @@ func ResourceConfiguredTable() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } From c477467605261a948137a4319c396a1b77dda121 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:46 -0500 Subject: [PATCH 025/232] Remove transparent tagging-only CustomizeDiff - cloud9. --- internal/service/cloud9/environment_ec2.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/cloud9/environment_ec2.go b/internal/service/cloud9/environment_ec2.go index 6c295dcb6e97..f4d7e357ce63 100644 --- a/internal/service/cloud9/environment_ec2.go +++ b/internal/service/cloud9/environment_ec2.go @@ -109,8 +109,6 @@ func resourceEnvironmentEC2() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From c65906e3b26a05c8852e91f90de081847551f613 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 026/232] Remove transparent tagging-only CustomizeDiff - cloudformation. --- internal/service/cloudformation/stack_set.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/cloudformation/stack_set.go b/internal/service/cloudformation/stack_set.go index 3428c3361853..ef01dfc6f561 100644 --- a/internal/service/cloudformation/stack_set.go +++ b/internal/service/cloudformation/stack_set.go @@ -212,8 +212,6 @@ func resourceStackSet() *schema.Resource { ConflictsWith: []string{"template_body"}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From e0291151d2ac84b012e8162eed907512217c5043 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 027/232] Remove transparent tagging-only CustomizeDiff - cloudfront. --- internal/service/cloudfront/distribution.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/cloudfront/distribution.go b/internal/service/cloudfront/distribution.go index 28e9a307bf80..b6989a7e9f58 100644 --- a/internal/service/cloudfront/distribution.go +++ b/internal/service/cloudfront/distribution.go @@ -890,8 +890,6 @@ func resourceDistribution() *schema.Resource { Optional: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 479fbdbc49cdb8128d6d8c02c381a49cfa9fd853 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 028/232] Remove transparent tagging-only CustomizeDiff - cloudhsmv2. --- internal/service/cloudhsmv2/cluster.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/cloudhsmv2/cluster.go b/internal/service/cloudhsmv2/cluster.go index 7f91b74ff531..b5a965f9f545 100644 --- a/internal/service/cloudhsmv2/cluster.go +++ b/internal/service/cloudhsmv2/cluster.go @@ -24,7 +24,6 @@ import ( tfmaps "github.com/hashicorp/terraform-provider-aws/internal/maps" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -119,8 +118,6 @@ func resourceCluster() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7da456d35b3bfa2841274b78735d0b9c4f0d2070 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 029/232] Remove transparent tagging-only CustomizeDiff - cloudtrail. --- internal/service/cloudtrail/event_data_store.go | 3 --- internal/service/cloudtrail/trail.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/cloudtrail/event_data_store.go b/internal/service/cloudtrail/event_data_store.go index 1898622b20c8..b4310293e62c 100644 --- a/internal/service/cloudtrail/event_data_store.go +++ b/internal/service/cloudtrail/event_data_store.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types/nullable" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -46,8 +45,6 @@ func resourceEventDataStore() *schema.Resource { Delete: schema.DefaultTimeout(5 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "advanced_event_selector": { Type: schema.TypeList, diff --git a/internal/service/cloudtrail/trail.go b/internal/service/cloudtrail/trail.go index 22789426bf63..0f77635fa4ac 100644 --- a/internal/service/cloudtrail/trail.go +++ b/internal/service/cloudtrail/trail.go @@ -264,8 +264,6 @@ func resourceTrail() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7d48339babe89294615d7c9f27c7e68c7d96f90a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 030/232] Remove transparent tagging-only CustomizeDiff - cloudwatch. --- internal/service/cloudwatch/composite_alarm.go | 2 -- internal/service/cloudwatch/metric_stream.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/cloudwatch/composite_alarm.go b/internal/service/cloudwatch/composite_alarm.go index 49df78f7fbc2..2d30ce678d18 100644 --- a/internal/service/cloudwatch/composite_alarm.go +++ b/internal/service/cloudwatch/composite_alarm.go @@ -114,8 +114,6 @@ func resourceCompositeAlarm() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/cloudwatch/metric_stream.go b/internal/service/cloudwatch/metric_stream.go index 2401f055ccab..f41e6548ad1c 100644 --- a/internal/service/cloudwatch/metric_stream.go +++ b/internal/service/cloudwatch/metric_stream.go @@ -47,8 +47,6 @@ func resourceMetricStream() *schema.Resource { Delete: schema.DefaultTimeout(2 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From cc24c7bec05410fd752ca9ab9b3594833464412c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 031/232] Remove transparent tagging-only CustomizeDiff - codeartifact. --- internal/service/codeartifact/domain.go | 2 -- internal/service/codeartifact/repository.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/codeartifact/domain.go b/internal/service/codeartifact/domain.go index 07961be54407..9f698d429d1e 100644 --- a/internal/service/codeartifact/domain.go +++ b/internal/service/codeartifact/domain.go @@ -79,8 +79,6 @@ func resourceDomain() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/codeartifact/repository.go b/internal/service/codeartifact/repository.go index a0291778cbf1..ff711a82b8a0 100644 --- a/internal/service/codeartifact/repository.go +++ b/internal/service/codeartifact/repository.go @@ -105,8 +105,6 @@ func resourceRepository() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 4319eaf3bc91712c0a85ff24829cd70f0b9b3134 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:47 -0500 Subject: [PATCH 032/232] Remove transparent tagging-only CustomizeDiff - codebuild. --- internal/service/codebuild/fleet.go | 1 - internal/service/codebuild/report_group.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/codebuild/fleet.go b/internal/service/codebuild/fleet.go index 5058897afdad..277651f69afc 100644 --- a/internal/service/codebuild/fleet.go +++ b/internal/service/codebuild/fleet.go @@ -219,7 +219,6 @@ func resourceFleet() *schema.Resource { }, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/codebuild/report_group.go b/internal/service/codebuild/report_group.go index d0260f8346d1..509fc5386000 100644 --- a/internal/service/codebuild/report_group.go +++ b/internal/service/codebuild/report_group.go @@ -112,8 +112,6 @@ func resourceReportGroup() *schema.Resource { ValidateDiagFunc: enum.Validate[types.ReportType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From d41d1ae9cc442524bfda120b13de267fb012bbf8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 033/232] Remove transparent tagging-only CustomizeDiff - codecommit. --- internal/service/codecommit/repository.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/codecommit/repository.go b/internal/service/codecommit/repository.go index 93147c387cde..631c806336ca 100644 --- a/internal/service/codecommit/repository.go +++ b/internal/service/codecommit/repository.go @@ -77,8 +77,6 @@ func resourceRepository() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From a5be1bbe86181c6eed5f146f1002f426a48bf424 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 034/232] Remove transparent tagging-only CustomizeDiff - codegurureviewer. --- internal/service/codegurureviewer/repository_association.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/codegurureviewer/repository_association.go b/internal/service/codegurureviewer/repository_association.go index 38dd72bd4ed3..f6fbb231aea7 100644 --- a/internal/service/codegurureviewer/repository_association.go +++ b/internal/service/codegurureviewer/repository_association.go @@ -259,8 +259,6 @@ func resourceRepositoryAssociation() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 3c71ee36665f5d3ccea790ceba3db0fd736e7282 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 035/232] Remove transparent tagging-only CustomizeDiff - codepipeline. --- internal/service/codepipeline/codepipeline.go | 2 -- internal/service/codepipeline/custom_action_type.go | 3 --- internal/service/codepipeline/webhook.go | 3 --- 3 files changed, 8 deletions(-) diff --git a/internal/service/codepipeline/codepipeline.go b/internal/service/codepipeline/codepipeline.go index 9caa648658f0..c338fb014231 100644 --- a/internal/service/codepipeline/codepipeline.go +++ b/internal/service/codepipeline/codepipeline.go @@ -455,8 +455,6 @@ func resourcePipeline() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/codepipeline/custom_action_type.go b/internal/service/codepipeline/custom_action_type.go index 57c2a8e5dc26..51d068e37979 100644 --- a/internal/service/codepipeline/custom_action_type.go +++ b/internal/service/codepipeline/custom_action_type.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -178,8 +177,6 @@ func resourceCustomActionType() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 9), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/codepipeline/webhook.go b/internal/service/codepipeline/webhook.go index b1ab5c94a1ca..181b464920dc 100644 --- a/internal/service/codepipeline/webhook.go +++ b/internal/service/codepipeline/webhook.go @@ -21,7 +21,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -119,8 +118,6 @@ func resourceWebhook() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 5fde0047195638ecbead5cf9f44530ebaf50aa50 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 036/232] Remove transparent tagging-only CustomizeDiff - codestarconnections. --- internal/service/codestarconnections/connection.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/codestarconnections/connection.go b/internal/service/codestarconnections/connection.go index 35d842fa578e..bb77af66a0a8 100644 --- a/internal/service/codestarconnections/connection.go +++ b/internal/service/codestarconnections/connection.go @@ -68,8 +68,6 @@ func resourceConnection() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From f38274bf95ddaf93493b63396de5665bbf3f39a7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 037/232] Remove transparent tagging-only CustomizeDiff - codestarnotifications. --- internal/service/codestarnotifications/notification_rule.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/codestarnotifications/notification_rule.go b/internal/service/codestarnotifications/notification_rule.go index e43a4c9ce54b..f39294b56685 100644 --- a/internal/service/codestarnotifications/notification_rule.go +++ b/internal/service/codestarnotifications/notification_rule.go @@ -105,8 +105,6 @@ func resourceNotificationRule() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 9f60890a9612b8d3208ce35b667dbe9b31aa5d89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 038/232] Remove transparent tagging-only CustomizeDiff - cognitoidentity. --- internal/service/cognitoidentity/pool.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/cognitoidentity/pool.go b/internal/service/cognitoidentity/pool.go index 7786904c4185..ec26a9486e85 100644 --- a/internal/service/cognitoidentity/pool.go +++ b/internal/service/cognitoidentity/pool.go @@ -122,8 +122,6 @@ func resourcePool() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 1be798afb6b5beb0a04a31f4e19c2780ad152052 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:48 -0500 Subject: [PATCH 039/232] Remove transparent tagging-only CustomizeDiff - cognitoidp. --- internal/service/cognitoidp/user_pool.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/cognitoidp/user_pool.go b/internal/service/cognitoidp/user_pool.go index 2d48d5117aa7..1c229c9e71b7 100644 --- a/internal/service/cognitoidp/user_pool.go +++ b/internal/service/cognitoidp/user_pool.go @@ -711,8 +711,6 @@ func resourceUserPool() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 13f20508da02ebad6f2c5404c20f3c8d3f171d9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 040/232] Remove transparent tagging-only CustomizeDiff - configservice. --- internal/service/configservice/aggregate_authorization.go | 2 -- internal/service/configservice/config_rule.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/internal/service/configservice/aggregate_authorization.go b/internal/service/configservice/aggregate_authorization.go index 84a516bcce64..9564f6c5a9a9 100644 --- a/internal/service/configservice/aggregate_authorization.go +++ b/internal/service/configservice/aggregate_authorization.go @@ -55,8 +55,6 @@ func resourceAggregateAuthorization() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/configservice/config_rule.go b/internal/service/configservice/config_rule.go index fc7e137a320d..62e90003b711 100644 --- a/internal/service/configservice/config_rule.go +++ b/internal/service/configservice/config_rule.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -195,8 +194,6 @@ func resourceConfigRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7cc6aceffeeda4353c3e9418ec8bbccfccafc227 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 041/232] Remove transparent tagging-only CustomizeDiff - connect. --- internal/service/connect/contact_flow.go | 2 -- internal/service/connect/contact_flow_module.go | 2 -- internal/service/connect/hours_of_operation.go | 3 --- internal/service/connect/instance.go | 3 --- internal/service/connect/phone_number.go | 2 -- internal/service/connect/queue.go | 3 --- internal/service/connect/quick_connect.go | 3 --- internal/service/connect/routing_profile.go | 3 --- internal/service/connect/security_profile.go | 3 --- internal/service/connect/user.go | 3 --- internal/service/connect/user_hierarchy_group.go | 3 --- internal/service/connect/vocabulary.go | 3 --- 12 files changed, 33 deletions(-) diff --git a/internal/service/connect/contact_flow.go b/internal/service/connect/contact_flow.go index 0af3d7a15597..a5fe95c715b3 100644 --- a/internal/service/connect/contact_flow.go +++ b/internal/service/connect/contact_flow.go @@ -43,8 +43,6 @@ func resourceContactFlow() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/contact_flow_module.go b/internal/service/connect/contact_flow_module.go index 645c09c4534c..346ef79c9714 100644 --- a/internal/service/connect/contact_flow_module.go +++ b/internal/service/connect/contact_flow_module.go @@ -42,8 +42,6 @@ func resourceContactFlowModule() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/hours_of_operation.go b/internal/service/connect/hours_of_operation.go index 5e52fd7adbb0..52411857adf7 100644 --- a/internal/service/connect/hours_of_operation.go +++ b/internal/service/connect/hours_of_operation.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceHoursOfOperation() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/instance.go b/internal/service/connect/instance.go index a77d250ba2a2..7c3f33fbf0f2 100644 --- a/internal/service/connect/instance.go +++ b/internal/service/connect/instance.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -57,8 +56,6 @@ func resourceInstance() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(5 * time.Minute), Delete: schema.DefaultTimeout(5 * time.Minute), diff --git a/internal/service/connect/phone_number.go b/internal/service/connect/phone_number.go index 6500002672d0..a24e3571d21f 100644 --- a/internal/service/connect/phone_number.go +++ b/internal/service/connect/phone_number.go @@ -46,8 +46,6 @@ func resourcePhoneNumber() *schema.Resource { Delete: schema.DefaultTimeout(2 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/queue.go b/internal/service/connect/queue.go index 11e1064c655c..e40a650a4984 100644 --- a/internal/service/connect/queue.go +++ b/internal/service/connect/queue.go @@ -25,7 +25,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -42,8 +41,6 @@ func resourceQueue() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/quick_connect.go b/internal/service/connect/quick_connect.go index 5a33bbc9c7f2..708bdd7bcb0f 100644 --- a/internal/service/connect/quick_connect.go +++ b/internal/service/connect/quick_connect.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceQuickConnect() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/routing_profile.go b/internal/service/connect/routing_profile.go index 791bd07429e0..bd6ca4b0f3b9 100644 --- a/internal/service/connect/routing_profile.go +++ b/internal/service/connect/routing_profile.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -44,8 +43,6 @@ func resourceRoutingProfile() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/security_profile.go b/internal/service/connect/security_profile.go index da81d62ebb19..a0507b05b7f6 100644 --- a/internal/service/connect/security_profile.go +++ b/internal/service/connect/security_profile.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceSecurityProfile() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/user.go b/internal/service/connect/user.go index 9a09db5ddf80..2e987598b8c3 100644 --- a/internal/service/connect/user.go +++ b/internal/service/connect/user.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceUser() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/connect/user_hierarchy_group.go b/internal/service/connect/user_hierarchy_group.go index bd89b53fecf6..1b0ac2c7dcf7 100644 --- a/internal/service/connect/user_hierarchy_group.go +++ b/internal/service/connect/user_hierarchy_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceUserHierarchyGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaFunc: func() map[string]*schema.Schema { return map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/connect/vocabulary.go b/internal/service/connect/vocabulary.go index 89fcec3f6387..59c1de0164be 100644 --- a/internal/service/connect/vocabulary.go +++ b/internal/service/connect/vocabulary.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -50,8 +49,6 @@ func resourceVocabulary() *schema.Resource { Delete: schema.DefaultTimeout(100 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From e2e39d519ba46ddbcd5b49372a51dc790f2b0bd8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 042/232] Remove transparent tagging-only CustomizeDiff - controltower. --- internal/service/controltower/landing_zone.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/controltower/landing_zone.go b/internal/service/controltower/landing_zone.go index de5706bba987..ea5bc5496cf0 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -89,8 +89,6 @@ func resourceLandingZone() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From eae765dd06e4abfd4f047730b6f83ee1467dfbce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 043/232] Remove transparent tagging-only CustomizeDiff - cur. --- internal/service/cur/report_definition.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/cur/report_definition.go b/internal/service/cur/report_definition.go index ba5a6a765db7..b7433232a304 100644 --- a/internal/service/cur/report_definition.go +++ b/internal/service/cur/report_definition.go @@ -25,7 +25,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -117,8 +116,6 @@ func resourceReportDefinition() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From d1ac6d7b2105604830c48d0f81b22bf3e28e4942 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 044/232] Remove transparent tagging-only CustomizeDiff - customerprofiles. --- internal/service/customerprofiles/domain.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/customerprofiles/domain.go b/internal/service/customerprofiles/domain.go index 35e4f1727235..8bd44aefaf01 100644 --- a/internal/service/customerprofiles/domain.go +++ b/internal/service/customerprofiles/domain.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -200,8 +199,6 @@ func ResourceDomain() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 68c784106afcecd4a537ef834ec54f9bddd695b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 045/232] Remove transparent tagging-only CustomizeDiff - dataexchange. --- internal/service/dataexchange/data_set.go | 2 -- internal/service/dataexchange/revision.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/dataexchange/data_set.go b/internal/service/dataexchange/data_set.go index e8d5397fbc96..4858817145db 100644 --- a/internal/service/dataexchange/data_set.go +++ b/internal/service/dataexchange/data_set.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -58,7 +57,6 @@ func ResourceDataSet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dataexchange/revision.go b/internal/service/dataexchange/revision.go index 1edea240ea0e..6d9602148d99 100644 --- a/internal/service/dataexchange/revision.go +++ b/internal/service/dataexchange/revision.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -58,7 +57,6 @@ func ResourceRevision() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 5d66898f18f689de4b70f8aded8f221d977390bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 046/232] Remove transparent tagging-only CustomizeDiff - datapipeline. --- internal/service/datapipeline/pipeline.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/datapipeline/pipeline.go b/internal/service/datapipeline/pipeline.go index 1d1d068fc129..5f54d8409fd5 100644 --- a/internal/service/datapipeline/pipeline.go +++ b/internal/service/datapipeline/pipeline.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -53,8 +52,6 @@ func resourcePipeline() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 2dd3de473b89c8cb1532fac10bd84ddd64d3effa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:49 -0500 Subject: [PATCH 047/232] Remove transparent tagging-only CustomizeDiff - datasync. --- internal/service/datasync/agent.go | 3 --- internal/service/datasync/location_azure_blob.go | 2 -- internal/service/datasync/location_efs.go | 2 -- internal/service/datasync/location_fsx_lustre_file_system.go | 2 -- internal/service/datasync/location_fsx_ontap_file_system.go | 2 -- internal/service/datasync/location_fsx_openzfs_file_system.go | 2 -- internal/service/datasync/location_fsx_windows_file_system.go | 2 -- internal/service/datasync/location_hdfs.go | 2 -- internal/service/datasync/location_nfs.go | 2 -- internal/service/datasync/location_object_storage.go | 2 -- internal/service/datasync/location_s3.go | 2 -- internal/service/datasync/location_smb.go | 2 -- internal/service/datasync/task.go | 2 -- 13 files changed, 27 deletions(-) diff --git a/internal/service/datasync/agent.go b/internal/service/datasync/agent.go index b22b0799b2c4..c9404a4db5eb 100644 --- a/internal/service/datasync/agent.go +++ b/internal/service/datasync/agent.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -92,8 +91,6 @@ func ResourceAgent() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_azure_blob.go b/internal/service/datasync/location_azure_blob.go index 6630132c57fe..9669644dbd5a 100644 --- a/internal/service/datasync/location_azure_blob.go +++ b/internal/service/datasync/location_azure_blob.go @@ -109,8 +109,6 @@ func resourceLocationAzureBlob() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_efs.go b/internal/service/datasync/location_efs.go index e5e7bac50800..da8c8241953f 100644 --- a/internal/service/datasync/location_efs.go +++ b/internal/service/datasync/location_efs.go @@ -117,8 +117,6 @@ func resourceLocationEFS() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_fsx_lustre_file_system.go b/internal/service/datasync/location_fsx_lustre_file_system.go index 7ec1065ab5a7..da896ec62c4d 100644 --- a/internal/service/datasync/location_fsx_lustre_file_system.go +++ b/internal/service/datasync/location_fsx_lustre_file_system.go @@ -93,8 +93,6 @@ func resourceLocationFSxLustreFileSystem() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_fsx_ontap_file_system.go b/internal/service/datasync/location_fsx_ontap_file_system.go index 24d588857be5..df8236a5875f 100644 --- a/internal/service/datasync/location_fsx_ontap_file_system.go +++ b/internal/service/datasync/location_fsx_ontap_file_system.go @@ -188,8 +188,6 @@ func resourceLocationFSxONTAPFileSystem() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_fsx_openzfs_file_system.go b/internal/service/datasync/location_fsx_openzfs_file_system.go index fb40d4ae522a..deb5d1d2b6ec 100644 --- a/internal/service/datasync/location_fsx_openzfs_file_system.go +++ b/internal/service/datasync/location_fsx_openzfs_file_system.go @@ -131,8 +131,6 @@ func resourceLocationFSxOpenZFSFileSystem() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_fsx_windows_file_system.go b/internal/service/datasync/location_fsx_windows_file_system.go index 4e6257df7766..32bca2cc3c1e 100644 --- a/internal/service/datasync/location_fsx_windows_file_system.go +++ b/internal/service/datasync/location_fsx_windows_file_system.go @@ -112,8 +112,6 @@ func resourceLocationFSxWindowsFileSystem() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 104), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_hdfs.go b/internal/service/datasync/location_hdfs.go index 43398be96aba..d2e87a65aac4 100644 --- a/internal/service/datasync/location_hdfs.go +++ b/internal/service/datasync/location_hdfs.go @@ -173,8 +173,6 @@ func resourceLocationHDFS() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_nfs.go b/internal/service/datasync/location_nfs.go index d7c6f7d414bf..f7b096b8114d 100644 --- a/internal/service/datasync/location_nfs.go +++ b/internal/service/datasync/location_nfs.go @@ -107,8 +107,6 @@ func resourceLocationNFS() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_object_storage.go b/internal/service/datasync/location_object_storage.go index a7e7d82d1ded..c70d77aef52e 100644 --- a/internal/service/datasync/location_object_storage.go +++ b/internal/service/datasync/location_object_storage.go @@ -105,8 +105,6 @@ func resourceLocationObjectStorage() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_s3.go b/internal/service/datasync/location_s3.go index 4338002170b5..3c244e49b0f6 100644 --- a/internal/service/datasync/location_s3.go +++ b/internal/service/datasync/location_s3.go @@ -104,8 +104,6 @@ func resourceLocationS3() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/location_smb.go b/internal/service/datasync/location_smb.go index a91620e4dae8..3d924d552e0b 100644 --- a/internal/service/datasync/location_smb.go +++ b/internal/service/datasync/location_smb.go @@ -113,8 +113,6 @@ func resourceLocationSMB() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 104), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/datasync/task.go b/internal/service/datasync/task.go index 02b93efb7092..32aa8b73fbd4 100644 --- a/internal/service/datasync/task.go +++ b/internal/service/datasync/task.go @@ -301,8 +301,6 @@ func resourceTask() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 425faa058e8c9feade259b598b6d400f4ee221a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 048/232] Remove transparent tagging-only CustomizeDiff - dax. --- internal/service/dax/cluster.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/dax/cluster.go b/internal/service/dax/cluster.go index 92ae1b38c7d7..7f730dc3846a 100644 --- a/internal/service/dax/cluster.go +++ b/internal/service/dax/cluster.go @@ -201,8 +201,6 @@ func ResourceCluster() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 40eff241a5f6eb881d2d457e14c41aa7de00e98c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 049/232] Remove transparent tagging-only CustomizeDiff - deploy. --- internal/service/deploy/app.go | 3 --- internal/service/deploy/deployment_group.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/deploy/app.go b/internal/service/deploy/app.go index b0e4b8fa6e68..280c21217ae0 100644 --- a/internal/service/deploy/app.go +++ b/internal/service/deploy/app.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -92,8 +91,6 @@ func resourceApp() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/deploy/deployment_group.go b/internal/service/deploy/deployment_group.go index 0c9f04438c0a..bda0b07d9026 100644 --- a/internal/service/deploy/deployment_group.go +++ b/internal/service/deploy/deployment_group.go @@ -450,8 +450,6 @@ func resourceDeploymentGroup() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 2b7ed55a1935ba0017e47371bba7a85752c49974 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 050/232] Remove transparent tagging-only CustomizeDiff - detective. --- internal/service/detective/graph.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/detective/graph.go b/internal/service/detective/graph.go index 5382a6c9eacf..205e85fa9220 100644 --- a/internal/service/detective/graph.go +++ b/internal/service/detective/graph.go @@ -19,7 +19,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -48,8 +47,6 @@ func ResourceGraph() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 788e45628565739c43b41bcf82bd070371677e9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 051/232] Remove transparent tagging-only CustomizeDiff - devicefarm. --- internal/service/devicefarm/device_pool.go | 1 - internal/service/devicefarm/instance_profile.go | 2 -- internal/service/devicefarm/network_profile.go | 1 - internal/service/devicefarm/project.go | 3 --- internal/service/devicefarm/test_grid_project.go | 2 -- 5 files changed, 9 deletions(-) diff --git a/internal/service/devicefarm/device_pool.go b/internal/service/devicefarm/device_pool.go index 732cfa3f3e42..efd1d6c3e21c 100644 --- a/internal/service/devicefarm/device_pool.go +++ b/internal/service/devicefarm/device_pool.go @@ -93,7 +93,6 @@ func resourceDevicePool() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/devicefarm/instance_profile.go b/internal/service/devicefarm/instance_profile.go index 8359817ca8e5..99f4cc1ed6d4 100644 --- a/internal/service/devicefarm/instance_profile.go +++ b/internal/service/devicefarm/instance_profile.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -69,7 +68,6 @@ func resourceInstanceProfile() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/devicefarm/network_profile.go b/internal/service/devicefarm/network_profile.go index f01f959af9b1..22bf44f29ea8 100644 --- a/internal/service/devicefarm/network_profile.go +++ b/internal/service/devicefarm/network_profile.go @@ -108,7 +108,6 @@ func resourceNetworkProfile() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/devicefarm/project.go b/internal/service/devicefarm/project.go index b8196d126201..5a89ddda9c8a 100644 --- a/internal/service/devicefarm/project.go +++ b/internal/service/devicefarm/project.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -53,8 +52,6 @@ func resourceProject() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/devicefarm/test_grid_project.go b/internal/service/devicefarm/test_grid_project.go index 6148e5d93ad9..ae8ce16590e8 100644 --- a/internal/service/devicefarm/test_grid_project.go +++ b/internal/service/devicefarm/test_grid_project.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -79,7 +78,6 @@ func resourceTestGridProject() *schema.Resource { }, }, }, - CustomizeDiff: verify.SetTagsDiff, } } From b273f660674ea94726a2c183be01150b3f8dd0f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 052/232] Remove transparent tagging-only CustomizeDiff - directconnect. --- internal/service/directconnect/connection.go | 3 --- .../directconnect/hosted_private_virtual_interface_accepter.go | 3 --- .../directconnect/hosted_public_virtual_interface_accepter.go | 3 --- .../directconnect/hosted_transit_virtual_interface_accepter.go | 3 --- internal/service/directconnect/lag.go | 3 --- internal/service/directconnect/private_virtual_interface.go | 3 --- internal/service/directconnect/transit_virtual_interface.go | 3 --- 7 files changed, 21 deletions(-) diff --git a/internal/service/directconnect/connection.go b/internal/service/directconnect/connection.go index 069d819480c6..cd5ad007763b 100644 --- a/internal/service/directconnect/connection.go +++ b/internal/service/directconnect/connection.go @@ -25,7 +25,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -231,8 +230,6 @@ func resourceConnection() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go index 4a8494930095..99ad4bf1ec5d 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -67,8 +66,6 @@ func resourceHostedPrivateVirtualInterfaceAccepter() *schema.Resource { Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go index ff4ce47b46d6..283b6c6a0102 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -55,8 +54,6 @@ func resourceHostedPublicVirtualInterfaceAccepter() *schema.Resource { Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go index ed198b0251b9..7896cefbaff9 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -60,8 +59,6 @@ func resourceHostedTransitVirtualInterfaceAccepter() *schema.Resource { Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/lag.go b/internal/service/directconnect/lag.go index 01571680c4fb..1d11b2dcd32a 100644 --- a/internal/service/directconnect/lag.go +++ b/internal/service/directconnect/lag.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -91,8 +90,6 @@ func resourceLag() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/private_virtual_interface.go b/internal/service/directconnect/private_virtual_interface.go index 7ce3797911e0..f421a02070eb 100644 --- a/internal/service/directconnect/private_virtual_interface.go +++ b/internal/service/directconnect/private_virtual_interface.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -132,8 +131,6 @@ func resourcePrivateVirtualInterface() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/directconnect/transit_virtual_interface.go b/internal/service/directconnect/transit_virtual_interface.go index 71c23f7e587a..34a3b4edc144 100644 --- a/internal/service/directconnect/transit_virtual_interface.go +++ b/internal/service/directconnect/transit_virtual_interface.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -125,8 +124,6 @@ func resourceTransitVirtualInterface() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } From d4151e27bfe40836c219aafae55b4e4fc9c8d9cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 053/232] Remove transparent tagging-only CustomizeDiff - dlm. --- internal/service/dlm/lifecycle_policy.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 86df105b82fd..c858b201aed7 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -478,8 +478,6 @@ func resourceLifecyclePolicy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From b05210431a56f5dc4ff249a46d5013d6cd577bbe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 054/232] Remove transparent tagging-only CustomizeDiff - dms. --- internal/service/dms/certificate.go | 3 --- internal/service/dms/event_subscription.go | 2 -- internal/service/dms/replication_config.go | 2 -- internal/service/dms/replication_instance.go | 2 -- internal/service/dms/replication_subnet_group.go | 3 --- internal/service/dms/replication_task.go | 2 -- internal/service/dms/s3_endpoint.go | 2 -- 7 files changed, 16 deletions(-) diff --git a/internal/service/dms/certificate.go b/internal/service/dms/certificate.go index 52aba8206c98..9089b0fd9706 100644 --- a/internal/service/dms/certificate.go +++ b/internal/service/dms/certificate.go @@ -21,7 +21,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -71,8 +70,6 @@ func resourceCertificate() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/event_subscription.go b/internal/service/dms/event_subscription.go index 1d8c2f6ead04..74ef4bb1f88c 100644 --- a/internal/service/dms/event_subscription.go +++ b/internal/service/dms/event_subscription.go @@ -91,8 +91,6 @@ func resourceEventSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/replication_config.go b/internal/service/dms/replication_config.go index 0aad6aa41624..c7a45263b1d9 100644 --- a/internal/service/dms/replication_config.go +++ b/internal/service/dms/replication_config.go @@ -171,8 +171,6 @@ func resourceReplicationConfig() *schema.Resource { ValidateFunc: verify.ValidARN, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/replication_instance.go b/internal/service/dms/replication_instance.go index d977e2f6b5a1..6b97747ea4bd 100644 --- a/internal/service/dms/replication_instance.go +++ b/internal/service/dms/replication_instance.go @@ -148,8 +148,6 @@ func resourceReplicationInstance() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/replication_subnet_group.go b/internal/service/dms/replication_subnet_group.go index 8eebcde96740..dd673d594d19 100644 --- a/internal/service/dms/replication_subnet_group.go +++ b/internal/service/dms/replication_subnet_group.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -67,8 +66,6 @@ func resourceReplicationSubnetGroup() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/replication_task.go b/internal/service/dms/replication_task.go index 9fe2f778343c..e69a35355931 100644 --- a/internal/service/dms/replication_task.go +++ b/internal/service/dms/replication_task.go @@ -131,8 +131,6 @@ func resourceReplicationTask() *schema.Resource { ValidateFunc: verify.ValidARN, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/dms/s3_endpoint.go b/internal/service/dms/s3_endpoint.go index 5357182061ee..9bc993a9afbf 100644 --- a/internal/service/dms/s3_endpoint.go +++ b/internal/service/dms/s3_endpoint.go @@ -316,8 +316,6 @@ func resourceS3Endpoint() *schema.Resource { Default: false, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From dd0250838a4395d167052ddde3516b65fd7b5d41 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:50 -0500 Subject: [PATCH 055/232] Remove transparent tagging-only CustomizeDiff - docdb. --- internal/service/docdb/cluster.go | 2 -- internal/service/docdb/cluster_instance.go | 2 -- internal/service/docdb/cluster_parameter_group.go | 3 --- internal/service/docdb/event_subscription.go | 2 -- internal/service/docdb/subnet_group.go | 3 --- 5 files changed, 12 deletions(-) diff --git a/internal/service/docdb/cluster.go b/internal/service/docdb/cluster.go index 28e241c9953e..17ddec35f1bb 100644 --- a/internal/service/docdb/cluster.go +++ b/internal/service/docdb/cluster.go @@ -307,8 +307,6 @@ func resourceCluster() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/docdb/cluster_instance.go b/internal/service/docdb/cluster_instance.go index f9da66eca8eb..75f019285271 100644 --- a/internal/service/docdb/cluster_instance.go +++ b/internal/service/docdb/cluster_instance.go @@ -177,8 +177,6 @@ func resourceClusterInstance() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/docdb/cluster_parameter_group.go b/internal/service/docdb/cluster_parameter_group.go index 8a99e5b04794..f2138d9ff325 100644 --- a/internal/service/docdb/cluster_parameter_group.go +++ b/internal/service/docdb/cluster_parameter_group.go @@ -24,7 +24,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -98,8 +97,6 @@ func resourceClusterParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/docdb/event_subscription.go b/internal/service/docdb/event_subscription.go index ece9699b5c3f..9702b034c9a4 100644 --- a/internal/service/docdb/event_subscription.go +++ b/internal/service/docdb/event_subscription.go @@ -97,8 +97,6 @@ func resourceEventSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/docdb/subnet_group.go b/internal/service/docdb/subnet_group.go index 546693654731..a4b9d28295b7 100644 --- a/internal/service/docdb/subnet_group.go +++ b/internal/service/docdb/subnet_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -73,8 +72,6 @@ func resourceSubnetGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From cf48c587a888475af885f83c7a7d6f090478a3af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 056/232] Remove transparent tagging-only CustomizeDiff - ds. --- internal/service/ds/directory.go | 3 --- internal/service/ds/region.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/ds/directory.go b/internal/service/ds/directory.go index 641208f5196a..786d2d898b09 100644 --- a/internal/service/ds/directory.go +++ b/internal/service/ds/directory.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -201,8 +200,6 @@ func resourceDirectory() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ds/region.go b/internal/service/ds/region.go index 4ab7dcee35ed..c7edd7e7d9c2 100644 --- a/internal/service/ds/region.go +++ b/internal/service/ds/region.go @@ -88,8 +88,6 @@ func resourceRegion() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 2145acbf1526961052ccc9ceadbcf12ebf2f177e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 057/232] Remove transparent tagging-only CustomizeDiff - ec2. --- internal/service/ec2/ebs_snapshot.go | 2 -- internal/service/ec2/ebs_snapshot_copy.go | 3 --- internal/service/ec2/ebs_snapshot_import.go | 3 --- internal/service/ec2/ec2_ami.go | 2 -- internal/service/ec2/ec2_ami_copy.go | 2 -- internal/service/ec2/ec2_ami_from_instance.go | 2 -- internal/service/ec2/ec2_capacity_reservation.go | 2 -- internal/service/ec2/ec2_eip.go | 3 --- internal/service/ec2/ec2_host.go | 3 --- internal/service/ec2/ec2_key_pair.go | 3 --- internal/service/ec2/ec2_spot_fleet_request.go | 2 -- internal/service/ec2/ipam_pool.go | 2 -- internal/service/ec2/ipam_scope.go | 3 --- .../ec2/outposts_local_gateway_route_table_vpc_association.go | 3 --- internal/service/ec2/transitgateway_connect.go | 3 --- internal/service/ec2/transitgateway_connect_peer.go | 2 -- internal/service/ec2/transitgateway_multicast_domain.go | 3 --- internal/service/ec2/transitgateway_peering_attachment.go | 2 -- .../service/ec2/transitgateway_peering_attachment_accepter.go | 3 --- internal/service/ec2/transitgateway_policy_table.go | 3 --- internal/service/ec2/transitgateway_route_table.go | 3 --- internal/service/ec2/transitgateway_vpc_attachment.go | 3 --- internal/service/ec2/transitgateway_vpc_attachment_accepter.go | 3 --- internal/service/ec2/verifiedaccess_endpoint.go | 2 -- internal/service/ec2/verifiedaccess_group.go | 2 -- internal/service/ec2/verifiedaccess_instance.go | 3 --- internal/service/ec2/verifiedaccess_trust_provider.go | 3 --- internal/service/ec2/vpc_default_network_acl.go | 3 --- internal/service/ec2/vpc_default_route_table.go | 2 -- internal/service/ec2/vpc_default_security_group.go | 3 --- internal/service/ec2/vpc_default_subnet.go | 2 -- internal/service/ec2/vpc_default_vpc.go | 3 --- internal/service/ec2/vpc_default_vpc_dhcp_options.go | 3 --- internal/service/ec2/vpc_dhcp_options.go | 3 --- internal/service/ec2/vpc_egress_only_internet_gateway.go | 3 --- internal/service/ec2/vpc_endpoint.go | 2 -- internal/service/ec2/vpc_endpoint_service.go | 2 -- internal/service/ec2/vpc_flow_log.go | 2 -- internal/service/ec2/vpc_internet_gateway.go | 3 --- internal/service/ec2/vpc_network_acl.go | 2 -- internal/service/ec2/vpc_network_insights_analysis.go | 2 -- internal/service/ec2/vpc_network_insights_path.go | 3 --- internal/service/ec2/vpc_peering_connection.go | 3 --- internal/service/ec2/vpc_peering_connection_accepter.go | 3 --- internal/service/ec2/vpc_route_table.go | 2 -- internal/service/ec2/vpc_security_group.go | 2 -- internal/service/ec2/vpc_subnet.go | 2 -- internal/service/ec2/vpc_traffic_mirror_filter.go | 3 --- internal/service/ec2/vpc_traffic_mirror_session.go | 3 --- internal/service/ec2/vpc_traffic_mirror_target.go | 2 -- internal/service/ec2/vpnclient_endpoint.go | 2 -- internal/service/ec2/vpnsite_customer_gateway.go | 2 -- internal/service/ec2/vpnsite_gateway.go | 2 -- internal/service/ec2/wavelength_carrier_gateway.go | 3 --- 54 files changed, 137 deletions(-) diff --git a/internal/service/ec2/ebs_snapshot.go b/internal/service/ec2/ebs_snapshot.go index 22ea44a4304a..22a68c45e8bb 100644 --- a/internal/service/ec2/ebs_snapshot.go +++ b/internal/service/ec2/ebs_snapshot.go @@ -40,8 +40,6 @@ func resourceEBSSnapshot() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/ebs_snapshot_copy.go b/internal/service/ec2/ebs_snapshot_copy.go index cd0f93d01e97..3e5b46e6c85c 100644 --- a/internal/service/ec2/ebs_snapshot_copy.go +++ b/internal/service/ec2/ebs_snapshot_copy.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -32,8 +31,6 @@ func resourceEBSSnapshotCopy() *schema.Resource { UpdateWithoutTimeout: resourceEBSSnapshotUpdate, DeleteWithoutTimeout: resourceEBSSnapshotDelete, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/ebs_snapshot_import.go b/internal/service/ec2/ebs_snapshot_import.go index cbfda621bee4..209a79de49eb 100644 --- a/internal/service/ec2/ebs_snapshot_import.go +++ b/internal/service/ec2/ebs_snapshot_import.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,8 +35,6 @@ func resourceEBSSnapshotImport() *schema.Resource { UpdateWithoutTimeout: resourceEBSSnapshotUpdate, DeleteWithoutTimeout: resourceEBSSnapshotDelete, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(60 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/ec2_ami.go b/internal/service/ec2/ec2_ami.go index 196745cc7f8b..a4f2dd919d5b 100644 --- a/internal/service/ec2/ec2_ami.go +++ b/internal/service/ec2/ec2_ami.go @@ -294,8 +294,6 @@ func resourceAMI() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.VirtualizationType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/ec2_ami_copy.go b/internal/service/ec2/ec2_ami_copy.go index 7b1feeb67635..35395762d5a2 100644 --- a/internal/service/ec2/ec2_ami_copy.go +++ b/internal/service/ec2/ec2_ami_copy.go @@ -269,8 +269,6 @@ func resourceAMICopy() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/ec2_ami_from_instance.go b/internal/service/ec2/ec2_ami_from_instance.go index edf52514730d..64091291eb58 100644 --- a/internal/service/ec2/ec2_ami_from_instance.go +++ b/internal/service/ec2/ec2_ami_from_instance.go @@ -251,8 +251,6 @@ func resourceAMIFromInstance() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/ec2_capacity_reservation.go b/internal/service/ec2/ec2_capacity_reservation.go index 1be9c24a6ce0..4855cb37dc3c 100644 --- a/internal/service/ec2/ec2_capacity_reservation.go +++ b/internal/service/ec2/ec2_capacity_reservation.go @@ -39,8 +39,6 @@ func resourceCapacityReservation() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/ec2_eip.go b/internal/service/ec2/ec2_eip.go index 4959f60ae7b3..0faccaedace1 100644 --- a/internal/service/ec2/ec2_eip.go +++ b/internal/service/ec2/ec2_eip.go @@ -24,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -42,8 +41,6 @@ func resourceEIP() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Read: schema.DefaultTimeout(15 * time.Minute), Update: schema.DefaultTimeout(5 * time.Minute), diff --git a/internal/service/ec2/ec2_host.go b/internal/service/ec2/ec2_host.go index 469b4146679a..35a2858e5a2d 100644 --- a/internal/service/ec2/ec2_host.go +++ b/internal/service/ec2/ec2_host.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceHost() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/ec2_key_pair.go b/internal/service/ec2/ec2_key_pair.go index 06ce5d0a687a..2fa7a903335c 100644 --- a/internal/service/ec2/ec2_key_pair.go +++ b/internal/service/ec2/ec2_key_pair.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" "golang.org/x/crypto/ssh" ) @@ -42,8 +41,6 @@ func resourceKeyPair() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaVersion: 1, MigrateState: keyPairMigrateState, diff --git a/internal/service/ec2/ec2_spot_fleet_request.go b/internal/service/ec2/ec2_spot_fleet_request.go index 2d93a968b61e..651b323fc063 100644 --- a/internal/service/ec2/ec2_spot_fleet_request.go +++ b/internal/service/ec2/ec2_spot_fleet_request.go @@ -868,8 +868,6 @@ func resourceSpotFleetRequest() *schema.Resource { Default: false, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/ipam_pool.go b/internal/service/ec2/ipam_pool.go index e8f813e2356a..70e79bca07fb 100644 --- a/internal/service/ec2/ipam_pool.go +++ b/internal/service/ec2/ipam_pool.go @@ -145,8 +145,6 @@ func resourceIPAMPool() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/ipam_scope.go b/internal/service/ec2/ipam_scope.go index 42d6ab6895ca..d8dce460e4e1 100644 --- a/internal/service/ec2/ipam_scope.go +++ b/internal/service/ec2/ipam_scope.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -76,8 +75,6 @@ func resourceIPAMScope() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/outposts_local_gateway_route_table_vpc_association.go b/internal/service/ec2/outposts_local_gateway_route_table_vpc_association.go index e91a19e225b0..d4a923ea437f 100644 --- a/internal/service/ec2/outposts_local_gateway_route_table_vpc_association.go +++ b/internal/service/ec2/outposts_local_gateway_route_table_vpc_association.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -35,8 +34,6 @@ func resourceLocalGatewayRouteTableVPCAssociation() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "local_gateway_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_connect.go b/internal/service/ec2/transitgateway_connect.go index 9f67f2a776d3..4b191e7bfc88 100644 --- a/internal/service/ec2/transitgateway_connect.go +++ b/internal/service/ec2/transitgateway_connect.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -44,8 +43,6 @@ func resourceTransitGatewayConnect() *schema.Resource { Delete: schema.DefaultTimeout(10 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrProtocol: { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_connect_peer.go b/internal/service/ec2/transitgateway_connect_peer.go index 35d31ffdd9e2..da7291de2e82 100644 --- a/internal/service/ec2/transitgateway_connect_peer.go +++ b/internal/service/ec2/transitgateway_connect_peer.go @@ -48,8 +48,6 @@ func resourceTransitGatewayConnectPeer() *schema.Resource { Delete: schema.DefaultTimeout(10 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_multicast_domain.go b/internal/service/ec2/transitgateway_multicast_domain.go index 33fe186cdeea..9454a5a74386 100644 --- a/internal/service/ec2/transitgateway_multicast_domain.go +++ b/internal/service/ec2/transitgateway_multicast_domain.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -37,8 +36,6 @@ func resourceTransitGatewayMulticastDomain() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/ec2/transitgateway_peering_attachment.go b/internal/service/ec2/transitgateway_peering_attachment.go index fbc0965245cb..222520bc46d7 100644 --- a/internal/service/ec2/transitgateway_peering_attachment.go +++ b/internal/service/ec2/transitgateway_peering_attachment.go @@ -38,8 +38,6 @@ func resourceTransitGatewayPeeringAttachment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_peering_attachment_accepter.go b/internal/service/ec2/transitgateway_peering_attachment_accepter.go index 2eef8570031c..003bd4df39f2 100644 --- a/internal/service/ec2/transitgateway_peering_attachment_accepter.go +++ b/internal/service/ec2/transitgateway_peering_attachment_accepter.go @@ -16,7 +16,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -34,8 +33,6 @@ func resourceTransitGatewayPeeringAttachmentAccepter() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "peer_account_id": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_policy_table.go b/internal/service/ec2/transitgateway_policy_table.go index faedfadce967..4064b7a72ec5 100644 --- a/internal/service/ec2/transitgateway_policy_table.go +++ b/internal/service/ec2/transitgateway_policy_table.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceTransitGatewayPolicyTable() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_route_table.go b/internal/service/ec2/transitgateway_route_table.go index b019bdb84442..d7a3917adbc9 100644 --- a/internal/service/ec2/transitgateway_route_table.go +++ b/internal/service/ec2/transitgateway_route_table.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceTransitGatewayRouteTable() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_vpc_attachment.go b/internal/service/ec2/transitgateway_vpc_attachment.go index 1e18ee00430a..c5d36326e817 100644 --- a/internal/service/ec2/transitgateway_vpc_attachment.go +++ b/internal/service/ec2/transitgateway_vpc_attachment.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceTransitGatewayVPCAttachment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "appliance_mode_support": { Type: schema.TypeString, diff --git a/internal/service/ec2/transitgateway_vpc_attachment_accepter.go b/internal/service/ec2/transitgateway_vpc_attachment_accepter.go index 6d414219672c..bb372b2d2186 100644 --- a/internal/service/ec2/transitgateway_vpc_attachment_accepter.go +++ b/internal/service/ec2/transitgateway_vpc_attachment_accepter.go @@ -16,7 +16,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -34,8 +33,6 @@ func resourceTransitGatewayVPCAttachmentAccepter() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "appliance_mode_support": { Type: schema.TypeString, diff --git a/internal/service/ec2/verifiedaccess_endpoint.go b/internal/service/ec2/verifiedaccess_endpoint.go index 4fe79750cc53..21500ada21e1 100644 --- a/internal/service/ec2/verifiedaccess_endpoint.go +++ b/internal/service/ec2/verifiedaccess_endpoint.go @@ -180,8 +180,6 @@ func resourceVerifiedAccessEndpoint() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/verifiedaccess_group.go b/internal/service/ec2/verifiedaccess_group.go index 819b570eb820..48c3d39d209f 100644 --- a/internal/service/ec2/verifiedaccess_group.go +++ b/internal/service/ec2/verifiedaccess_group.go @@ -96,8 +96,6 @@ func resourceVerifiedAccessGroup() *schema.Resource { Required: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/verifiedaccess_instance.go b/internal/service/ec2/verifiedaccess_instance.go index 890e28ca898c..3f569270cd42 100644 --- a/internal/service/ec2/verifiedaccess_instance.go +++ b/internal/service/ec2/verifiedaccess_instance.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -85,8 +84,6 @@ func resourceVerifiedAccessInstance() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/verifiedaccess_trust_provider.go b/internal/service/ec2/verifiedaccess_trust_provider.go index 4140a401d2fe..d684c235ce85 100644 --- a/internal/service/ec2/verifiedaccess_trust_provider.go +++ b/internal/service/ec2/verifiedaccess_trust_provider.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -137,8 +136,6 @@ func resourceVerifiedAccessTrustProvider() *schema.Resource { ValidateDiagFunc: enum.Validate[types.UserTrustProviderType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_default_network_acl.go b/internal/service/ec2/vpc_default_network_acl.go index 1ab3e23d4f7f..0f24c04e4876 100644 --- a/internal/service/ec2/vpc_default_network_acl.go +++ b/internal/service/ec2/vpc_default_network_acl.go @@ -12,7 +12,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -96,8 +95,6 @@ func resourceDefaultNetworkACL() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_default_route_table.go b/internal/service/ec2/vpc_default_route_table.go index 902109b29b70..31728bde8d00 100644 --- a/internal/service/ec2/vpc_default_route_table.go +++ b/internal/service/ec2/vpc_default_route_table.go @@ -138,8 +138,6 @@ func resourceDefaultRouteTable() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_default_security_group.go b/internal/service/ec2/vpc_default_security_group.go index ff4854382666..31f99df0680e 100644 --- a/internal/service/ec2/vpc_default_security_group.go +++ b/internal/service/ec2/vpc_default_security_group.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -77,8 +76,6 @@ func resourceDefaultSecurityGroup() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_default_subnet.go b/internal/service/ec2/vpc_default_subnet.go index 3b705384402a..549106446fd5 100644 --- a/internal/service/ec2/vpc_default_subnet.go +++ b/internal/service/ec2/vpc_default_subnet.go @@ -37,8 +37,6 @@ func resourceDefaultSubnet() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), diff --git a/internal/service/ec2/vpc_default_vpc.go b/internal/service/ec2/vpc_default_vpc.go index d08bb52617f0..d055203b885f 100644 --- a/internal/service/ec2/vpc_default_vpc.go +++ b/internal/service/ec2/vpc_default_vpc.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,8 +35,6 @@ func resourceDefaultVPC() *schema.Resource { StateContext: resourceVPCImport, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaVersion: 1, MigrateState: vpcMigrateState, diff --git a/internal/service/ec2/vpc_default_vpc_dhcp_options.go b/internal/service/ec2/vpc_default_vpc_dhcp_options.go index 136a32128fbd..bc47ded429fc 100644 --- a/internal/service/ec2/vpc_default_vpc_dhcp_options.go +++ b/internal/service/ec2/vpc_default_vpc_dhcp_options.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -32,8 +31,6 @@ func resourceDefaultVPCDHCPOptions() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - // Keep in sync with aws_vpc_dhcp_options' schema with the following changes: // - domain_name is Computed-only // - domain_name_servers is Computed-only and is TypeString diff --git a/internal/service/ec2/vpc_dhcp_options.go b/internal/service/ec2/vpc_dhcp_options.go index 0921aacf029b..495127359351 100644 --- a/internal/service/ec2/vpc_dhcp_options.go +++ b/internal/service/ec2/vpc_dhcp_options.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -90,8 +89,6 @@ func resourceVPCDHCPOptions() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_egress_only_internet_gateway.go b/internal/service/ec2/vpc_egress_only_internet_gateway.go index 071dfb0a0878..46be3751a3fd 100644 --- a/internal/service/ec2/vpc_egress_only_internet_gateway.go +++ b/internal/service/ec2/vpc_egress_only_internet_gateway.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,8 +35,6 @@ func resourceEgressOnlyInternetGateway() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), diff --git a/internal/service/ec2/vpc_endpoint.go b/internal/service/ec2/vpc_endpoint.go index 201527fd76c6..65ed7691027d 100644 --- a/internal/service/ec2/vpc_endpoint.go +++ b/internal/service/ec2/vpc_endpoint.go @@ -233,8 +233,6 @@ func resourceVPCEndpoint() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_endpoint_service.go b/internal/service/ec2/vpc_endpoint_service.go index ce4764d151b6..0bc20095e455 100644 --- a/internal/service/ec2/vpc_endpoint_service.go +++ b/internal/service/ec2/vpc_endpoint_service.go @@ -156,8 +156,6 @@ func resourceVPCEndpointService() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_flow_log.go b/internal/service/ec2/vpc_flow_log.go index 86bf6b6cd6aa..1fe95f7104d6 100644 --- a/internal/service/ec2/vpc_flow_log.go +++ b/internal/service/ec2/vpc_flow_log.go @@ -163,8 +163,6 @@ func resourceFlowLog() *schema.Resource { ExactlyOneOf: []string{"eni_id", names.AttrSubnetID, names.AttrVPCID, names.AttrTransitGatewayID, names.AttrTransitGatewayAttachmentID}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_internet_gateway.go b/internal/service/ec2/vpc_internet_gateway.go index f5e7b994610d..db88a1a6259d 100644 --- a/internal/service/ec2/vpc_internet_gateway.go +++ b/internal/service/ec2/vpc_internet_gateway.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -62,8 +61,6 @@ func resourceInternetGateway() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_network_acl.go b/internal/service/ec2/vpc_network_acl.go index 9f6d3ca05884..433748308261 100644 --- a/internal/service/ec2/vpc_network_acl.go +++ b/internal/service/ec2/vpc_network_acl.go @@ -98,8 +98,6 @@ func resourceNetworkACL() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_network_insights_analysis.go b/internal/service/ec2/vpc_network_insights_analysis.go index 478d055c2696..84353322f409 100644 --- a/internal/service/ec2/vpc_network_insights_analysis.go +++ b/internal/service/ec2/vpc_network_insights_analysis.go @@ -105,8 +105,6 @@ func resourceNetworkInsightsAnalysis() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_network_insights_path.go b/internal/service/ec2/vpc_network_insights_path.go index 24ea0873f9e8..df1cf6c56ac2 100644 --- a/internal/service/ec2/vpc_network_insights_path.go +++ b/internal/service/ec2/vpc_network_insights_path.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -87,8 +86,6 @@ func resourceNetworkInsightsPath() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_peering_connection.go b/internal/service/ec2/vpc_peering_connection.go index 63a97cde073e..725ac2b58e7d 100644 --- a/internal/service/ec2/vpc_peering_connection.go +++ b/internal/service/ec2/vpc_peering_connection.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,8 +81,6 @@ func resourceVPCPeeringConnection() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_peering_connection_accepter.go b/internal/service/ec2/vpc_peering_connection_accepter.go index a730d3719c77..71854e899b0a 100644 --- a/internal/service/ec2/vpc_peering_connection_accepter.go +++ b/internal/service/ec2/vpc_peering_connection_accepter.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,8 +81,6 @@ func resourceVPCPeeringConnectionAccepter() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_route_table.go b/internal/service/ec2/vpc_route_table.go index 33c0bd06eaee..c80fe67173d2 100644 --- a/internal/service/ec2/vpc_route_table.go +++ b/internal/service/ec2/vpc_route_table.go @@ -163,8 +163,6 @@ func resourceRouteTable() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go index 82b8dae6e726..68f893a76a99 100644 --- a/internal/service/ec2/vpc_security_group.go +++ b/internal/service/ec2/vpc_security_group.go @@ -114,8 +114,6 @@ func resourceSecurityGroup() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpc_subnet.go b/internal/service/ec2/vpc_subnet.go index 73fc37772df3..2183cf8c583b 100644 --- a/internal/service/ec2/vpc_subnet.go +++ b/internal/service/ec2/vpc_subnet.go @@ -42,8 +42,6 @@ func resourceSubnet() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), diff --git a/internal/service/ec2/vpc_traffic_mirror_filter.go b/internal/service/ec2/vpc_traffic_mirror_filter.go index 7e288eac1760..ec63ca954c71 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceTrafficMirrorFilter() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_traffic_mirror_session.go b/internal/service/ec2/vpc_traffic_mirror_session.go index fc9930515732..dea88735fe79 100644 --- a/internal/service/ec2/vpc_traffic_mirror_session.go +++ b/internal/service/ec2/vpc_traffic_mirror_session.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceTrafficMirrorSession() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_traffic_mirror_target.go b/internal/service/ec2/vpc_traffic_mirror_target.go index e1235e0fc990..0645ee93fcf8 100644 --- a/internal/service/ec2/vpc_traffic_mirror_target.go +++ b/internal/service/ec2/vpc_traffic_mirror_target.go @@ -38,8 +38,6 @@ func resourceTrafficMirrorTarget() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index 3acf64032a80..673cf505fb10 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -41,8 +41,6 @@ func resourceClientVPNEndpoint() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpnsite_customer_gateway.go b/internal/service/ec2/vpnsite_customer_gateway.go index 8e4b51742ef9..14831360cef7 100644 --- a/internal/service/ec2/vpnsite_customer_gateway.go +++ b/internal/service/ec2/vpnsite_customer_gateway.go @@ -86,8 +86,6 @@ func resourceCustomerGateway() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.GatewayType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/vpnsite_gateway.go b/internal/service/ec2/vpnsite_gateway.go index 5dc9ee08e032..b1717be07c39 100644 --- a/internal/service/ec2/vpnsite_gateway.go +++ b/internal/service/ec2/vpnsite_gateway.go @@ -64,8 +64,6 @@ func resourceVPNGateway() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ec2/wavelength_carrier_gateway.go b/internal/service/ec2/wavelength_carrier_gateway.go index 008f1896a2cb..8c4a4794451a 100644 --- a/internal/service/ec2/wavelength_carrier_gateway.go +++ b/internal/service/ec2/wavelength_carrier_gateway.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceCarrierGateway() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From c97c7116993dde4a1fa9d6df9d35f8c4fa5249b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 058/232] Remove transparent tagging-only CustomizeDiff - ecr. --- internal/service/ecr/repository.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/ecr/repository.go b/internal/service/ecr/repository.go index 9f22b2c97da9..f42a1e3efcca 100644 --- a/internal/service/ecr/repository.go +++ b/internal/service/ecr/repository.go @@ -37,8 +37,6 @@ func resourceRepository() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Delete: schema.DefaultTimeout(20 * time.Minute), }, From ac77d2299eae3aea934d35d57708244c1a37f740 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 059/232] Remove transparent tagging-only CustomizeDiff - ecrpublic. --- internal/service/ecrpublic/repository.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/ecrpublic/repository.go b/internal/service/ecrpublic/repository.go index beeb35ff7052..4dbbf2ebf137 100644 --- a/internal/service/ecrpublic/repository.go +++ b/internal/service/ecrpublic/repository.go @@ -39,8 +39,6 @@ func ResourceRepository() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Delete: schema.DefaultTimeout(20 * time.Minute), }, From 1a3d10f67e020ee6f9ce57ac2e6d6368b53d2c8d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 060/232] Remove transparent tagging-only CustomizeDiff - ecs. --- internal/service/ecs/capacity_provider.go | 2 -- internal/service/ecs/cluster.go | 2 -- internal/service/ecs/task_definition.go | 2 -- internal/service/ecs/task_set.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/internal/service/ecs/capacity_provider.go b/internal/service/ecs/capacity_provider.go index afa2d0613eb8..5bf4de00a2e3 100644 --- a/internal/service/ecs/capacity_provider.go +++ b/internal/service/ecs/capacity_provider.go @@ -40,8 +40,6 @@ func resourceCapacityProvider() *schema.Resource { StateContext: resourceCapacityProviderImport, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ecs/cluster.go b/internal/service/ecs/cluster.go index 738ee4f6b1b6..679466a51c20 100644 --- a/internal/service/ecs/cluster.go +++ b/internal/service/ecs/cluster.go @@ -38,8 +38,6 @@ func resourceCluster() *schema.Resource { StateContext: resourceClusterImport, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ecs/task_definition.go b/internal/service/ecs/task_definition.go index 1684f6ac6a4d..a1478f749737 100644 --- a/internal/service/ecs/task_definition.go +++ b/internal/service/ecs/task_definition.go @@ -65,8 +65,6 @@ func resourceTaskDefinition() *schema.Resource { }, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaVersion: 1, MigrateState: resourceTaskDefinitionMigrateState, diff --git a/internal/service/ecs/task_set.go b/internal/service/ecs/task_set.go index 8665629257fe..2603f8cc134c 100644 --- a/internal/service/ecs/task_set.go +++ b/internal/service/ecs/task_set.go @@ -268,8 +268,6 @@ func resourceTaskSet() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From f1ee7d39e9d9450e05e5ed616ce1b93227710bc3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 061/232] Remove transparent tagging-only CustomizeDiff - efs. --- internal/service/efs/access_point.go | 3 --- internal/service/efs/file_system.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/efs/access_point.go b/internal/service/efs/access_point.go index 9cbaeac9ccf8..bcf2e46ad083 100644 --- a/internal/service/efs/access_point.go +++ b/internal/service/efs/access_point.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceAccessPoint() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/efs/file_system.go b/internal/service/efs/file_system.go index 5824e28a33a6..66cafdc3a29d 100644 --- a/internal/service/efs/file_system.go +++ b/internal/service/efs/file_system.go @@ -41,8 +41,6 @@ func resourceFileSystem() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 6d5dd1baa5bf317b82acd7251cc1e7b6585a6fb6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 062/232] Remove transparent tagging-only CustomizeDiff - eks. --- internal/service/eks/access_entry.go | 2 -- internal/service/eks/addon.go | 2 -- internal/service/eks/fargate_profile.go | 3 --- internal/service/eks/identity_provider_config.go | 3 --- internal/service/eks/node_group.go | 2 -- 5 files changed, 12 deletions(-) diff --git a/internal/service/eks/access_entry.go b/internal/service/eks/access_entry.go index 115963002d63..b5f5100915d5 100644 --- a/internal/service/eks/access_entry.go +++ b/internal/service/eks/access_entry.go @@ -40,8 +40,6 @@ func resourceAccessEntry() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/eks/addon.go b/internal/service/eks/addon.go index 8cc1ec1578fd..9e2a9d040e0c 100644 --- a/internal/service/eks/addon.go +++ b/internal/service/eks/addon.go @@ -43,8 +43,6 @@ func resourceAddon() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(20 * time.Minute), Update: schema.DefaultTimeout(20 * time.Minute), diff --git a/internal/service/eks/fargate_profile.go b/internal/service/eks/fargate_profile.go index cd9fd12c1ea8..2cfb2e7f5727 100644 --- a/internal/service/eks/fargate_profile.go +++ b/internal/service/eks/fargate_profile.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -41,8 +40,6 @@ func resourceFargateProfile() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/eks/identity_provider_config.go b/internal/service/eks/identity_provider_config.go index 27718273514f..310c3b6f8912 100644 --- a/internal/service/eks/identity_provider_config.go +++ b/internal/service/eks/identity_provider_config.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceIdentityProviderConfig() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(40 * time.Minute), Delete: schema.DefaultTimeout(40 * time.Minute), diff --git a/internal/service/eks/node_group.go b/internal/service/eks/node_group.go index 46a86f9d933a..51034a7637e8 100644 --- a/internal/service/eks/node_group.go +++ b/internal/service/eks/node_group.go @@ -45,8 +45,6 @@ func resourceNodeGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(60 * time.Minute), Update: schema.DefaultTimeout(60 * time.Minute), From c3357399daa56436a018fdf357552770cea9e3ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:51 -0500 Subject: [PATCH 063/232] Remove transparent tagging-only CustomizeDiff - elasticache. --- internal/service/elasticache/parameter_group.go | 3 --- internal/service/elasticache/user.go | 3 --- internal/service/elasticache/user_group.go | 3 --- 3 files changed, 9 deletions(-) diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go index 5a265a26d896..16899e3d244b 100644 --- a/internal/service/elasticache/parameter_group.go +++ b/internal/service/elasticache/parameter_group.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -84,8 +83,6 @@ func resourceParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/elasticache/user.go b/internal/service/elasticache/user.go index 3b374ac7b927..1ddf550090da 100644 --- a/internal/service/elasticache/user.go +++ b/internal/service/elasticache/user.go @@ -24,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -41,8 +40,6 @@ func resourceUser() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(5 * time.Minute), Read: schema.DefaultTimeout(5 * time.Minute), diff --git a/internal/service/elasticache/user_group.go b/internal/service/elasticache/user_group.go index 689d84aa5713..1a92a465a377 100644 --- a/internal/service/elasticache/user_group.go +++ b/internal/service/elasticache/user_group.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceUserGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 0bf2be80cd632d77dd5858efcad098e5149e7250 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 064/232] Remove transparent tagging-only CustomizeDiff - elasticbeanstalk. --- internal/service/elasticbeanstalk/application.go | 2 -- internal/service/elasticbeanstalk/application_version.go | 3 --- internal/service/elasticbeanstalk/environment.go | 3 --- 3 files changed, 8 deletions(-) diff --git a/internal/service/elasticbeanstalk/application.go b/internal/service/elasticbeanstalk/application.go index 223189b8e52e..9082d4fbc734 100644 --- a/internal/service/elasticbeanstalk/application.go +++ b/internal/service/elasticbeanstalk/application.go @@ -35,8 +35,6 @@ func resourceApplication() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "appversion_lifecycle": { Type: schema.TypeList, diff --git a/internal/service/elasticbeanstalk/application_version.go b/internal/service/elasticbeanstalk/application_version.go index d4a2f1927131..e2e6c11187b5 100644 --- a/internal/service/elasticbeanstalk/application_version.go +++ b/internal/service/elasticbeanstalk/application_version.go @@ -19,7 +19,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -32,8 +31,6 @@ func resourceApplicationVersion() *schema.Resource { UpdateWithoutTimeout: resourceApplicationVersionUpdate, DeleteWithoutTimeout: resourceApplicationVersionDelete, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "application": { Type: schema.TypeString, diff --git a/internal/service/elasticbeanstalk/environment.go b/internal/service/elasticbeanstalk/environment.go index 8313bc6b33e8..75c117541ff5 100644 --- a/internal/service/elasticbeanstalk/environment.go +++ b/internal/service/elasticbeanstalk/environment.go @@ -33,7 +33,6 @@ import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -95,8 +94,6 @@ func resourceEnvironment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaVersion: 1, MigrateState: EnvironmentMigrateState, From c564ffd43f18f5d23f0338f9aca6db08841b51e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 065/232] Remove transparent tagging-only CustomizeDiff - emr. --- internal/service/emr/cluster.go | 2 -- internal/service/emr/studio.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/emr/cluster.go b/internal/service/emr/cluster.go index 7e352f88bd96..1e81e7076376 100644 --- a/internal/service/emr/cluster.go +++ b/internal/service/emr/cluster.go @@ -53,8 +53,6 @@ func resourceCluster() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - SchemaFunc: func() map[string]*schema.Schema { instanceFleetConfigSchema := func() *schema.Resource { return &schema.Resource{ diff --git a/internal/service/emr/studio.go b/internal/service/emr/studio.go index 628a1b5d3cd7..d69720baec21 100644 --- a/internal/service/emr/studio.go +++ b/internal/service/emr/studio.go @@ -38,8 +38,6 @@ func resourceStudio() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From d9efd6ec2bc1b3e386721bd86b7c3ae29f954953 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 066/232] Remove transparent tagging-only CustomizeDiff - emrcontainers. --- internal/service/emrcontainers/job_template.go | 2 -- internal/service/emrcontainers/virtual_cluster.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/internal/service/emrcontainers/job_template.go b/internal/service/emrcontainers/job_template.go index 4ecc7c54c3f3..ff25080e4150 100644 --- a/internal/service/emrcontainers/job_template.go +++ b/internal/service/emrcontainers/job_template.go @@ -254,8 +254,6 @@ func resourceJobTemplate() *schema.Resource { names.AttrTags: tftags.TagsSchemaForceNew(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/emrcontainers/virtual_cluster.go b/internal/service/emrcontainers/virtual_cluster.go index 7e6e48bf9c28..c5eed20d02c0 100644 --- a/internal/service/emrcontainers/virtual_cluster.go +++ b/internal/service/emrcontainers/virtual_cluster.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -108,8 +107,6 @@ func resourceVirtualCluster() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 3b13b94130ce62165206caac791d981e419a4f83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 067/232] Remove transparent tagging-only CustomizeDiff - emrserverless. --- internal/service/emrserverless/application.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/emrserverless/application.go b/internal/service/emrserverless/application.go index 996af4ed4f7e..7059f81821ae 100644 --- a/internal/service/emrserverless/application.go +++ b/internal/service/emrserverless/application.go @@ -42,8 +42,6 @@ func resourceApplication() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "architecture": { Type: schema.TypeString, From 8c0c1694f88cd8215865e8756264c07a2735a8c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 068/232] Remove transparent tagging-only CustomizeDiff - events. --- internal/service/events/bus.go | 3 --- internal/service/events/rule.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/events/bus.go b/internal/service/events/bus.go index 0fab5e1873d7..b83e62dd2758 100644 --- a/internal/service/events/bus.go +++ b/internal/service/events/bus.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -66,8 +65,6 @@ func resourceBus() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/events/rule.go b/internal/service/events/rule.go index 9af11c1a9112..a94f6b9ecc01 100644 --- a/internal/service/events/rule.go +++ b/internal/service/events/rule.go @@ -142,8 +142,6 @@ func resourceRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From af8775ae30d723b05c56b9be3124204d59af946c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 069/232] Remove transparent tagging-only CustomizeDiff - evidently. --- internal/service/evidently/feature.go | 2 -- internal/service/evidently/launch.go | 1 - internal/service/evidently/project.go | 3 --- internal/service/evidently/segment.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/internal/service/evidently/feature.go b/internal/service/evidently/feature.go index ebcb2a59695f..3fe114c6742a 100644 --- a/internal/service/evidently/feature.go +++ b/internal/service/evidently/feature.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types/nullable" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -197,7 +196,6 @@ func ResourceFeature() *schema.Resource { }, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/evidently/launch.go b/internal/service/evidently/launch.go index 82cf72fd82a9..d6ae2ce2a5e7 100644 --- a/internal/service/evidently/launch.go +++ b/internal/service/evidently/launch.go @@ -294,7 +294,6 @@ func ResourceLaunch() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/evidently/project.go b/internal/service/evidently/project.go index 47182b5e1302..9dd9bfb0d716 100644 --- a/internal/service/evidently/project.go +++ b/internal/service/evidently/project.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -154,8 +153,6 @@ func ResourceProject() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/evidently/segment.go b/internal/service/evidently/segment.go index 77e3e765323b..519af5e796a6 100644 --- a/internal/service/evidently/segment.go +++ b/internal/service/evidently/segment.go @@ -91,8 +91,6 @@ func ResourceSegment() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 58755c08ad51ef93802761b7d17bcda306926123 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:52 -0500 Subject: [PATCH 070/232] Remove transparent tagging-only CustomizeDiff - finspace. --- internal/service/finspace/kx_cluster.go | 3 --- internal/service/finspace/kx_database.go | 3 --- internal/service/finspace/kx_dataview.go | 2 -- internal/service/finspace/kx_environment.go | 1 - internal/service/finspace/kx_scaling_group.go | 2 -- internal/service/finspace/kx_user.go | 1 - internal/service/finspace/kx_volume.go | 2 -- 7 files changed, 14 deletions(-) diff --git a/internal/service/finspace/kx_cluster.go b/internal/service/finspace/kx_cluster.go index 633be8dc95b4..3018dfc87167 100644 --- a/internal/service/finspace/kx_cluster.go +++ b/internal/service/finspace/kx_cluster.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -417,8 +416,6 @@ func ResourceKxCluster() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_database.go b/internal/service/finspace/kx_database.go index dd9f155af7a7..e050a167113b 100644 --- a/internal/service/finspace/kx_database.go +++ b/internal/service/finspace/kx_database.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -78,8 +77,6 @@ func ResourceKxDatabase() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_dataview.go b/internal/service/finspace/kx_dataview.go index 83d6ba0c8ea6..ae98b6c00291 100644 --- a/internal/service/finspace/kx_dataview.go +++ b/internal/service/finspace/kx_dataview.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -141,7 +140,6 @@ func ResourceKxDataview() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_environment.go b/internal/service/finspace/kx_environment.go index ae7b5eb89d06..fb6a8b8a4cd4 100644 --- a/internal/service/finspace/kx_environment.go +++ b/internal/service/finspace/kx_environment.go @@ -198,7 +198,6 @@ func ResourceKxEnvironment() *schema.Resource { }, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_scaling_group.go b/internal/service/finspace/kx_scaling_group.go index 4641d2eb62a9..e56ad8699185 100644 --- a/internal/service/finspace/kx_scaling_group.go +++ b/internal/service/finspace/kx_scaling_group.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -99,7 +98,6 @@ func ResourceKxScalingGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_user.go b/internal/service/finspace/kx_user.go index 18cc3724d8b1..7b09b06401c8 100644 --- a/internal/service/finspace/kx_user.go +++ b/internal/service/finspace/kx_user.go @@ -69,7 +69,6 @@ func ResourceKxUser() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/finspace/kx_volume.go b/internal/service/finspace/kx_volume.go index 8408cd7da6db..4ff57dc9fdaf 100644 --- a/internal/service/finspace/kx_volume.go +++ b/internal/service/finspace/kx_volume.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -154,7 +153,6 @@ func ResourceKxVolume() *schema.Resource { ValidateDiagFunc: enum.Validate[types.KxVolumeType](), }, }, - CustomizeDiff: verify.SetTagsDiff, } } From 8cbeb8d7f4a9671002be48087e76c7ef0963347e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 071/232] Remove transparent tagging-only CustomizeDiff - fis. --- internal/service/fis/experiment_template.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/fis/experiment_template.go b/internal/service/fis/experiment_template.go index 7aaf7376259b..3e060ef98ef4 100644 --- a/internal/service/fis/experiment_template.go +++ b/internal/service/fis/experiment_template.go @@ -48,8 +48,6 @@ func resourceExperimentTemplate() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrAction: { Type: schema.TypeSet, From 61fcfe0720c0b5b52018208f55b91e351e071ecf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 072/232] Remove transparent tagging-only CustomizeDiff - fms. --- internal/service/fms/policy.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/fms/policy.go b/internal/service/fms/policy.go index c6c151c9db28..c1284ac424e6 100644 --- a/internal/service/fms/policy.go +++ b/internal/service/fms/policy.go @@ -43,8 +43,6 @@ func resourcePolicy() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From f83d5464a24e6698a54bc0e318ea5d56260d238a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 073/232] Remove transparent tagging-only CustomizeDiff - fsx. --- internal/service/fsx/file_cache.go | 1 - internal/service/fsx/ontap_storage_virtual_machine.go | 3 --- internal/service/fsx/ontap_volume.go | 1 - internal/service/fsx/openzfs_volume.go | 2 -- internal/service/fsx/windows_file_system.go | 2 -- 5 files changed, 9 deletions(-) diff --git a/internal/service/fsx/file_cache.go b/internal/service/fsx/file_cache.go index 7b7178c9d203..dd48f0090dba 100644 --- a/internal/service/fsx/file_cache.go +++ b/internal/service/fsx/file_cache.go @@ -289,7 +289,6 @@ func resourceFileCache() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/fsx/ontap_storage_virtual_machine.go b/internal/service/fsx/ontap_storage_virtual_machine.go index df87534ab4e7..3e0665c19264 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine.go +++ b/internal/service/fsx/ontap_storage_virtual_machine.go @@ -26,7 +26,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -234,8 +233,6 @@ func resourceONTAPStorageVirtualMachine() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/fsx/ontap_volume.go b/internal/service/fsx/ontap_volume.go index a647bcd4ade6..5e0ba5860ce3 100644 --- a/internal/service/fsx/ontap_volume.go +++ b/internal/service/fsx/ontap_volume.go @@ -341,7 +341,6 @@ func resourceONTAPVolume() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.VolumeType](), }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/fsx/openzfs_volume.go b/internal/service/fsx/openzfs_volume.go index 46f858b2815d..e24305a86f23 100644 --- a/internal/service/fsx/openzfs_volume.go +++ b/internal/service/fsx/openzfs_volume.go @@ -205,8 +205,6 @@ func resourceOpenZFSVolume() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.VolumeType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/fsx/windows_file_system.go b/internal/service/fsx/windows_file_system.go index d9ebd12fbac5..f0a94628e385 100644 --- a/internal/service/fsx/windows_file_system.go +++ b/internal/service/fsx/windows_file_system.go @@ -297,8 +297,6 @@ func resourceWindowsFileSystem() *schema.Resource { ), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 83d9344f6395ea9d917b91da3b957b260e41ab20 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 074/232] Remove transparent tagging-only CustomizeDiff - gamelift. --- internal/service/gamelift/alias.go | 3 --- internal/service/gamelift/build.go | 2 -- internal/service/gamelift/fleet.go | 2 -- internal/service/gamelift/game_session_queue.go | 2 -- internal/service/gamelift/script.go | 2 -- 5 files changed, 11 deletions(-) diff --git a/internal/service/gamelift/alias.go b/internal/service/gamelift/alias.go index 78b623b10725..f3e3dc69041c 100644 --- a/internal/service/gamelift/alias.go +++ b/internal/service/gamelift/alias.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -77,8 +76,6 @@ func resourceAlias() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/gamelift/build.go b/internal/service/gamelift/build.go index f2b28804a712..cc2c7a1cfb2b 100644 --- a/internal/service/gamelift/build.go +++ b/internal/service/gamelift/build.go @@ -93,8 +93,6 @@ func resourceBuild() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 1024), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/gamelift/fleet.go b/internal/service/gamelift/fleet.go index 7a1268900eef..cf0230d19dcf 100644 --- a/internal/service/gamelift/fleet.go +++ b/internal/service/gamelift/fleet.go @@ -239,8 +239,6 @@ func resourceFleet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/gamelift/game_session_queue.go b/internal/service/gamelift/game_session_queue.go index d20ed930d6c8..2478442a33b0 100644 --- a/internal/service/gamelift/game_session_queue.go +++ b/internal/service/gamelift/game_session_queue.go @@ -90,8 +90,6 @@ func resourceGameSessionQueue() *schema.Resource { ValidateFunc: validation.IntBetween(10, 600), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/gamelift/script.go b/internal/service/gamelift/script.go index df5de5f047fb..e7e90dba86f6 100644 --- a/internal/service/gamelift/script.go +++ b/internal/service/gamelift/script.go @@ -91,8 +91,6 @@ func resourceScript() *schema.Resource { ExactlyOneOf: []string{"zip_file", "storage_location"}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 16a7ef5606984c416bc7e1d77ec3b4dd237f76c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 075/232] Remove transparent tagging-only CustomizeDiff - glacier. --- internal/service/glacier/vault.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/glacier/vault.go b/internal/service/glacier/vault.go index 0de519dae88a..d17ad5bcba7c 100644 --- a/internal/service/glacier/vault.go +++ b/internal/service/glacier/vault.go @@ -98,8 +98,6 @@ func resourceVault() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 6ae5496e1266830c3ac44bc6ab507cfd0b01a682 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 076/232] Remove transparent tagging-only CustomizeDiff - globalaccelerator. --- internal/service/globalaccelerator/accelerator.go | 2 -- .../service/globalaccelerator/custom_routing_accelerator.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/globalaccelerator/accelerator.go b/internal/service/globalaccelerator/accelerator.go index 0f553de9c485..c6c4d57e7b29 100644 --- a/internal/service/globalaccelerator/accelerator.go +++ b/internal/service/globalaccelerator/accelerator.go @@ -135,8 +135,6 @@ func resourceAccelerator() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/globalaccelerator/custom_routing_accelerator.go b/internal/service/globalaccelerator/custom_routing_accelerator.go index d4cd06955d6e..b9569c8feda4 100644 --- a/internal/service/globalaccelerator/custom_routing_accelerator.go +++ b/internal/service/globalaccelerator/custom_routing_accelerator.go @@ -131,8 +131,6 @@ func resourceCustomRoutingAccelerator() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From b5463becb5cc270764040f41b1ffde81da537f1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 077/232] Remove transparent tagging-only CustomizeDiff - glue. --- internal/service/glue/catalog_database.go | 2 -- internal/service/glue/connection.go | 1 - internal/service/glue/crawler.go | 2 -- internal/service/glue/data_quality_ruleset.go | 2 -- internal/service/glue/dev_endpoint.go | 2 -- internal/service/glue/job.go | 2 -- internal/service/glue/ml_transform.go | 2 -- internal/service/glue/registry.go | 3 --- internal/service/glue/schema.go | 2 -- internal/service/glue/trigger.go | 3 --- internal/service/glue/workflow.go | 3 --- 11 files changed, 24 deletions(-) diff --git a/internal/service/glue/catalog_database.go b/internal/service/glue/catalog_database.go index e8dbe20505fa..60a75639c0cc 100644 --- a/internal/service/glue/catalog_database.go +++ b/internal/service/glue/catalog_database.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,7 +38,6 @@ func ResourceCatalogDatabase() *schema.Resource { Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/glue/connection.go b/internal/service/glue/connection.go index 7a1239d827b0..2a3506354d30 100644 --- a/internal/service/glue/connection.go +++ b/internal/service/glue/connection.go @@ -39,7 +39,6 @@ func ResourceConnection() *schema.Resource { Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index 79c7fd97438d..6eeaa37e3b05 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -47,8 +47,6 @@ func ResourceCrawler() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/glue/data_quality_ruleset.go b/internal/service/glue/data_quality_ruleset.go index f827b03f2a9f..d0e315d690b8 100644 --- a/internal/service/glue/data_quality_ruleset.go +++ b/internal/service/glue/data_quality_ruleset.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,7 +35,6 @@ func ResourceDataQualityRuleset() *schema.Resource { Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go index c433e38f2d42..9de75ae3475f 100644 --- a/internal/service/glue/dev_endpoint.go +++ b/internal/service/glue/dev_endpoint.go @@ -42,8 +42,6 @@ func ResourceDevEndpoint() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "arguments": { Type: schema.TypeMap, diff --git a/internal/service/glue/job.go b/internal/service/glue/job.go index 906a4c69cebe..750d3767eed4 100644 --- a/internal/service/glue/job.go +++ b/internal/service/glue/job.go @@ -38,8 +38,6 @@ func ResourceJob() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/glue/ml_transform.go b/internal/service/glue/ml_transform.go index 2f737b268391..fe54b9948a62 100644 --- a/internal/service/glue/ml_transform.go +++ b/internal/service/glue/ml_transform.go @@ -37,8 +37,6 @@ func ResourceMLTransform() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/glue/registry.go b/internal/service/glue/registry.go index 562450256fda..7279f16f8237 100644 --- a/internal/service/glue/registry.go +++ b/internal/service/glue/registry.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -35,8 +34,6 @@ func ResourceRegistry() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/glue/schema.go b/internal/service/glue/schema.go index d9b4af4d4121..f9b8c621217d 100644 --- a/internal/service/glue/schema.go +++ b/internal/service/glue/schema.go @@ -35,8 +35,6 @@ func ResourceSchema() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/glue/trigger.go b/internal/service/glue/trigger.go index 12e81ab10291..2a8009cc3548 100644 --- a/internal/service/glue/trigger.go +++ b/internal/service/glue/trigger.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -45,8 +44,6 @@ func ResourceTrigger() *schema.Resource { Delete: schema.DefaultTimeout(5 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrActions: { Type: schema.TypeList, diff --git a/internal/service/glue/workflow.go b/internal/service/glue/workflow.go index b6bc0e2fdaad..4d6b4b214d48 100644 --- a/internal/service/glue/workflow.go +++ b/internal/service/glue/workflow.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,8 +35,6 @@ func ResourceWorkflow() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 7b443d880cbf56405a2cdcb7823dfec89b508eab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:53 -0500 Subject: [PATCH 078/232] Remove transparent tagging-only CustomizeDiff - grafana. --- internal/service/grafana/workspace.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/grafana/workspace.go b/internal/service/grafana/workspace.go index 33ac3edd49fe..adb08500a5c8 100644 --- a/internal/service/grafana/workspace.go +++ b/internal/service/grafana/workspace.go @@ -186,8 +186,6 @@ func resourceWorkspace() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 843193bac404ce7383954a4b3da926d460c43dd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 079/232] Remove transparent tagging-only CustomizeDiff - guardduty. --- internal/service/guardduty/detector.go | 3 --- internal/service/guardduty/filter.go | 2 -- internal/service/guardduty/ipset.go | 3 --- internal/service/guardduty/threatintelset.go | 3 --- 4 files changed, 11 deletions(-) diff --git a/internal/service/guardduty/detector.go b/internal/service/guardduty/detector.go index 13de94061caf..15069011a387 100644 --- a/internal/service/guardduty/detector.go +++ b/internal/service/guardduty/detector.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -140,8 +139,6 @@ func ResourceDetector() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/guardduty/filter.go b/internal/service/guardduty/filter.go index 8c741358b615..06cf49f38a4b 100644 --- a/internal/service/guardduty/filter.go +++ b/internal/service/guardduty/filter.go @@ -132,8 +132,6 @@ func ResourceFilter() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/guardduty/ipset.go b/internal/service/guardduty/ipset.go index 36a42562a4f4..5847e9980336 100644 --- a/internal/service/guardduty/ipset.go +++ b/internal/service/guardduty/ipset.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -70,8 +69,6 @@ func ResourceIPSet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/guardduty/threatintelset.go b/internal/service/guardduty/threatintelset.go index b36b3c5d9a6a..90288df19ceb 100644 --- a/internal/service/guardduty/threatintelset.go +++ b/internal/service/guardduty/threatintelset.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -70,8 +69,6 @@ func ResourceThreatIntelSet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From f94c9d30547afdd03822dc4c121791299c88a038 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 080/232] Remove transparent tagging-only CustomizeDiff - iam. --- internal/service/iam/instance_profile.go | 3 --- internal/service/iam/openid_connect_provider.go | 3 --- internal/service/iam/policy.go | 2 -- internal/service/iam/role.go | 2 -- internal/service/iam/saml_provider.go | 3 --- internal/service/iam/server_certificate.go | 3 --- internal/service/iam/service_linked_role.go | 2 -- internal/service/iam/user.go | 3 --- internal/service/iam/virtual_mfa_device.go | 3 --- 9 files changed, 24 deletions(-) diff --git a/internal/service/iam/instance_profile.go b/internal/service/iam/instance_profile.go index 655f08b4e5e1..5565f8f1d5f7 100644 --- a/internal/service/iam/instance_profile.go +++ b/internal/service/iam/instance_profile.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -89,8 +88,6 @@ func resourceInstanceProfile() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/openid_connect_provider.go b/internal/service/iam/openid_connect_provider.go index eb176b262d22..0b31be5cebd3 100644 --- a/internal/service/iam/openid_connect_provider.go +++ b/internal/service/iam/openid_connect_provider.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -70,8 +69,6 @@ func resourceOpenIDConnectProvider() *schema.Resource { DiffSuppressFunc: suppressOpenIDURL, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/policy.go b/internal/service/iam/policy.go index b2fb64be31b3..5c17798917bb 100644 --- a/internal/service/iam/policy.go +++ b/internal/service/iam/policy.go @@ -102,8 +102,6 @@ func resourcePolicy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/role.go b/internal/service/iam/role.go index b5eaa3283478..d09ba2637dd8 100644 --- a/internal/service/iam/role.go +++ b/internal/service/iam/role.go @@ -182,8 +182,6 @@ func resourceRole() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/saml_provider.go b/internal/service/iam/saml_provider.go index 1e80bb964c1f..340bdfece62d 100644 --- a/internal/service/iam/saml_provider.go +++ b/internal/service/iam/saml_provider.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -64,8 +63,6 @@ func resourceSAMLProvider() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/server_certificate.go b/internal/service/iam/server_certificate.go index 010c44c944ec..4b84e2c710c0 100644 --- a/internal/service/iam/server_certificate.go +++ b/internal/service/iam/server_certificate.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -104,8 +103,6 @@ func resourceServerCertificate() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/service_linked_role.go b/internal/service/iam/service_linked_role.go index 85277130c477..775716556e91 100644 --- a/internal/service/iam/service_linked_role.go +++ b/internal/service/iam/service_linked_role.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -88,7 +87,6 @@ func resourceServiceLinkedRole() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/user.go b/internal/service/iam/user.go index 7bef399e90ee..8a8e8323c8bb 100644 --- a/internal/service/iam/user.go +++ b/internal/service/iam/user.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -85,8 +84,6 @@ func resourceUser() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iam/virtual_mfa_device.go b/internal/service/iam/virtual_mfa_device.go index bf345622606a..ace0a36f050c 100644 --- a/internal/service/iam/virtual_mfa_device.go +++ b/internal/service/iam/virtual_mfa_device.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,8 +81,6 @@ func resourceVirtualMFADevice() *schema.Resource { ), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 1c501e70a0796a3e08e82a53fc380a71dc1cc41f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 081/232] Remove transparent tagging-only CustomizeDiff - imagebuilder. --- internal/service/imagebuilder/component.go | 3 --- internal/service/imagebuilder/container_recipe.go | 2 -- internal/service/imagebuilder/distribution_configuration.go | 2 -- internal/service/imagebuilder/image.go | 2 -- internal/service/imagebuilder/image_pipeline.go | 2 -- internal/service/imagebuilder/image_recipe.go | 2 -- internal/service/imagebuilder/infrastructure_configuration.go | 2 -- internal/service/imagebuilder/workflow.go | 3 --- 8 files changed, 18 deletions(-) diff --git a/internal/service/imagebuilder/component.go b/internal/service/imagebuilder/component.go index a392e27c6b44..b6a7b397502f 100644 --- a/internal/service/imagebuilder/component.go +++ b/internal/service/imagebuilder/component.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -129,8 +128,6 @@ func resourceComponent() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 128), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/container_recipe.go b/internal/service/imagebuilder/container_recipe.go index 123e67505a5d..bb65696180a8 100644 --- a/internal/service/imagebuilder/container_recipe.go +++ b/internal/service/imagebuilder/container_recipe.go @@ -290,8 +290,6 @@ func resourceContainerRecipe() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 1024), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/distribution_configuration.go b/internal/service/imagebuilder/distribution_configuration.go index 9c7fae24ccb6..05464c77895e 100644 --- a/internal/service/imagebuilder/distribution_configuration.go +++ b/internal/service/imagebuilder/distribution_configuration.go @@ -321,8 +321,6 @@ func resourceDistributionConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/image.go b/internal/service/imagebuilder/image.go index dc6f261eb859..b803e990b981 100644 --- a/internal/service/imagebuilder/image.go +++ b/internal/service/imagebuilder/image.go @@ -272,8 +272,6 @@ func resourceImage() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/image_pipeline.go b/internal/service/imagebuilder/image_pipeline.go index 9717bd701572..d4d9f02c20b3 100644 --- a/internal/service/imagebuilder/image_pipeline.go +++ b/internal/service/imagebuilder/image_pipeline.go @@ -243,8 +243,6 @@ func resourceImagePipeline() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/image_recipe.go b/internal/service/imagebuilder/image_recipe.go index 3f61cb1c45fc..ce60357ac949 100644 --- a/internal/service/imagebuilder/image_recipe.go +++ b/internal/service/imagebuilder/image_recipe.go @@ -241,8 +241,6 @@ func resourceImageRecipe() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 1024), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/infrastructure_configuration.go b/internal/service/imagebuilder/infrastructure_configuration.go index e623435d254d..709c2330ac7c 100644 --- a/internal/service/imagebuilder/infrastructure_configuration.go +++ b/internal/service/imagebuilder/infrastructure_configuration.go @@ -151,8 +151,6 @@ func resourceInfrastructureConfiguration() *schema.Resource { Default: false, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/imagebuilder/workflow.go b/internal/service/imagebuilder/workflow.go index e89d9e9fec7b..ce1309f4c50e 100644 --- a/internal/service/imagebuilder/workflow.go +++ b/internal/service/imagebuilder/workflow.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -105,8 +104,6 @@ func resourceWorkflow() *schema.Resource { ValidateFunc: validation.StringMatch(regexache.MustCompile(`^[0-9]+\.[0-9]+\.[0-9]+$`), "valid semantic version must be provided"), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 859421e33f177323b20fe6b7d4ea3506be973f89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 082/232] Remove transparent tagging-only CustomizeDiff - inspector. --- internal/service/inspector/assessment_template.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/inspector/assessment_template.go b/internal/service/inspector/assessment_template.go index d6d4121373f0..66489b1a19fd 100644 --- a/internal/service/inspector/assessment_template.go +++ b/internal/service/inspector/assessment_template.go @@ -89,8 +89,6 @@ func ResourceAssessmentTemplate() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From e129c18a83a73a1ab0c2e98dcfa5f46128330723 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 083/232] Remove transparent tagging-only CustomizeDiff - internetmonitor. --- internal/service/internetmonitor/monitor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/internetmonitor/monitor.go b/internal/service/internetmonitor/monitor.go index 5a5b2ca859ff..2d82b3320921 100644 --- a/internal/service/internetmonitor/monitor.go +++ b/internal/service/internetmonitor/monitor.go @@ -136,7 +136,6 @@ func resourceMonitor() *schema.Resource { AtLeastOneOf: []string{"traffic_percentage_to_monitor", "max_city_networks_to_monitor"}, }, }, - CustomizeDiff: verify.SetTagsDiff, } } From 1b824a33de41727c682f7095bf73f4c57dd43b2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:54 -0500 Subject: [PATCH 084/232] Remove transparent tagging-only CustomizeDiff - iot. --- internal/service/iot/domain_configuration.go | 2 -- internal/service/iot/policy.go | 2 -- internal/service/iot/provisioning_template.go | 2 -- internal/service/iot/role_alias.go | 3 --- internal/service/iot/thing_group.go | 3 --- internal/service/iot/thing_type.go | 2 -- internal/service/iot/topic_rule.go | 2 -- 7 files changed, 16 deletions(-) diff --git a/internal/service/iot/domain_configuration.go b/internal/service/iot/domain_configuration.go index db1c60f4ed82..c5e731616b0f 100644 --- a/internal/service/iot/domain_configuration.go +++ b/internal/service/iot/domain_configuration.go @@ -38,8 +38,6 @@ func resourceDomainConfiguration() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/iot/policy.go b/internal/service/iot/policy.go index 0a0bff650d01..07a1f34b5f53 100644 --- a/internal/service/iot/policy.go +++ b/internal/service/iot/policy.go @@ -74,8 +74,6 @@ func resourcePolicy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iot/provisioning_template.go b/internal/service/iot/provisioning_template.go index 5fbcb947170b..c5e703bb6b54 100644 --- a/internal/service/iot/provisioning_template.go +++ b/internal/service/iot/provisioning_template.go @@ -121,8 +121,6 @@ func resourceProvisioningTemplate() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.TemplateType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iot/role_alias.go b/internal/service/iot/role_alias.go index 9127e6959e15..b3bae2c4971e 100644 --- a/internal/service/iot/role_alias.go +++ b/internal/service/iot/role_alias.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func ResourceRoleAlias() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iot/thing_group.go b/internal/service/iot/thing_group.go index 80b7c8571a29..2a22e2090d21 100644 --- a/internal/service/iot/thing_group.go +++ b/internal/service/iot/thing_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -121,8 +120,6 @@ func resourceThingGroup() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iot/thing_type.go b/internal/service/iot/thing_type.go index f8a17f5349ac..654fce1d8270 100644 --- a/internal/service/iot/thing_type.go +++ b/internal/service/iot/thing_type.go @@ -85,8 +85,6 @@ func resourceThingType() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/iot/topic_rule.go b/internal/service/iot/topic_rule.go index 2f813adcd788..4aaf81121781 100644 --- a/internal/service/iot/topic_rule.go +++ b/internal/service/iot/topic_rule.go @@ -1243,8 +1243,6 @@ func resourceTopicRule() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } From 8c95b9222d77a02b1fcd0e5bec8880d409060d4b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 085/232] Remove transparent tagging-only CustomizeDiff - ivs. --- internal/service/ivs/channel.go | 2 -- internal/service/ivs/playback_key_pair.go | 3 --- internal/service/ivs/recording_configuration.go | 3 --- 3 files changed, 8 deletions(-) diff --git a/internal/service/ivs/channel.go b/internal/service/ivs/channel.go index 4ae38278b67e..6b25b3e89266 100644 --- a/internal/service/ivs/channel.go +++ b/internal/service/ivs/channel.go @@ -90,8 +90,6 @@ func ResourceChannel() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.ChannelType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ivs/playback_key_pair.go b/internal/service/ivs/playback_key_pair.go index 6d3e22b45ead..5794cd74ecb7 100644 --- a/internal/service/ivs/playback_key_pair.go +++ b/internal/service/ivs/playback_key_pair.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -63,8 +62,6 @@ func ResourcePlaybackKeyPair() *schema.Resource { names.AttrTags: tftags.TagsSchemaForceNew(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ivs/recording_configuration.go b/internal/service/ivs/recording_configuration.go index 6cb4ec7755b3..0aff45c1ff0a 100644 --- a/internal/service/ivs/recording_configuration.go +++ b/internal/service/ivs/recording_configuration.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -117,8 +116,6 @@ func ResourceRecordingConfiguration() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From bcea85e18eafafd3fed74971b3dc1f96035d6a19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 086/232] Remove transparent tagging-only CustomizeDiff - ivschat. --- internal/service/ivschat/logging_configuration.go | 3 --- internal/service/ivschat/room.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/ivschat/logging_configuration.go b/internal/service/ivschat/logging_configuration.go index 581172cb43fa..b8d44b6788aa 100644 --- a/internal/service/ivschat/logging_configuration.go +++ b/internal/service/ivschat/logging_configuration.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -138,8 +137,6 @@ func ResourceLoggingConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ivschat/room.go b/internal/service/ivschat/room.go index e2a552ebca37..bc1ba56c77b4 100644 --- a/internal/service/ivschat/room.go +++ b/internal/service/ivschat/room.go @@ -97,8 +97,6 @@ func ResourceRoom() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 5cc0dfc92b71b545f597d6aef4371c4c6486a31c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 087/232] Remove transparent tagging-only CustomizeDiff - kafka. --- internal/service/kafka/replicator.go | 2 -- internal/service/kafka/serverless_cluster.go | 3 --- internal/service/kafka/vpc_connection.go | 3 --- 3 files changed, 8 deletions(-) diff --git a/internal/service/kafka/replicator.go b/internal/service/kafka/replicator.go index 71baeb02e27f..21ab48468bfa 100644 --- a/internal/service/kafka/replicator.go +++ b/internal/service/kafka/replicator.go @@ -255,8 +255,6 @@ func resourceReplicator() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/kafka/serverless_cluster.go b/internal/service/kafka/serverless_cluster.go index c9ee66b33fe2..1877023fe6c3 100644 --- a/internal/service/kafka/serverless_cluster.go +++ b/internal/service/kafka/serverless_cluster.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -41,8 +40,6 @@ func resourceServerlessCluster() *schema.Resource { Delete: schema.DefaultTimeout(120 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kafka/vpc_connection.go b/internal/service/kafka/vpc_connection.go index c8e23ee729cf..27c1158b0101 100644 --- a/internal/service/kafka/vpc_connection.go +++ b/internal/service/kafka/vpc_connection.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -73,8 +72,6 @@ func resourceVPCConnection() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From fbc2f4b4424d229cd75788d3a805f2add61f00d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 088/232] Remove transparent tagging-only CustomizeDiff - kafkaconnect. --- internal/service/kafkaconnect/connector.go | 2 -- internal/service/kafkaconnect/custom_plugin.go | 2 -- internal/service/kafkaconnect/worker_configuration.go | 3 --- 3 files changed, 7 deletions(-) diff --git a/internal/service/kafkaconnect/connector.go b/internal/service/kafkaconnect/connector.go index 50657436bc5a..98d3ceac9754 100644 --- a/internal/service/kafkaconnect/connector.go +++ b/internal/service/kafkaconnect/connector.go @@ -392,8 +392,6 @@ func resourceConnector() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/kafkaconnect/custom_plugin.go b/internal/service/kafkaconnect/custom_plugin.go index f86c357c382c..8da99f1376e6 100644 --- a/internal/service/kafkaconnect/custom_plugin.go +++ b/internal/service/kafkaconnect/custom_plugin.go @@ -111,8 +111,6 @@ func resourceCustomPlugin() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/kafkaconnect/worker_configuration.go b/internal/service/kafkaconnect/worker_configuration.go index c7c0c25ddebe..e2071f81ede4 100644 --- a/internal/service/kafkaconnect/worker_configuration.go +++ b/internal/service/kafkaconnect/worker_configuration.go @@ -22,7 +22,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -78,8 +77,6 @@ func resourceWorkerConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From e5722caa854e8419f55fc29e99e6d845ebfac641 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 089/232] Remove transparent tagging-only CustomizeDiff - kendra. --- internal/service/kendra/faq.go | 2 +- internal/service/kendra/index.go | 2 +- internal/service/kendra/query_suggestions_block_list.go | 2 -- internal/service/kendra/thesaurus.go | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/service/kendra/faq.go b/internal/service/kendra/faq.go index 6c47332df582..b52e3eb1db31 100644 --- a/internal/service/kendra/faq.go +++ b/internal/service/kendra/faq.go @@ -45,7 +45,7 @@ func ResourceFaq() *schema.Resource { Create: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, + Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go index 7d1f4d5ca261..604f4ddfada1 100644 --- a/internal/service/kendra/index.go +++ b/internal/service/kendra/index.go @@ -55,7 +55,7 @@ func ResourceIndex() *schema.Resource { Update: schema.DefaultTimeout(60 * time.Minute), Delete: schema.DefaultTimeout(60 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, + Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kendra/query_suggestions_block_list.go b/internal/service/kendra/query_suggestions_block_list.go index 17b68ff9655b..c1c0dcee5ded 100644 --- a/internal/service/kendra/query_suggestions_block_list.go +++ b/internal/service/kendra/query_suggestions_block_list.go @@ -98,8 +98,6 @@ func ResourceQuerySuggestionsBlockList() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/kendra/thesaurus.go b/internal/service/kendra/thesaurus.go index 2bfb99d078b0..5bd8841bf71a 100644 --- a/internal/service/kendra/thesaurus.go +++ b/internal/service/kendra/thesaurus.go @@ -98,8 +98,6 @@ func ResourceThesaurus() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 546992a391fc127d2df87b41d3f3dba4ac69ca5a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:55 -0500 Subject: [PATCH 090/232] Remove transparent tagging-only CustomizeDiff - keyspaces. --- internal/service/keyspaces/keyspace.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/keyspaces/keyspace.go b/internal/service/keyspaces/keyspace.go index 722d3105a083..d36d9b8dc301 100644 --- a/internal/service/keyspaces/keyspace.go +++ b/internal/service/keyspaces/keyspace.go @@ -45,8 +45,6 @@ func resourceKeyspace() *schema.Resource { Delete: schema.DefaultTimeout(1 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From abbf7e32b8ae762b5e70f3809d6e5a0daeafe22c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 091/232] Remove transparent tagging-only CustomizeDiff - kinesisvideo. --- internal/service/kinesisvideo/stream.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/kinesisvideo/stream.go b/internal/service/kinesisvideo/stream.go index fe665ba22a7e..aaed108f9b0b 100644 --- a/internal/service/kinesisvideo/stream.go +++ b/internal/service/kinesisvideo/stream.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceStream() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(120 * time.Minute), From 2529b47d9f2604e3bd53e9182393a2acf457c084 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 092/232] Remove transparent tagging-only CustomizeDiff - kms. --- internal/service/kms/external_key.go | 2 -- internal/service/kms/key.go | 2 -- internal/service/kms/replica_external_key.go | 2 -- internal/service/kms/replica_key.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/internal/service/kms/external_key.go b/internal/service/kms/external_key.go index a94101232361..71f9abffddd2 100644 --- a/internal/service/kms/external_key.go +++ b/internal/service/kms/external_key.go @@ -49,8 +49,6 @@ func resourceExternalKey() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kms/key.go b/internal/service/kms/key.go index 2acb5a9851ae..678df0b38a59 100644 --- a/internal/service/kms/key.go +++ b/internal/service/kms/key.go @@ -49,8 +49,6 @@ func resourceKey() *schema.Resource { Create: schema.DefaultTimeout(iamPropagationTimeout), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kms/replica_external_key.go b/internal/service/kms/replica_external_key.go index eab2bb1ad22f..b3998d68811b 100644 --- a/internal/service/kms/replica_external_key.go +++ b/internal/service/kms/replica_external_key.go @@ -45,8 +45,6 @@ func resourceReplicaExternalKey() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kms/replica_key.go b/internal/service/kms/replica_key.go index 03c056de30ea..d76b117c27a1 100644 --- a/internal/service/kms/replica_key.go +++ b/internal/service/kms/replica_key.go @@ -45,8 +45,6 @@ func resourceReplicaKey() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 559f2c8fa80e41d15b81661887e185c320b2d4e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 093/232] Remove transparent tagging-only CustomizeDiff - licensemanager. --- internal/service/licensemanager/license_configuration.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/licensemanager/license_configuration.go b/internal/service/licensemanager/license_configuration.go index fe270eaa577e..cb6e2a6400cc 100644 --- a/internal/service/licensemanager/license_configuration.go +++ b/internal/service/licensemanager/license_configuration.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -83,8 +82,6 @@ func resourceLicenseConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 9280cb315dfa6ff4877ccb937597728a653adfe1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 094/232] Remove transparent tagging-only CustomizeDiff - lightsail. --- internal/service/lightsail/bucket.go | 3 --- internal/service/lightsail/container_service.go | 3 --- internal/service/lightsail/database.go | 1 - internal/service/lightsail/disk.go | 2 -- internal/service/lightsail/distribution.go | 2 -- internal/service/lightsail/key_pair.go | 3 --- internal/service/lightsail/lb.go | 2 -- 7 files changed, 16 deletions(-) diff --git a/internal/service/lightsail/bucket.go b/internal/service/lightsail/bucket.go index f5763579e501..c010bf9f1f9a 100644 --- a/internal/service/lightsail/bucket.go +++ b/internal/service/lightsail/bucket.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -78,8 +77,6 @@ func ResourceBucket() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/lightsail/container_service.go b/internal/service/lightsail/container_service.go index 0337d65350d9..c1bba78c5880 100644 --- a/internal/service/lightsail/container_service.go +++ b/internal/service/lightsail/container_service.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -43,8 +42,6 @@ func ResourceContainerService() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/lightsail/database.go b/internal/service/lightsail/database.go index 018c43301583..9320e84e2e4e 100644 --- a/internal/service/lightsail/database.go +++ b/internal/service/lightsail/database.go @@ -187,7 +187,6 @@ func ResourceDatabase() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/lightsail/disk.go b/internal/service/lightsail/disk.go index 64bd1c91bed4..6966411f584a 100644 --- a/internal/service/lightsail/disk.go +++ b/internal/service/lightsail/disk.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,7 +71,6 @@ func ResourceDisk() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/lightsail/distribution.go b/internal/service/lightsail/distribution.go index 15700884d150..41f29c8b2515 100644 --- a/internal/service/lightsail/distribution.go +++ b/internal/service/lightsail/distribution.go @@ -317,8 +317,6 @@ func ResourceDistribution() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/lightsail/key_pair.go b/internal/service/lightsail/key_pair.go index 33d8e35793a9..96850de634b1 100644 --- a/internal/service/lightsail/key_pair.go +++ b/internal/service/lightsail/key_pair.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/vault/helper/pgpkeys" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -89,8 +88,6 @@ func ResourceKeyPair() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/lightsail/lb.go b/internal/service/lightsail/lb.go index 9d791f65cdb0..9e452837b903 100644 --- a/internal/service/lightsail/lb.go +++ b/internal/service/lightsail/lb.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -96,7 +95,6 @@ func ResourceLoadBalancer() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 653055a1402f4a6f973ea150a62fd93c15cff6f5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 095/232] Remove transparent tagging-only CustomizeDiff - location. --- internal/service/location/geofence_collection.go | 3 --- internal/service/location/map.go | 2 -- internal/service/location/place_index.go | 2 -- internal/service/location/route_calculator.go | 3 --- internal/service/location/tracker.go | 2 -- 5 files changed, 12 deletions(-) diff --git a/internal/service/location/geofence_collection.go b/internal/service/location/geofence_collection.go index 306cdf07672b..a25c167e0349 100644 --- a/internal/service/location/geofence_collection.go +++ b/internal/service/location/geofence_collection.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -77,8 +76,6 @@ func ResourceGeofenceCollection() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/location/map.go b/internal/service/location/map.go index 35a78c422676..bcedeccba7d4 100644 --- a/internal/service/location/map.go +++ b/internal/service/location/map.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -76,7 +75,6 @@ func ResourceMap() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/location/place_index.go b/internal/service/location/place_index.go index 53c4c1597039..c06037ef8381 100644 --- a/internal/service/location/place_index.go +++ b/internal/service/location/place_index.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,7 +81,6 @@ func ResourcePlaceIndex() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/location/route_calculator.go b/internal/service/location/route_calculator.go index 6b3ab4f74d40..4dd4b57bc389 100644 --- a/internal/service/location/route_calculator.go +++ b/internal/service/location/route_calculator.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -75,8 +74,6 @@ func ResourceRouteCalculator() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/location/tracker.go b/internal/service/location/tracker.go index 41195ceb1aaa..7148d62f9f1f 100644 --- a/internal/service/location/tracker.go +++ b/internal/service/location/tracker.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,7 +71,6 @@ func ResourceTracker() *schema.Resource { Computed: true, }, }, - CustomizeDiff: verify.SetTagsDiff, } } From 80bfd6b3be0441f438239354280282ff5136f1c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:56 -0500 Subject: [PATCH 096/232] Remove transparent tagging-only CustomizeDiff - logs. --- internal/service/logs/destination.go | 2 -- internal/service/logs/group.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/internal/service/logs/destination.go b/internal/service/logs/destination.go index 95a8825a361f..907db6a71a6c 100644 --- a/internal/service/logs/destination.go +++ b/internal/service/logs/destination.go @@ -66,8 +66,6 @@ func resourceDestination() *schema.Resource { ValidateFunc: verify.ValidARN, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/logs/group.go b/internal/service/logs/group.go index ec12e0116cd2..b006bd038c6c 100644 --- a/internal/service/logs/group.go +++ b/internal/service/logs/group.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -88,8 +87,6 @@ func resourceGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From dcb8ee65b01813be28453d2ee87a77da6c434bc7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:57 -0500 Subject: [PATCH 097/232] Remove transparent tagging-only CustomizeDiff - mediaconvert. --- internal/service/mediaconvert/queue.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/mediaconvert/queue.go b/internal/service/mediaconvert/queue.go index cbb079d01690..27258088744d 100644 --- a/internal/service/mediaconvert/queue.go +++ b/internal/service/mediaconvert/queue.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -95,8 +94,6 @@ func resourceQueue() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 2b84572a2a8dbc568f3982a9fe2a35cf8ddf0f0b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:57 -0500 Subject: [PATCH 098/232] Remove transparent tagging-only CustomizeDiff - medialive. --- internal/service/medialive/channel.go | 2 -- internal/service/medialive/input.go | 2 -- internal/service/medialive/input_security_group.go | 2 -- internal/service/medialive/multiplex.go | 3 --- 4 files changed, 9 deletions(-) diff --git a/internal/service/medialive/channel.go b/internal/service/medialive/channel.go index 5f0a183ab8f7..5980ea121037 100644 --- a/internal/service/medialive/channel.go +++ b/internal/service/medialive/channel.go @@ -731,8 +731,6 @@ func ResourceChannel() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/medialive/input.go b/internal/service/medialive/input.go index e5cb97d388bb..c387c4172150 100644 --- a/internal/service/medialive/input.go +++ b/internal/service/medialive/input.go @@ -175,8 +175,6 @@ func ResourceInput() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/medialive/input_security_group.go b/internal/service/medialive/input_security_group.go index d837e07ad31f..de91d3eed0fc 100644 --- a/internal/service/medialive/input_security_group.go +++ b/internal/service/medialive/input_security_group.go @@ -73,8 +73,6 @@ func ResourceInputSecurityGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/medialive/multiplex.go b/internal/service/medialive/multiplex.go index 7e8362245b12..7a3b04c4082d 100644 --- a/internal/service/medialive/multiplex.go +++ b/internal/service/medialive/multiplex.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -102,8 +101,6 @@ func ResourceMultiplex() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 92dbdc3df20b233861f0e2b475446422b7b4b5ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:57 -0500 Subject: [PATCH 099/232] Remove transparent tagging-only CustomizeDiff - mediapackage. --- internal/service/mediapackage/channel.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go index 961d1f04380d..a886baaa6a26 100644 --- a/internal/service/mediapackage/channel.go +++ b/internal/service/mediapackage/channel.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -85,8 +84,6 @@ func ResourceChannel() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 20b3d219f62c947c04fc2028543284e3ba22ac0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:57 -0500 Subject: [PATCH 100/232] Remove transparent tagging-only CustomizeDiff - mediastore. --- internal/service/mediastore/container.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/mediastore/container.go b/internal/service/mediastore/container.go index 960798210680..1ff6f86c2d5b 100644 --- a/internal/service/mediastore/container.go +++ b/internal/service/mediastore/container.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -55,8 +54,6 @@ func ResourceContainer() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From e19332a3590fa53d15d3fc8b278b88e4d968f8c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:57 -0500 Subject: [PATCH 101/232] Remove transparent tagging-only CustomizeDiff - memorydb. --- internal/service/memorydb/acl.go | 3 --- internal/service/memorydb/cluster.go | 2 -- internal/service/memorydb/parameter_group.go | 3 --- internal/service/memorydb/snapshot.go | 2 -- internal/service/memorydb/subnet_group.go | 3 --- internal/service/memorydb/user.go | 3 --- 6 files changed, 16 deletions(-) diff --git a/internal/service/memorydb/acl.go b/internal/service/memorydb/acl.go index ffd4b69606cf..9cb106952ed6 100644 --- a/internal/service/memorydb/acl.go +++ b/internal/service/memorydb/acl.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -40,8 +39,6 @@ func resourceACL() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/memorydb/cluster.go b/internal/service/memorydb/cluster.go index f3a35c84e5e7..b19abb6d87fc 100644 --- a/internal/service/memorydb/cluster.go +++ b/internal/service/memorydb/cluster.go @@ -51,8 +51,6 @@ func resourceCluster() *schema.Resource { Delete: schema.DefaultTimeout(120 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - SchemaFunc: func() map[string]*schema.Schema { return map[string]*schema.Schema{ "acl_name": { diff --git a/internal/service/memorydb/parameter_group.go b/internal/service/memorydb/parameter_group.go index 625357ac1b22..32a61c041a4c 100644 --- a/internal/service/memorydb/parameter_group.go +++ b/internal/service/memorydb/parameter_group.go @@ -26,7 +26,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -43,8 +42,6 @@ func resourceParameterGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/memorydb/snapshot.go b/internal/service/memorydb/snapshot.go index 5c64b1f2b8bf..8b013b44f56b 100644 --- a/internal/service/memorydb/snapshot.go +++ b/internal/service/memorydb/snapshot.go @@ -43,8 +43,6 @@ func resourceSnapshot() *schema.Resource { Delete: schema.DefaultTimeout(120 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/memorydb/subnet_group.go b/internal/service/memorydb/subnet_group.go index b01015569faf..9fec6655cc1f 100644 --- a/internal/service/memorydb/subnet_group.go +++ b/internal/service/memorydb/subnet_group.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceSubnetGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/memorydb/user.go b/internal/service/memorydb/user.go index ac29c1ead65e..9c53f047bca8 100644 --- a/internal/service/memorydb/user.go +++ b/internal/service/memorydb/user.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceUser() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ "access_string": { Type: schema.TypeString, From 53b40b40097d617050404a4b56cf5b9b49430924 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:58 -0500 Subject: [PATCH 102/232] Remove transparent tagging-only CustomizeDiff - neptune. --- internal/service/neptune/cluster.go | 2 -- internal/service/neptune/cluster_endpoint.go | 3 --- internal/service/neptune/cluster_instance.go | 2 -- internal/service/neptune/cluster_parameter_group.go | 3 --- internal/service/neptune/event_subscription.go | 2 -- internal/service/neptune/parameter_group.go | 3 --- internal/service/neptune/subnet_group.go | 3 --- 7 files changed, 18 deletions(-) diff --git a/internal/service/neptune/cluster.go b/internal/service/neptune/cluster.go index db809a3cdd6d..4664badbdc9b 100644 --- a/internal/service/neptune/cluster.go +++ b/internal/service/neptune/cluster.go @@ -314,8 +314,6 @@ func resourceCluster() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/cluster_endpoint.go b/internal/service/neptune/cluster_endpoint.go index e951927bac81..c0ba168d8d25 100644 --- a/internal/service/neptune/cluster_endpoint.go +++ b/internal/service/neptune/cluster_endpoint.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -81,8 +80,6 @@ func resourceClusterEndpoint() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/cluster_instance.go b/internal/service/neptune/cluster_instance.go index 023d8c7c912b..c5e20c8d9317 100644 --- a/internal/service/neptune/cluster_instance.go +++ b/internal/service/neptune/cluster_instance.go @@ -186,8 +186,6 @@ func resourceClusterInstance() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/cluster_parameter_group.go b/internal/service/neptune/cluster_parameter_group.go index b31cd660ef40..ed2016e0aeeb 100644 --- a/internal/service/neptune/cluster_parameter_group.go +++ b/internal/service/neptune/cluster_parameter_group.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -97,8 +96,6 @@ func resourceClusterParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/event_subscription.go b/internal/service/neptune/event_subscription.go index 743baf30a80a..2378f0059e8e 100644 --- a/internal/service/neptune/event_subscription.go +++ b/internal/service/neptune/event_subscription.go @@ -96,8 +96,6 @@ func resourceEventSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/parameter_group.go b/internal/service/neptune/parameter_group.go index df81d7c11bb3..85e8f59f50aa 100644 --- a/internal/service/neptune/parameter_group.go +++ b/internal/service/neptune/parameter_group.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -103,8 +102,6 @@ func resourceParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/neptune/subnet_group.go b/internal/service/neptune/subnet_group.go index 1d97895eeaa8..b030d3118edb 100644 --- a/internal/service/neptune/subnet_group.go +++ b/internal/service/neptune/subnet_group.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,8 +71,6 @@ func resourceSubnetGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From c54670b4ca42c38b28255da128fff23c654c84b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:58 -0500 Subject: [PATCH 103/232] Remove transparent tagging-only CustomizeDiff - networkmanager. --- internal/service/networkmanager/connect_attachment.go | 3 --- internal/service/networkmanager/connect_peer.go | 3 --- internal/service/networkmanager/connection.go | 3 --- internal/service/networkmanager/core_network.go | 2 -- internal/service/networkmanager/device.go | 2 -- internal/service/networkmanager/global_network.go | 3 --- internal/service/networkmanager/link.go | 3 --- internal/service/networkmanager/site.go | 3 --- internal/service/networkmanager/site_to_site_vpn_attachment.go | 3 --- internal/service/networkmanager/transit_gateway_peering.go | 2 -- .../networkmanager/transit_gateway_route_table_attachment.go | 2 -- 11 files changed, 29 deletions(-) diff --git a/internal/service/networkmanager/connect_attachment.go b/internal/service/networkmanager/connect_attachment.go index c816597e5d2e..05d48d8a2898 100644 --- a/internal/service/networkmanager/connect_attachment.go +++ b/internal/service/networkmanager/connect_attachment.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceConnectAttachment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/connect_peer.go b/internal/service/networkmanager/connect_peer.go index 834b064b67b8..a585ce046997 100644 --- a/internal/service/networkmanager/connect_peer.go +++ b/internal/service/networkmanager/connect_peer.go @@ -27,7 +27,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -44,8 +43,6 @@ func resourceConnectPeer() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(15 * time.Minute), diff --git a/internal/service/networkmanager/connection.go b/internal/service/networkmanager/connection.go index 1432a6a7f804..fc33ab1dcbe5 100644 --- a/internal/service/networkmanager/connection.go +++ b/internal/service/networkmanager/connection.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceConnection() *schema.Resource { }, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/core_network.go b/internal/service/networkmanager/core_network.go index 7ad02b25c041..6e57fb9bde40 100644 --- a/internal/service/networkmanager/core_network.go +++ b/internal/service/networkmanager/core_network.go @@ -54,8 +54,6 @@ func resourceCoreNetwork() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), diff --git a/internal/service/networkmanager/device.go b/internal/service/networkmanager/device.go index 98f80a160f27..71b2bd70d22f 100644 --- a/internal/service/networkmanager/device.go +++ b/internal/service/networkmanager/device.go @@ -59,8 +59,6 @@ func resourceDevice() *schema.Resource { }, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/global_network.go b/internal/service/networkmanager/global_network.go index 495853cf6399..86ac32b5032d 100644 --- a/internal/service/networkmanager/global_network.go +++ b/internal/service/networkmanager/global_network.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceGlobalNetwork() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/link.go b/internal/service/networkmanager/link.go index 9627c1d91ff9..8d81b5344b66 100644 --- a/internal/service/networkmanager/link.go +++ b/internal/service/networkmanager/link.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceLink() *schema.Resource { }, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/site.go b/internal/service/networkmanager/site.go index 1c0930a9e0bf..758830185f7b 100644 --- a/internal/service/networkmanager/site.go +++ b/internal/service/networkmanager/site.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceSite() *schema.Resource { }, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/site_to_site_vpn_attachment.go b/internal/service/networkmanager/site_to_site_vpn_attachment.go index c49b7fab074c..883062cb1cb3 100644 --- a/internal/service/networkmanager/site_to_site_vpn_attachment.go +++ b/internal/service/networkmanager/site_to_site_vpn_attachment.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -39,8 +38,6 @@ func resourceSiteToSiteVPNAttachment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/networkmanager/transit_gateway_peering.go b/internal/service/networkmanager/transit_gateway_peering.go index c37199826bc5..4f6561eb301e 100644 --- a/internal/service/networkmanager/transit_gateway_peering.go +++ b/internal/service/networkmanager/transit_gateway_peering.go @@ -39,8 +39,6 @@ func resourceTransitGatewayPeering() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(20 * time.Minute), Delete: schema.DefaultTimeout(20 * time.Minute), diff --git a/internal/service/networkmanager/transit_gateway_route_table_attachment.go b/internal/service/networkmanager/transit_gateway_route_table_attachment.go index 35f94198aac5..e61bf11ae2bd 100644 --- a/internal/service/networkmanager/transit_gateway_route_table_attachment.go +++ b/internal/service/networkmanager/transit_gateway_route_table_attachment.go @@ -37,8 +37,6 @@ func resourceTransitGatewayRouteTableAttachment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), From bb4832290fc692f6b9156a7d51d08f66ef3e8986 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:58 -0500 Subject: [PATCH 104/232] Remove transparent tagging-only CustomizeDiff - oam. --- internal/service/oam/link.go | 3 --- internal/service/oam/sink.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/internal/service/oam/link.go b/internal/service/oam/link.go index 4fd5fb1c3555..33ea04dbcf9b 100644 --- a/internal/service/oam/link.go +++ b/internal/service/oam/link.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -122,8 +121,6 @@ func ResourceLink() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/oam/sink.go b/internal/service/oam/sink.go index 851c5c0be5bd..60112eeb457c 100644 --- a/internal/service/oam/sink.go +++ b/internal/service/oam/sink.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func ResourceSink() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 183e78afc35448f83d4febc4cb05e3fd3103ccd9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:59 -0500 Subject: [PATCH 105/232] Remove transparent tagging-only CustomizeDiff - opsworks. --- internal/service/opsworks/layers.go | 2 -- internal/service/opsworks/stack.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/opsworks/layers.go b/internal/service/opsworks/layers.go index 4a51a0e727f0..cc57f8268418 100644 --- a/internal/service/opsworks/layers.go +++ b/internal/service/opsworks/layers.go @@ -467,8 +467,6 @@ func (lt *opsworksLayerType) resourceSchema() *schema.Resource { SchemaFunc: func() map[string]*schema.Schema { return resourceSchema }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/opsworks/stack.go b/internal/service/opsworks/stack.go index eed24ff07ce9..6e1419a68e98 100644 --- a/internal/service/opsworks/stack.go +++ b/internal/service/opsworks/stack.go @@ -198,8 +198,6 @@ func resourceStack() *schema.Resource { ConflictsWith: []string{"default_availability_zone"}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From c03b707539a5063cd647d57ea5d919c5fbaa6285 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:59 -0500 Subject: [PATCH 106/232] Remove transparent tagging-only CustomizeDiff - organizations. --- internal/service/organizations/account.go | 3 --- internal/service/organizations/organizational_unit.go | 3 --- internal/service/organizations/policy.go | 2 -- internal/service/organizations/resource_policy.go | 2 -- 4 files changed, 10 deletions(-) diff --git a/internal/service/organizations/account.go b/internal/service/organizations/account.go index 4ca436e0d8a9..9e68901670d4 100644 --- a/internal/service/organizations/account.go +++ b/internal/service/organizations/account.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -114,8 +113,6 @@ func resourceAccount() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/organizations/organizational_unit.go b/internal/service/organizations/organizational_unit.go index 1c39dc53d553..e7f9120d16d5 100644 --- a/internal/service/organizations/organizational_unit.go +++ b/internal/service/organizations/organizational_unit.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -80,8 +79,6 @@ func resourceOrganizationalUnit() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/organizations/policy.go b/internal/service/organizations/policy.go index 411f2d786ad9..8c7101115946 100644 --- a/internal/service/organizations/policy.go +++ b/internal/service/organizations/policy.go @@ -72,8 +72,6 @@ func resourcePolicy() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.PolicyType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/organizations/resource_policy.go b/internal/service/organizations/resource_policy.go index 440262f79422..eff40094ad4c 100644 --- a/internal/service/organizations/resource_policy.go +++ b/internal/service/organizations/resource_policy.go @@ -56,8 +56,6 @@ func resourceResourcePolicy() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 3f9b0e46a8d35ded0254ac68939e1e44f2cf7df4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:58:59 -0500 Subject: [PATCH 107/232] Remove transparent tagging-only CustomizeDiff - pinpoint. --- internal/service/pinpoint/app.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/pinpoint/app.go b/internal/service/pinpoint/app.go index f3d005e64084..e6cb1c8c3929 100644 --- a/internal/service/pinpoint/app.go +++ b/internal/service/pinpoint/app.go @@ -139,8 +139,6 @@ func resourceApp() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 0fc17a09a50ff1441cf1e07a069c6f62357f6390 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 108/232] Remove transparent tagging-only CustomizeDiff - pipes. --- internal/service/pipes/pipe.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/pipes/pipe.go b/internal/service/pipes/pipe.go index 6b293ad3786e..2bc1d1fa00ac 100644 --- a/internal/service/pipes/pipe.go +++ b/internal/service/pipes/pipe.go @@ -49,8 +49,6 @@ func resourcePipe() *schema.Resource { Delete: schema.DefaultTimeout(30 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - SchemaFunc: func() map[string]*schema.Schema { return map[string]*schema.Schema{ names.AttrARN: { From 1d6647be7a4a3a388ab93f7070fc059d89f1f9a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 109/232] Remove transparent tagging-only CustomizeDiff - qldb. --- internal/service/qldb/ledger.go | 2 -- internal/service/qldb/stream.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/qldb/ledger.go b/internal/service/qldb/ledger.go index ef52814cea5d..bccb4c467a4a 100644 --- a/internal/service/qldb/ledger.go +++ b/internal/service/qldb/ledger.go @@ -82,8 +82,6 @@ func resourceLedger() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/qldb/stream.go b/internal/service/qldb/stream.go index 9fa4af9c751a..6204be49244d 100644 --- a/internal/service/qldb/stream.go +++ b/internal/service/qldb/stream.go @@ -104,8 +104,6 @@ func resourceStream() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 41111317df3d3f07ba65b7dbd5f4f21b9a805db4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 110/232] Remove transparent tagging-only CustomizeDiff - quicksight. --- internal/service/quicksight/analysis.go | 2 -- internal/service/quicksight/dashboard.go | 2 -- internal/service/quicksight/data_source.go | 2 -- internal/service/quicksight/folder.go | 2 -- internal/service/quicksight/template.go | 2 -- internal/service/quicksight/theme.go | 2 -- 6 files changed, 12 deletions(-) diff --git a/internal/service/quicksight/analysis.go b/internal/service/quicksight/analysis.go index 31c5b128ffa4..e741d0817fa0 100644 --- a/internal/service/quicksight/analysis.go +++ b/internal/service/quicksight/analysis.go @@ -114,8 +114,6 @@ func resourceAnalysis() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/quicksight/dashboard.go b/internal/service/quicksight/dashboard.go index 8512aa8c908d..7ac470cc8430 100644 --- a/internal/service/quicksight/dashboard.go +++ b/internal/service/quicksight/dashboard.go @@ -117,8 +117,6 @@ func resourceDashboard() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/quicksight/data_source.go b/internal/service/quicksight/data_source.go index 86d63b426a6f..370c542f6610 100644 --- a/internal/service/quicksight/data_source.go +++ b/internal/service/quicksight/data_source.go @@ -84,8 +84,6 @@ func resourceDataSource() *schema.Resource { "vpc_connection_properties": quicksightschema.VPCConnectionPropertiesSchema(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/quicksight/folder.go b/internal/service/quicksight/folder.go index ee9cd67f4890..67606aa78525 100644 --- a/internal/service/quicksight/folder.go +++ b/internal/service/quicksight/folder.go @@ -110,8 +110,6 @@ func resourceFolder() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/quicksight/template.go b/internal/service/quicksight/template.go index c0b5919b4edc..d0618ea7d47f 100644 --- a/internal/service/quicksight/template.go +++ b/internal/service/quicksight/template.go @@ -106,8 +106,6 @@ func resourceTemplate() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/quicksight/theme.go b/internal/service/quicksight/theme.go index 8798e9dcb7ab..97cd78c16324 100644 --- a/internal/service/quicksight/theme.go +++ b/internal/service/quicksight/theme.go @@ -105,8 +105,6 @@ func resourceTheme() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7e09900c4118db320c5b5651ae6881c893b1a700 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 111/232] Remove transparent tagging-only CustomizeDiff - ram. --- internal/service/ram/resource_share.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/ram/resource_share.go b/internal/service/ram/resource_share.go index 44e5fd1f5795..bbc02106f479 100644 --- a/internal/service/ram/resource_share.go +++ b/internal/service/ram/resource_share.go @@ -76,8 +76,6 @@ func resourceResourceShare() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 08f92ce2f88e25c2ec7a44fe619841833b9a2379 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 112/232] Remove transparent tagging-only CustomizeDiff - rbin. --- internal/service/rbin/rule.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/rbin/rule.go b/internal/service/rbin/rule.go index 82497e5819b4..35959669905f 100644 --- a/internal/service/rbin/rule.go +++ b/internal/service/rbin/rule.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/enum" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -149,8 +148,6 @@ func ResourceRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 630b453843b1e4b6d1cda33c57d2fed0cae7e30a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 113/232] Remove transparent tagging-only CustomizeDiff - rds. --- internal/service/rds/cluster_endpoint.go | 3 --- internal/service/rds/cluster_instance.go | 2 -- internal/service/rds/cluster_parameter_group.go | 3 --- internal/service/rds/cluster_snapshot.go | 3 --- internal/service/rds/custom_db_engine_version.go | 2 -- internal/service/rds/event_subscription.go | 2 -- internal/service/rds/global_cluster.go | 3 --- internal/service/rds/option_group.go | 3 --- internal/service/rds/parameter_group.go | 3 --- internal/service/rds/proxy.go | 2 -- internal/service/rds/proxy_endpoint.go | 3 --- internal/service/rds/reserved_instance.go | 3 --- internal/service/rds/snapshot.go | 3 --- internal/service/rds/snapshot_copy.go | 3 --- internal/service/rds/subnet_group.go | 3 --- 15 files changed, 41 deletions(-) diff --git a/internal/service/rds/cluster_endpoint.go b/internal/service/rds/cluster_endpoint.go index 5a3dcb487a48..9d86394fbb88 100644 --- a/internal/service/rds/cluster_endpoint.go +++ b/internal/service/rds/cluster_endpoint.go @@ -21,7 +21,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -83,8 +82,6 @@ func resourceClusterEndpoint() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/cluster_instance.go b/internal/service/rds/cluster_instance.go index abaa84324821..ec619e93791c 100644 --- a/internal/service/rds/cluster_instance.go +++ b/internal/service/rds/cluster_instance.go @@ -240,8 +240,6 @@ func resourceClusterInstance() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/cluster_parameter_group.go b/internal/service/rds/cluster_parameter_group.go index 28a4a0c6ae00..5ada859a1caa 100644 --- a/internal/service/rds/cluster_parameter_group.go +++ b/internal/service/rds/cluster_parameter_group.go @@ -24,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -100,8 +99,6 @@ func resourceClusterParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/cluster_snapshot.go b/internal/service/rds/cluster_snapshot.go index ff2287918094..5064c5de038f 100644 --- a/internal/service/rds/cluster_snapshot.go +++ b/internal/service/rds/cluster_snapshot.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -124,8 +123,6 @@ func resourceClusterSnapshot() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/custom_db_engine_version.go b/internal/service/rds/custom_db_engine_version.go index 6cdaf7dd139f..f74826d7428c 100644 --- a/internal/service/rds/custom_db_engine_version.go +++ b/internal/service/rds/custom_db_engine_version.go @@ -159,8 +159,6 @@ func resourceCustomDBEngineVersion() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/event_subscription.go b/internal/service/rds/event_subscription.go index 6876f1dc6853..ed9675eb1f43 100644 --- a/internal/service/rds/event_subscription.go +++ b/internal/service/rds/event_subscription.go @@ -100,8 +100,6 @@ func resourceEventSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/global_cluster.go b/internal/service/rds/global_cluster.go index ba5763835b9d..037d086d23ff 100644 --- a/internal/service/rds/global_cluster.go +++ b/internal/service/rds/global_cluster.go @@ -26,7 +26,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -140,8 +139,6 @@ func resourceGlobalCluster() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/option_group.go b/internal/service/rds/option_group.go index d19358fa76eb..19dc9ca0690d 100644 --- a/internal/service/rds/option_group.go +++ b/internal/service/rds/option_group.go @@ -24,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -137,8 +136,6 @@ func resourceOptionGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/parameter_group.go b/internal/service/rds/parameter_group.go index 0e4ca3f870ec..a796788e8a89 100644 --- a/internal/service/rds/parameter_group.go +++ b/internal/service/rds/parameter_group.go @@ -26,7 +26,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -107,8 +106,6 @@ func resourceParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/proxy.go b/internal/service/rds/proxy.go index 008ebc180ff1..d2d41676c1c5 100644 --- a/internal/service/rds/proxy.go +++ b/internal/service/rds/proxy.go @@ -138,8 +138,6 @@ func resourceProxy() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/proxy_endpoint.go b/internal/service/rds/proxy_endpoint.go index 79de10c9c47c..2bd87a5d0de0 100644 --- a/internal/service/rds/proxy_endpoint.go +++ b/internal/service/rds/proxy_endpoint.go @@ -24,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -42,8 +41,6 @@ func resourceProxyEndpoint() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), diff --git a/internal/service/rds/reserved_instance.go b/internal/service/rds/reserved_instance.go index d97b0097800b..3649fbf82612 100644 --- a/internal/service/rds/reserved_instance.go +++ b/internal/service/rds/reserved_instance.go @@ -20,7 +20,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -128,8 +127,6 @@ func resourceReservedInstance() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/snapshot.go b/internal/service/rds/snapshot.go index b0da96b19bf7..43a4f3d81608 100644 --- a/internal/service/rds/snapshot.go +++ b/internal/service/rds/snapshot.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -131,8 +130,6 @@ func resourceSnapshot() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/snapshot_copy.go b/internal/service/rds/snapshot_copy.go index 649121e4af8e..06efc1476c39 100644 --- a/internal/service/rds/snapshot_copy.go +++ b/internal/service/rds/snapshot_copy.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -149,8 +148,6 @@ func resourceSnapshotCopy() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/rds/subnet_group.go b/internal/service/rds/subnet_group.go index 646add5ad814..d3c0f364e95a 100644 --- a/internal/service/rds/subnet_group.go +++ b/internal/service/rds/subnet_group.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -83,8 +82,6 @@ func resourceSubnetGroup() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From c2b5d988b2d4b6788bc938b818482c240a93ce21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:00 -0500 Subject: [PATCH 114/232] Remove transparent tagging-only CustomizeDiff - redshift. --- internal/service/redshift/cluster_snapshot.go | 2 -- internal/service/redshift/event_subscription.go | 2 -- internal/service/redshift/hsm_client_certificate.go | 3 --- internal/service/redshift/hsm_configuration.go | 3 --- internal/service/redshift/parameter_group.go | 3 --- internal/service/redshift/snapshot_copy_grant.go | 3 --- internal/service/redshift/snapshot_schedule.go | 3 --- internal/service/redshift/subnet_group.go | 3 --- internal/service/redshift/usage_limit.go | 3 --- 9 files changed, 25 deletions(-) diff --git a/internal/service/redshift/cluster_snapshot.go b/internal/service/redshift/cluster_snapshot.go index 3195fde0b9f3..16a9454cbdb2 100644 --- a/internal/service/redshift/cluster_snapshot.go +++ b/internal/service/redshift/cluster_snapshot.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -65,7 +64,6 @@ func resourceClusterSnapshot() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/event_subscription.go b/internal/service/redshift/event_subscription.go index c88a5d589d4e..b95326f0ad7a 100644 --- a/internal/service/redshift/event_subscription.go +++ b/internal/service/redshift/event_subscription.go @@ -110,8 +110,6 @@ func resourceEventSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/hsm_client_certificate.go b/internal/service/redshift/hsm_client_certificate.go index d364e85425be..0aee5eb96b5e 100644 --- a/internal/service/redshift/hsm_client_certificate.go +++ b/internal/service/redshift/hsm_client_certificate.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -53,8 +52,6 @@ func resourceHSMClientCertificate() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/hsm_configuration.go b/internal/service/redshift/hsm_configuration.go index bafc0808041c..fbeba068ad81 100644 --- a/internal/service/redshift/hsm_configuration.go +++ b/internal/service/redshift/hsm_configuration.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -75,8 +74,6 @@ func resourceHSMConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go index 0552e455d6da..6e15430681f8 100644 --- a/internal/service/redshift/parameter_group.go +++ b/internal/service/redshift/parameter_group.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -90,8 +89,6 @@ func resourceParameterGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/snapshot_copy_grant.go b/internal/service/redshift/snapshot_copy_grant.go index b94a9eb5730a..850bdb0e62e6 100644 --- a/internal/service/redshift/snapshot_copy_grant.go +++ b/internal/service/redshift/snapshot_copy_grant.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -57,8 +56,6 @@ func resourceSnapshotCopyGrant() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/snapshot_schedule.go b/internal/service/redshift/snapshot_schedule.go index 4d03689a737c..0d5e7c7c9c59 100644 --- a/internal/service/redshift/snapshot_schedule.go +++ b/internal/service/redshift/snapshot_schedule.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -75,8 +74,6 @@ func resourceSnapshotSchedule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go index d95746d3432e..b0d5ae56c206 100644 --- a/internal/service/redshift/subnet_group.go +++ b/internal/service/redshift/subnet_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -66,8 +65,6 @@ func resourceSubnetGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshift/usage_limit.go b/internal/service/redshift/usage_limit.go index 8fb6a135f1cd..5c8df5df9d26 100644 --- a/internal/service/redshift/usage_limit.go +++ b/internal/service/redshift/usage_limit.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -79,8 +78,6 @@ func resourceUsageLimit() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 9f889942c6d29108f6732ebcd29bb14c6242f529 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:01 -0500 Subject: [PATCH 115/232] Remove transparent tagging-only CustomizeDiff - redshiftserverless. --- internal/service/redshiftserverless/namespace.go | 2 -- internal/service/redshiftserverless/workgroup.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/internal/service/redshiftserverless/namespace.go b/internal/service/redshiftserverless/namespace.go index e63cfa6050f8..3f6df31cba1d 100644 --- a/internal/service/redshiftserverless/namespace.go +++ b/internal/service/redshiftserverless/namespace.go @@ -119,8 +119,6 @@ func resourceNamespace() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/redshiftserverless/workgroup.go b/internal/service/redshiftserverless/workgroup.go index 9ad73c680f18..56db593c81fd 100644 --- a/internal/service/redshiftserverless/workgroup.go +++ b/internal/service/redshiftserverless/workgroup.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -202,8 +201,6 @@ func resourceWorkgroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 3586bf1c73bf57772c2eaf75515ccabf697bc70e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:01 -0500 Subject: [PATCH 116/232] Remove transparent tagging-only CustomizeDiff - resourcegroups. --- internal/service/resourcegroups/group.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/resourcegroups/group.go b/internal/service/resourcegroups/group.go index 32d5c037d35a..26f7871d0190 100644 --- a/internal/service/resourcegroups/group.go +++ b/internal/service/resourcegroups/group.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -112,8 +111,6 @@ func resourceGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 1ff2596d335496dc2f3987dcd3c9f88b978fc61b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:01 -0500 Subject: [PATCH 117/232] Remove transparent tagging-only CustomizeDiff - rolesanywhere. --- internal/service/rolesanywhere/profile.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/rolesanywhere/profile.go b/internal/service/rolesanywhere/profile.go index f99726ca2845..dbd35ec18a8b 100644 --- a/internal/service/rolesanywhere/profile.go +++ b/internal/service/rolesanywhere/profile.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -78,7 +77,6 @@ func resourceProfile() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 1ec0af068f1028ddae3899188f04d2c1e9010db3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:01 -0500 Subject: [PATCH 118/232] Remove transparent tagging-only CustomizeDiff - route53. --- internal/service/route53/zone.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go index 617da5a3d6ae..df842be439f3 100644 --- a/internal/service/route53/zone.go +++ b/internal/service/route53/zone.go @@ -27,7 +27,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -115,8 +114,6 @@ func resourceZone() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From fa5c157154f0353096234e688061d596c6a6b5a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:01 -0500 Subject: [PATCH 119/232] Remove transparent tagging-only CustomizeDiff - route53domains. --- internal/service/route53domains/registered_domain.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/route53domains/registered_domain.go b/internal/service/route53domains/registered_domain.go index 8e0801e7dadc..ad8c2acba046 100644 --- a/internal/service/route53domains/registered_domain.go +++ b/internal/service/route53domains/registered_domain.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -257,8 +256,6 @@ func resourceRegisteredDomain() *schema.Resource { }, } }, - - CustomizeDiff: verify.SetTagsDiff, } } From 2497405ebfc9211a925a6ab6c8ca2d4ddec6c048 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 120/232] Remove transparent tagging-only CustomizeDiff - route53recoveryreadiness. --- internal/service/route53recoveryreadiness/cell.go | 3 --- internal/service/route53recoveryreadiness/readiness_check.go | 3 --- internal/service/route53recoveryreadiness/recovery_group.go | 3 --- internal/service/route53recoveryreadiness/resource_set.go | 3 --- 4 files changed, 12 deletions(-) diff --git a/internal/service/route53recoveryreadiness/cell.go b/internal/service/route53recoveryreadiness/cell.go index 5b9e5268f68c..22ecc23dbb49 100644 --- a/internal/service/route53recoveryreadiness/cell.go +++ b/internal/service/route53recoveryreadiness/cell.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -69,8 +68,6 @@ func resourceCell() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53recoveryreadiness/readiness_check.go b/internal/service/route53recoveryreadiness/readiness_check.go index 49ed204c82ba..2c9dcee33937 100644 --- a/internal/service/route53recoveryreadiness/readiness_check.go +++ b/internal/service/route53recoveryreadiness/readiness_check.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -57,8 +56,6 @@ func resourceReadinessCheck() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53recoveryreadiness/recovery_group.go b/internal/service/route53recoveryreadiness/recovery_group.go index ac4f1b2bb81e..54c1e4fd3f6e 100644 --- a/internal/service/route53recoveryreadiness/recovery_group.go +++ b/internal/service/route53recoveryreadiness/recovery_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -61,8 +60,6 @@ func resourceRecoveryGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53recoveryreadiness/resource_set.go b/internal/service/route53recoveryreadiness/resource_set.go index a7aca2b6479f..00b744fd0a82 100644 --- a/internal/service/route53recoveryreadiness/resource_set.go +++ b/internal/service/route53recoveryreadiness/resource_set.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -146,8 +145,6 @@ func resourceResourceSet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 6a8bb7ff255d54479d5c7303c77699a40429e4f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 121/232] Remove transparent tagging-only CustomizeDiff - route53resolver. --- internal/service/route53resolver/endpoint.go | 3 --- internal/service/route53resolver/firewall_domain_list.go | 3 --- internal/service/route53resolver/firewall_rule_group.go | 3 --- .../service/route53resolver/firewall_rule_group_association.go | 3 --- internal/service/route53resolver/query_log_config.go | 2 -- 5 files changed, 14 deletions(-) diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go index f9ecbc7cc8aa..275c756b3396 100644 --- a/internal/service/route53resolver/endpoint.go +++ b/internal/service/route53resolver/endpoint.go @@ -27,7 +27,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -129,8 +128,6 @@ func resourceEndpoint() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53resolver/firewall_domain_list.go b/internal/service/route53resolver/firewall_domain_list.go index 301b71108232..c2d7e79852ac 100644 --- a/internal/service/route53resolver/firewall_domain_list.go +++ b/internal/service/route53resolver/firewall_domain_list.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceFirewallDomainList() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53resolver/firewall_rule_group.go b/internal/service/route53resolver/firewall_rule_group.go index 54efd9785a6f..2a2a9e9d8203 100644 --- a/internal/service/route53resolver/firewall_rule_group.go +++ b/internal/service/route53resolver/firewall_rule_group.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -58,8 +57,6 @@ func resourceFirewallRuleGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53resolver/firewall_rule_group_association.go b/internal/service/route53resolver/firewall_rule_group_association.go index 65ff8a586ae5..e274075c76f3 100644 --- a/internal/service/route53resolver/firewall_rule_group_association.go +++ b/internal/service/route53resolver/firewall_rule_group_association.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,8 +71,6 @@ func resourceFirewallRuleGroupAssociation() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/route53resolver/query_log_config.go b/internal/service/route53resolver/query_log_config.go index fc9eeb5d2753..c26a30144330 100644 --- a/internal/service/route53resolver/query_log_config.go +++ b/internal/service/route53resolver/query_log_config.go @@ -66,8 +66,6 @@ func resourceQueryLogConfig() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From cfc3009d386fe7dcf8c9b0812f0678d2679ef792 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 122/232] Remove transparent tagging-only CustomizeDiff - rum. --- internal/service/rum/app_monitor.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/rum/app_monitor.go b/internal/service/rum/app_monitor.go index 5c03c3a0b019..d3c26fb92803 100644 --- a/internal/service/rum/app_monitor.go +++ b/internal/service/rum/app_monitor.go @@ -146,8 +146,6 @@ func resourceAppMonitor() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 4774d25c0f1b6a58d3472b620480c9d23f400ee7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 123/232] Remove transparent tagging-only CustomizeDiff - s3. --- internal/service/s3/bucket.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/s3/bucket.go b/internal/service/s3/bucket.go index 57a98962cc78..53f53b2057e3 100644 --- a/internal/service/s3/bucket.go +++ b/internal/service/s3/bucket.go @@ -702,8 +702,6 @@ func resourceBucket() *schema.Resource { Deprecated: "Use the aws_s3_bucket_website_configuration resource", }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 5eddb2fa01a7f7ef18799744961b16873924724a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 124/232] Remove transparent tagging-only CustomizeDiff - s3control. --- internal/service/s3control/bucket.go | 3 --- internal/service/s3control/storage_lens_configuration.go | 2 -- 2 files changed, 5 deletions(-) diff --git a/internal/service/s3control/bucket.go b/internal/service/s3control/bucket.go index 228da2a6a2b9..4bacc418a7db 100644 --- a/internal/service/s3control/bucket.go +++ b/internal/service/s3control/bucket.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -79,8 +78,6 @@ func resourceBucket() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/s3control/storage_lens_configuration.go b/internal/service/s3control/storage_lens_configuration.go index 7c6d919263fc..35d156b715cf 100644 --- a/internal/service/s3control/storage_lens_configuration.go +++ b/internal/service/s3control/storage_lens_configuration.go @@ -389,8 +389,6 @@ func resourceStorageLensConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 225b45969a015c254f14a2363091e76e639c9b94 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 125/232] Remove transparent tagging-only CustomizeDiff - sagemaker. --- internal/service/sagemaker/app.go | 2 -- internal/service/sagemaker/app_image_config.go | 2 -- internal/service/sagemaker/code_repository.go | 2 -- internal/service/sagemaker/data_quality_job_definition.go | 2 -- internal/service/sagemaker/device_fleet.go | 1 - internal/service/sagemaker/domain.go | 2 -- internal/service/sagemaker/endpoint.go | 3 --- internal/service/sagemaker/endpoint_configuration.go | 2 -- internal/service/sagemaker/feature_group.go | 2 -- internal/service/sagemaker/flow_definition.go | 2 -- internal/service/sagemaker/hub.go | 3 --- internal/service/sagemaker/human_task_ui.go | 2 -- internal/service/sagemaker/image.go | 2 -- internal/service/sagemaker/mlflow_tracking_server.go | 2 -- internal/service/sagemaker/model.go | 2 -- internal/service/sagemaker/model_package_group.go | 3 --- internal/service/sagemaker/monitoring_schedule.go | 2 -- internal/service/sagemaker/pipeline.go | 2 -- internal/service/sagemaker/project.go | 3 --- internal/service/sagemaker/space.go | 2 -- internal/service/sagemaker/studio_lifecycle_config.go | 3 --- internal/service/sagemaker/user_profile.go | 2 -- internal/service/sagemaker/workteam.go | 2 -- 23 files changed, 50 deletions(-) diff --git a/internal/service/sagemaker/app.go b/internal/service/sagemaker/app.go index 933aad90b4eb..077fbea752ac 100644 --- a/internal/service/sagemaker/app.go +++ b/internal/service/sagemaker/app.go @@ -117,8 +117,6 @@ func resourceApp() *schema.Resource { ExactlyOneOf: []string{"space_name", "user_profile_name"}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/app_image_config.go b/internal/service/sagemaker/app_image_config.go index 59b0e3063b96..e4f999798ece 100644 --- a/internal/service/sagemaker/app_image_config.go +++ b/internal/service/sagemaker/app_image_config.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -238,7 +237,6 @@ func resourceAppImageConfig() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/code_repository.go b/internal/service/sagemaker/code_repository.go index f388ed07c046..97360a210ac3 100644 --- a/internal/service/sagemaker/code_repository.go +++ b/internal/service/sagemaker/code_repository.go @@ -80,8 +80,6 @@ func resourceCodeRepository() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/data_quality_job_definition.go b/internal/service/sagemaker/data_quality_job_definition.go index 63fd274e59aa..168ce2eebc00 100644 --- a/internal/service/sagemaker/data_quality_job_definition.go +++ b/internal/service/sagemaker/data_quality_job_definition.go @@ -452,8 +452,6 @@ func resourceDataQualityJobDefinition() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/device_fleet.go b/internal/service/sagemaker/device_fleet.go index 7f897e2ffb97..96b9c8c6a58f 100644 --- a/internal/service/sagemaker/device_fleet.go +++ b/internal/service/sagemaker/device_fleet.go @@ -91,7 +91,6 @@ func resourceDeviceFleet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/domain.go b/internal/service/sagemaker/domain.go index 2358c25ca425..4f0a4c569725 100644 --- a/internal/service/sagemaker/domain.go +++ b/internal/service/sagemaker/domain.go @@ -1455,8 +1455,6 @@ func resourceDomain() *schema.Resource { Required: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/endpoint.go b/internal/service/sagemaker/endpoint.go index 614a365fd73d..3c02c1997c97 100644 --- a/internal/service/sagemaker/endpoint.go +++ b/internal/service/sagemaker/endpoint.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -234,8 +233,6 @@ func resourceEndpoint() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/endpoint_configuration.go b/internal/service/sagemaker/endpoint_configuration.go index 969a0045b351..ad5b1d9d148f 100644 --- a/internal/service/sagemaker/endpoint_configuration.go +++ b/internal/service/sagemaker/endpoint_configuration.go @@ -595,8 +595,6 @@ func resourceEndpointConfiguration() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/feature_group.go b/internal/service/sagemaker/feature_group.go index 98e9323339b9..8233589e01ff 100644 --- a/internal/service/sagemaker/feature_group.go +++ b/internal/service/sagemaker/feature_group.go @@ -310,8 +310,6 @@ func resourceFeatureGroup() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/flow_definition.go b/internal/service/sagemaker/flow_definition.go index 069350748c22..898b35f4eaf2 100644 --- a/internal/service/sagemaker/flow_definition.go +++ b/internal/service/sagemaker/flow_definition.go @@ -245,8 +245,6 @@ func resourceFlowDefinition() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/hub.go b/internal/service/sagemaker/hub.go index d95623ee2c31..d9bda260df67 100644 --- a/internal/service/sagemaker/hub.go +++ b/internal/service/sagemaker/hub.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -90,8 +89,6 @@ func resourceHub() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/human_task_ui.go b/internal/service/sagemaker/human_task_ui.go index 8259c3357b5b..e8fafc4f1091 100644 --- a/internal/service/sagemaker/human_task_ui.go +++ b/internal/service/sagemaker/human_task_ui.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -77,7 +76,6 @@ func resourceHumanTaskUI() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/image.go b/internal/service/sagemaker/image.go index 80a35a2b5638..4a16c718d6cb 100644 --- a/internal/service/sagemaker/image.go +++ b/internal/service/sagemaker/image.go @@ -71,8 +71,6 @@ func resourceImage() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/mlflow_tracking_server.go b/internal/service/sagemaker/mlflow_tracking_server.go index 9122d3f606f0..3c816b320556 100644 --- a/internal/service/sagemaker/mlflow_tracking_server.go +++ b/internal/service/sagemaker/mlflow_tracking_server.go @@ -85,8 +85,6 @@ func resourceMlflowTrackingServer() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/model.go b/internal/service/sagemaker/model.go index b4b18acb0ef0..5a1e23701c04 100644 --- a/internal/service/sagemaker/model.go +++ b/internal/service/sagemaker/model.go @@ -401,8 +401,6 @@ func resourceModel() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/model_package_group.go b/internal/service/sagemaker/model_package_group.go index ff0b28bc0bf4..18e66950bc3b 100644 --- a/internal/service/sagemaker/model_package_group.go +++ b/internal/service/sagemaker/model_package_group.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceModelPackageGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/monitoring_schedule.go b/internal/service/sagemaker/monitoring_schedule.go index 6e16e489bf27..60eff3b4e317 100644 --- a/internal/service/sagemaker/monitoring_schedule.go +++ b/internal/service/sagemaker/monitoring_schedule.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -91,7 +90,6 @@ func resourceMonitoringSchedule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/pipeline.go b/internal/service/sagemaker/pipeline.go index 0f9b5c7cc88d..c21ad15059b8 100644 --- a/internal/service/sagemaker/pipeline.go +++ b/internal/service/sagemaker/pipeline.go @@ -118,8 +118,6 @@ func resourcePipeline() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/project.go b/internal/service/sagemaker/project.go index 900bfe096610..700d2ae06ede 100644 --- a/internal/service/sagemaker/project.go +++ b/internal/service/sagemaker/project.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -104,8 +103,6 @@ func resourceProject() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/space.go b/internal/service/sagemaker/space.go index 4c8c4ea9d806..94c292bfc6fb 100644 --- a/internal/service/sagemaker/space.go +++ b/internal/service/sagemaker/space.go @@ -443,8 +443,6 @@ func resourceSpace() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/studio_lifecycle_config.go b/internal/service/sagemaker/studio_lifecycle_config.go index a4544fa021a4..4e6b2470a951 100644 --- a/internal/service/sagemaker/studio_lifecycle_config.go +++ b/internal/service/sagemaker/studio_lifecycle_config.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -66,8 +65,6 @@ func resourceStudioLifecycleConfig() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/user_profile.go b/internal/service/sagemaker/user_profile.go index 46a54e711100..2f1749f8e5d8 100644 --- a/internal/service/sagemaker/user_profile.go +++ b/internal/service/sagemaker/user_profile.go @@ -922,8 +922,6 @@ func resourceUserProfile() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sagemaker/workteam.go b/internal/service/sagemaker/workteam.go index cdfda85f0bcf..b82b90644597 100644 --- a/internal/service/sagemaker/workteam.go +++ b/internal/service/sagemaker/workteam.go @@ -179,8 +179,6 @@ func resourceWorkteam() *schema.Resource { ), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 87d38a020669127f512eff14464d8d99c80108d0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:02 -0500 Subject: [PATCH 126/232] Remove transparent tagging-only CustomizeDiff - scheduler. --- internal/service/scheduler/schedule_group.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/scheduler/schedule_group.go b/internal/service/scheduler/schedule_group.go index 7619733b405d..8ba0ef80bf47 100644 --- a/internal/service/scheduler/schedule_group.go +++ b/internal/service/scheduler/schedule_group.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -43,8 +42,6 @@ func ResourceScheduleGroup() *schema.Resource { Delete: schema.DefaultTimeout(5 * time.Minute), }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 0f2a2543fff56eb771ca012b1fac5045951e11c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 127/232] Remove transparent tagging-only CustomizeDiff - schemas. --- internal/service/schemas/discoverer.go | 2 -- internal/service/schemas/registry.go | 3 --- internal/service/schemas/schema.go | 2 -- 3 files changed, 7 deletions(-) diff --git a/internal/service/schemas/discoverer.go b/internal/service/schemas/discoverer.go index aade8beabd35..e4846e9e5996 100644 --- a/internal/service/schemas/discoverer.go +++ b/internal/service/schemas/discoverer.go @@ -55,8 +55,6 @@ func resourceDiscoverer() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/schemas/registry.go b/internal/service/schemas/registry.go index 1f46035796e4..4b5e2cc2aa88 100644 --- a/internal/service/schemas/registry.go +++ b/internal/service/schemas/registry.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,8 +58,6 @@ func resourceRegistry() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/schemas/schema.go b/internal/service/schemas/schema.go index 8c44d55ff42a..39b1175287cb 100644 --- a/internal/service/schemas/schema.go +++ b/internal/service/schemas/schema.go @@ -90,8 +90,6 @@ func resourceSchema() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From ac2c78056ac01389eac4ceecbf09ce9ac0ef8fd3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 128/232] Remove transparent tagging-only CustomizeDiff - secretsmanager. --- internal/service/secretsmanager/secret.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 2e52699db288..49af1cb9f4d0 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -150,8 +150,6 @@ func resourceSecret() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 8ce5756b288890e805eed9a3b6716256613bd332 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 129/232] Remove transparent tagging-only CustomizeDiff - serverlessrepo. --- internal/service/serverlessrepo/cloudformation_stack.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/serverlessrepo/cloudformation_stack.go b/internal/service/serverlessrepo/cloudformation_stack.go index 2378984f583a..b2e11aecb73a 100644 --- a/internal/service/serverlessrepo/cloudformation_stack.go +++ b/internal/service/serverlessrepo/cloudformation_stack.go @@ -95,8 +95,6 @@ func ResourceCloudFormationStack() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From c4f4f2cbaa181d257b8a86b2562ecfc57cd04c84 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 130/232] Remove transparent tagging-only CustomizeDiff - servicecatalog. --- internal/service/servicecatalog/portfolio.go | 3 --- internal/service/servicecatalog/product.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/internal/service/servicecatalog/portfolio.go b/internal/service/servicecatalog/portfolio.go index c49e64c3d13d..74c8ab862773 100644 --- a/internal/service/servicecatalog/portfolio.go +++ b/internal/service/servicecatalog/portfolio.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -75,8 +74,6 @@ func resourcePortfolio() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } func resourcePortfolioCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { diff --git a/internal/service/servicecatalog/product.go b/internal/service/servicecatalog/product.go index 62da895f2cda..b2dc390d6dbe 100644 --- a/internal/service/servicecatalog/product.go +++ b/internal/service/servicecatalog/product.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -162,8 +161,6 @@ func resourceProduct() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.ProductType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From 336966b47cf3a64ea25a99413cb1e6d856bd6b55 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 131/232] Remove transparent tagging-only CustomizeDiff - servicediscovery. --- internal/service/servicediscovery/http_namespace.go | 3 --- internal/service/servicediscovery/private_dns_namespace.go | 3 --- internal/service/servicediscovery/public_dns_namespace.go | 3 --- internal/service/servicediscovery/service.go | 3 --- 4 files changed, 12 deletions(-) diff --git a/internal/service/servicediscovery/http_namespace.go b/internal/service/servicediscovery/http_namespace.go index 7600d34c3ce0..91be6b76af40 100644 --- a/internal/service/servicediscovery/http_namespace.go +++ b/internal/service/servicediscovery/http_namespace.go @@ -22,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -62,8 +61,6 @@ func resourceHTTPNamespace() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/servicediscovery/private_dns_namespace.go b/internal/service/servicediscovery/private_dns_namespace.go index 625d1ffdbfb4..fbc0ea62799a 100644 --- a/internal/service/servicediscovery/private_dns_namespace.go +++ b/internal/service/servicediscovery/private_dns_namespace.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,8 +71,6 @@ func resourcePrivateDNSNamespace() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/servicediscovery/public_dns_namespace.go b/internal/service/servicediscovery/public_dns_namespace.go index 1e622a09a364..b086e9a7012e 100644 --- a/internal/service/servicediscovery/public_dns_namespace.go +++ b/internal/service/servicediscovery/public_dns_namespace.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -57,8 +56,6 @@ func resourcePublicDNSNamespace() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/servicediscovery/service.go b/internal/service/servicediscovery/service.go index 358da2b985e0..a2ce7e310af4 100644 --- a/internal/service/servicediscovery/service.go +++ b/internal/service/servicediscovery/service.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -152,8 +151,6 @@ func resourceService() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.ServiceTypeOption](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From a083909407390095c638df061b8c97e4a5cca2c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:03 -0500 Subject: [PATCH 132/232] Remove transparent tagging-only CustomizeDiff - sesv2. --- internal/service/sesv2/configuration_set.go | 3 --- internal/service/sesv2/contact_list.go | 3 --- internal/service/sesv2/dedicated_ip_pool.go | 3 --- internal/service/sesv2/email_identity.go | 2 -- 4 files changed, 11 deletions(-) diff --git a/internal/service/sesv2/configuration_set.go b/internal/service/sesv2/configuration_set.go index 48f5c8c0261f..9cdb55bae208 100644 --- a/internal/service/sesv2/configuration_set.go +++ b/internal/service/sesv2/configuration_set.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -185,8 +184,6 @@ func resourceConfigurationSet() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sesv2/contact_list.go b/internal/service/sesv2/contact_list.go index 719becc6ce82..4745ebe20a8d 100644 --- a/internal/service/sesv2/contact_list.go +++ b/internal/service/sesv2/contact_list.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -91,8 +90,6 @@ func resourceContactList() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sesv2/dedicated_ip_pool.go b/internal/service/sesv2/dedicated_ip_pool.go index d14c718d416f..08e8cafd1ee9 100644 --- a/internal/service/sesv2/dedicated_ip_pool.go +++ b/internal/service/sesv2/dedicated_ip_pool.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -58,8 +57,6 @@ func resourceDedicatedIPPool() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/sesv2/email_identity.go b/internal/service/sesv2/email_identity.go index 08a374bd9465..e8344c30de00 100644 --- a/internal/service/sesv2/email_identity.go +++ b/internal/service/sesv2/email_identity.go @@ -120,8 +120,6 @@ func resourceEmailIdentity() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From f61dcde53614ed1e2db5e231ecaec9c1ba47f1f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 133/232] Remove transparent tagging-only CustomizeDiff - sfn. --- internal/service/sfn/activity.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/sfn/activity.go b/internal/service/sfn/activity.go index 0f453eb1f859..ee8ce1075f29 100644 --- a/internal/service/sfn/activity.go +++ b/internal/service/sfn/activity.go @@ -77,8 +77,6 @@ func resourceActivity() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 35605cf196033c7edf71a17837bd4f843b171285 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 134/232] Remove transparent tagging-only CustomizeDiff - shield. --- internal/service/shield/protection.go | 2 -- internal/service/shield/protection_group.go | 1 - 2 files changed, 3 deletions(-) diff --git a/internal/service/shield/protection.go b/internal/service/shield/protection.go index 1748fd63301b..5bfe97ae3e02 100644 --- a/internal/service/shield/protection.go +++ b/internal/service/shield/protection.go @@ -54,8 +54,6 @@ func resourceProtection() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/shield/protection_group.go b/internal/service/shield/protection_group.go index ea63e4f8d22c..96a9182fe6b7 100644 --- a/internal/service/shield/protection_group.go +++ b/internal/service/shield/protection_group.go @@ -80,7 +80,6 @@ func ResourceProtectionGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, } } From 996f818f4ea7b2cdf9b895e2e952ba66fd34b242 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 135/232] Remove transparent tagging-only CustomizeDiff - signer. --- internal/service/signer/signing_profile.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/signer/signing_profile.go b/internal/service/signer/signing_profile.go index 2c295d53ef44..05e883f2bf5e 100644 --- a/internal/service/signer/signing_profile.go +++ b/internal/service/signer/signing_profile.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -144,8 +143,6 @@ func ResourceSigningProfile() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From cb4ddf8d5feb9289eb0c805b6a15d2d843ab6ed1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 136/232] Remove transparent tagging-only CustomizeDiff - ssm. --- internal/service/ssm/activation.go | 3 --- internal/service/ssm/association.go | 3 --- internal/service/ssm/maintenance_window.go | 3 --- 3 files changed, 9 deletions(-) diff --git a/internal/service/ssm/activation.go b/internal/service/ssm/activation.go index af3ee4fa8643..a6458815b485 100644 --- a/internal/service/ssm/activation.go +++ b/internal/service/ssm/activation.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,8 +81,6 @@ func resourceActivation() *schema.Resource { names.AttrTags: tftags.TagsSchemaForceNew(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ssm/association.go b/internal/service/ssm/association.go index 7a5f7acff183..7940ebde1aeb 100644 --- a/internal/service/ssm/association.go +++ b/internal/service/ssm/association.go @@ -26,7 +26,6 @@ import ( tfmaps "github.com/hashicorp/terraform-provider-aws/internal/maps" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -174,8 +173,6 @@ func resourceAssociation() *schema.Resource { Optional: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ssm/maintenance_window.go b/internal/service/ssm/maintenance_window.go index 1cfd4891013e..17486e2aad95 100644 --- a/internal/service/ssm/maintenance_window.go +++ b/internal/service/ssm/maintenance_window.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -88,8 +87,6 @@ func resourceMaintenanceWindow() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 8fffe7b20ee4da745f5370623ec47cafb4cbe43e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 137/232] Remove transparent tagging-only CustomizeDiff - ssmcontacts. --- internal/service/ssmcontacts/contact.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/ssmcontacts/contact.go b/internal/service/ssmcontacts/contact.go index b604a87d6cdd..2bcb88832d96 100644 --- a/internal/service/ssmcontacts/contact.go +++ b/internal/service/ssmcontacts/contact.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -58,8 +57,6 @@ func ResourceContact() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 047a3469c0a379b013f14884dbf687bf2db56021 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:04 -0500 Subject: [PATCH 138/232] Remove transparent tagging-only CustomizeDiff - ssmincidents. --- internal/service/ssmincidents/replication_set.go | 3 --- internal/service/ssmincidents/response_plan.go | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/service/ssmincidents/replication_set.go b/internal/service/ssmincidents/replication_set.go index f09b48239ca5..e0018c0cbafc 100644 --- a/internal/service/ssmincidents/replication_set.go +++ b/internal/service/ssmincidents/replication_set.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -100,8 +99,6 @@ func ResourceReplicationSet() *schema.Resource { Importer: &schema.ResourceImporter{ StateContext: resourceReplicationSetImport, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/ssmincidents/response_plan.go b/internal/service/ssmincidents/response_plan.go index 442315e75631..619c83af4e8d 100644 --- a/internal/service/ssmincidents/response_plan.go +++ b/internal/service/ssmincidents/response_plan.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -186,7 +185,7 @@ func ResourceResponsePlan() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: verify.SetTagsDiff, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, From f45b3341c952826b195fda52ae653b844a110db5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:05 -0500 Subject: [PATCH 139/232] Remove transparent tagging-only CustomizeDiff - ssoadmin. --- internal/service/ssoadmin/permission_set.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/ssoadmin/permission_set.go b/internal/service/ssoadmin/permission_set.go index 1428dbb22aff..ccbe0506595c 100644 --- a/internal/service/ssoadmin/permission_set.go +++ b/internal/service/ssoadmin/permission_set.go @@ -95,8 +95,6 @@ func ResourcePermissionSet() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 0fbd1f42933c3e577bcbe46e228bd4c50e59698e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:05 -0500 Subject: [PATCH 140/232] Remove transparent tagging-only CustomizeDiff - storagegateway. --- internal/service/storagegateway/cached_iscsi_volume.go | 2 -- internal/service/storagegateway/nfs_file_share.go | 2 -- internal/service/storagegateway/smb_file_share.go | 2 -- internal/service/storagegateway/stored_iscsi_volume.go | 2 -- internal/service/storagegateway/tape_pool.go | 3 --- 5 files changed, 11 deletions(-) diff --git a/internal/service/storagegateway/cached_iscsi_volume.go b/internal/service/storagegateway/cached_iscsi_volume.go index 7dcfedec715b..6a001ebcd971 100644 --- a/internal/service/storagegateway/cached_iscsi_volume.go +++ b/internal/service/storagegateway/cached_iscsi_volume.go @@ -116,8 +116,6 @@ func resourceCachediSCSIVolume() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/storagegateway/nfs_file_share.go b/internal/service/storagegateway/nfs_file_share.go index 864519d2c8b6..6c1b158b80a0 100644 --- a/internal/service/storagegateway/nfs_file_share.go +++ b/internal/service/storagegateway/nfs_file_share.go @@ -215,8 +215,6 @@ func resourceNFSFileShare() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/storagegateway/smb_file_share.go b/internal/service/storagegateway/smb_file_share.go index 6a2ee5cc6f9d..1a7df406e4f0 100644 --- a/internal/service/storagegateway/smb_file_share.go +++ b/internal/service/storagegateway/smb_file_share.go @@ -206,8 +206,6 @@ func resourceSMBFileShare() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/storagegateway/stored_iscsi_volume.go b/internal/service/storagegateway/stored_iscsi_volume.go index 5c9d1e607e67..b85c7f49a7eb 100644 --- a/internal/service/storagegateway/stored_iscsi_volume.go +++ b/internal/service/storagegateway/stored_iscsi_volume.go @@ -123,8 +123,6 @@ func resourceStorediSCSIVolume() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/storagegateway/tape_pool.go b/internal/service/storagegateway/tape_pool.go index 3c06d4489e7b..eda0b135e467 100644 --- a/internal/service/storagegateway/tape_pool.go +++ b/internal/service/storagegateway/tape_pool.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -70,8 +69,6 @@ func resourceTapePool() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From a8beb1130f41453ca3fc5cbcccd8098491a4fe5b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:05 -0500 Subject: [PATCH 141/232] Remove transparent tagging-only CustomizeDiff - swf. --- internal/service/swf/domain.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/swf/domain.go b/internal/service/swf/domain.go index d98f48528480..6f2c5a4cabff 100644 --- a/internal/service/swf/domain.go +++ b/internal/service/swf/domain.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -78,8 +77,6 @@ func resourceDomain() *schema.Resource { }, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From c218427ef65ded64fd819dcc5715baefc2a67e6b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:05 -0500 Subject: [PATCH 142/232] Remove transparent tagging-only CustomizeDiff - synthetics. --- internal/service/synthetics/canary.go | 2 -- internal/service/synthetics/group.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index e015574319c1..ee665a7b77ac 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -266,8 +266,6 @@ func ResourceCanary() *schema.Resource { ConflictsWith: []string{names.AttrS3Bucket, "s3_key", "s3_version"}, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/synthetics/group.go b/internal/service/synthetics/group.go index 31e8cfb1d29b..4e4a7790087a 100644 --- a/internal/service/synthetics/group.go +++ b/internal/service/synthetics/group.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -51,8 +50,6 @@ func ResourceGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 8d0f53b2b12b42d9125804f04a98dcb71042586c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 143/232] Remove transparent tagging-only CustomizeDiff - timestreamwrite. --- internal/service/timestreamwrite/database.go | 2 -- internal/service/timestreamwrite/table.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/timestreamwrite/database.go b/internal/service/timestreamwrite/database.go index ba8c2bbeedd2..26b3ba193683 100644 --- a/internal/service/timestreamwrite/database.go +++ b/internal/service/timestreamwrite/database.go @@ -68,8 +68,6 @@ func resourceDatabase() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/timestreamwrite/table.go b/internal/service/timestreamwrite/table.go index fed164e0c6ab..aaa2687e255c 100644 --- a/internal/service/timestreamwrite/table.go +++ b/internal/service/timestreamwrite/table.go @@ -175,8 +175,6 @@ func resourceTable() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From f299db3dff0bb019bf33f02debb235579d9dc525 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 144/232] Remove transparent tagging-only CustomizeDiff - transcribe. --- internal/service/transcribe/language_model.go | 2 -- internal/service/transcribe/medical_vocabulary.go | 3 --- internal/service/transcribe/vocabulary.go | 3 --- 3 files changed, 8 deletions(-) diff --git a/internal/service/transcribe/language_model.go b/internal/service/transcribe/language_model.go index eb17d36c8861..50af3b5747e6 100644 --- a/internal/service/transcribe/language_model.go +++ b/internal/service/transcribe/language_model.go @@ -97,8 +97,6 @@ func ResourceLanguageModel() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transcribe/medical_vocabulary.go b/internal/service/transcribe/medical_vocabulary.go index 4052d0ea8119..ca9e324f86c5 100644 --- a/internal/service/transcribe/medical_vocabulary.go +++ b/internal/service/transcribe/medical_vocabulary.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -74,8 +73,6 @@ func ResourceMedicalVocabulary() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transcribe/vocabulary.go b/internal/service/transcribe/vocabulary.go index ef0086856f87..1a06d974f40a 100644 --- a/internal/service/transcribe/vocabulary.go +++ b/internal/service/transcribe/vocabulary.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -83,8 +82,6 @@ func ResourceVocabulary() *schema.Resource { ValidateFunc: validation.StringLenBetween(1, 200), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } From adda44ada87fb8d8332ec73af3cb5d743b2f77a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 145/232] Remove transparent tagging-only CustomizeDiff - transfer. --- internal/service/transfer/agreement.go | 2 -- internal/service/transfer/certificate.go | 3 --- internal/service/transfer/connector.go | 3 --- internal/service/transfer/profile.go | 3 --- internal/service/transfer/user.go | 2 -- internal/service/transfer/workflow.go | 2 -- 6 files changed, 15 deletions(-) diff --git a/internal/service/transfer/agreement.go b/internal/service/transfer/agreement.go index 988fb02d2360..02be781724de 100644 --- a/internal/service/transfer/agreement.go +++ b/internal/service/transfer/agreement.go @@ -78,8 +78,6 @@ func resourceAgreement() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transfer/certificate.go b/internal/service/transfer/certificate.go index a2ef5e042c4a..012559c55c76 100644 --- a/internal/service/transfer/certificate.go +++ b/internal/service/transfer/certificate.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -91,8 +90,6 @@ func resourceCertificate() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.CertificateUsageType](), }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transfer/connector.go b/internal/service/transfer/connector.go index 323fb30bfe49..834fab9eff75 100644 --- a/internal/service/transfer/connector.go +++ b/internal/service/transfer/connector.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -142,8 +141,6 @@ func resourceConnector() *schema.Resource { Required: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transfer/profile.go b/internal/service/transfer/profile.go index 22dae7757b50..8dd2b7a70541 100644 --- a/internal/service/transfer/profile.go +++ b/internal/service/transfer/profile.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -65,8 +64,6 @@ func resourceProfile() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transfer/user.go b/internal/service/transfer/user.go index c16e60d8b997..c30681920edf 100644 --- a/internal/service/transfer/user.go +++ b/internal/service/transfer/user.go @@ -133,8 +133,6 @@ func resourceUser() *schema.Resource { ValidateFunc: validUserName, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/transfer/workflow.go b/internal/service/transfer/workflow.go index 5f90ec778104..68d461b7389c 100644 --- a/internal/service/transfer/workflow.go +++ b/internal/service/transfer/workflow.go @@ -38,8 +38,6 @@ func resourceWorkflow() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 02483418a102001d359bcd0b8551611cb311c8c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 146/232] Remove transparent tagging-only CustomizeDiff - vpclattice. --- internal/service/vpclattice/access_log_subscription.go | 2 -- internal/service/vpclattice/listener.go | 3 --- internal/service/vpclattice/service.go | 2 -- internal/service/vpclattice/service_network.go | 3 --- .../service/vpclattice/service_network_service_association.go | 3 --- internal/service/vpclattice/service_network_vpc_association.go | 3 --- internal/service/vpclattice/target_group.go | 2 -- 7 files changed, 18 deletions(-) diff --git a/internal/service/vpclattice/access_log_subscription.go b/internal/service/vpclattice/access_log_subscription.go index c16344f104fc..b2801d1835b8 100644 --- a/internal/service/vpclattice/access_log_subscription.go +++ b/internal/service/vpclattice/access_log_subscription.go @@ -63,8 +63,6 @@ func resourceAccessLogSubscription() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/listener.go b/internal/service/vpclattice/listener.go index 697f88ca205a..48457f9950ae 100644 --- a/internal/service/vpclattice/listener.go +++ b/internal/service/vpclattice/listener.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -158,8 +157,6 @@ func resourceListener() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/service.go b/internal/service/vpclattice/service.go index 66eeeedbdf79..c181f16f469d 100644 --- a/internal/service/vpclattice/service.go +++ b/internal/service/vpclattice/service.go @@ -99,8 +99,6 @@ func resourceService() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/service_network.go b/internal/service/vpclattice/service_network.go index 12eff765febc..93de0ee1a5ad 100644 --- a/internal/service/vpclattice/service_network.go +++ b/internal/service/vpclattice/service_network.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -60,8 +59,6 @@ func resourceServiceNetwork() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/service_network_service_association.go b/internal/service/vpclattice/service_network_service_association.go index 0f93520b739d..844de8fd7b76 100644 --- a/internal/service/vpclattice/service_network_service_association.go +++ b/internal/service/vpclattice/service_network_service_association.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -95,8 +94,6 @@ func resourceServiceNetworkServiceAssociation() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/service_network_vpc_association.go b/internal/service/vpclattice/service_network_vpc_association.go index 903b95916fc7..92de808b79d0 100644 --- a/internal/service/vpclattice/service_network_vpc_association.go +++ b/internal/service/vpclattice/service_network_vpc_association.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -80,8 +79,6 @@ func resourceServiceNetworkVPCAssociation() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/vpclattice/target_group.go b/internal/service/vpclattice/target_group.go index 6f340ab4cd89..70bfebf9419b 100644 --- a/internal/service/vpclattice/target_group.go +++ b/internal/service/vpclattice/target_group.go @@ -204,8 +204,6 @@ func ResourceTargetGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From b39f82564276ba6f1585b03370eec5dd5bdf3937 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 147/232] Remove transparent tagging-only CustomizeDiff - waf. --- internal/service/waf/rate_based_rule.go | 3 --- internal/service/waf/rule.go | 3 --- internal/service/waf/rule_group.go | 3 --- internal/service/waf/web_acl.go | 3 --- 4 files changed, 12 deletions(-) diff --git a/internal/service/waf/rate_based_rule.go b/internal/service/waf/rate_based_rule.go index 86e2deb6bd83..a1054e029ee3 100644 --- a/internal/service/waf/rate_based_rule.go +++ b/internal/service/waf/rate_based_rule.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -89,8 +88,6 @@ func resourceRateBasedRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/waf/rule.go b/internal/service/waf/rule.go index 692fd70b46ce..37f90d93ad7a 100644 --- a/internal/service/waf/rule.go +++ b/internal/service/waf/rule.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -82,8 +81,6 @@ func resourceRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/waf/rule_group.go b/internal/service/waf/rule_group.go index 7988bbca0e06..ff61105d5fb8 100644 --- a/internal/service/waf/rule_group.go +++ b/internal/service/waf/rule_group.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -90,8 +89,6 @@ func resourceRuleGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/waf/web_acl.go b/internal/service/waf/web_acl.go index f178fc71ac56..8467d3bff63d 100644 --- a/internal/service/waf/web_acl.go +++ b/internal/service/waf/web_acl.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -157,8 +156,6 @@ func resourceWebACL() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 48b3f8f47988f2ccc50060ca60164c4e779d47e0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 148/232] Remove transparent tagging-only CustomizeDiff - wafregional. --- internal/service/wafregional/rate_based_rule.go | 3 --- internal/service/wafregional/rule.go | 3 --- internal/service/wafregional/rule_group.go | 3 --- internal/service/wafregional/web_acl.go | 2 -- 4 files changed, 11 deletions(-) diff --git a/internal/service/wafregional/rate_based_rule.go b/internal/service/wafregional/rate_based_rule.go index 457f325d7142..cadd1c246366 100644 --- a/internal/service/wafregional/rate_based_rule.go +++ b/internal/service/wafregional/rate_based_rule.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -89,8 +88,6 @@ func resourceRateBasedRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafregional/rule.go b/internal/service/wafregional/rule.go index 782fb39b6c66..e4ed9c377d5f 100644 --- a/internal/service/wafregional/rule.go +++ b/internal/service/wafregional/rule.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -79,8 +78,6 @@ func resourceRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafregional/rule_group.go b/internal/service/wafregional/rule_group.go index 9a004bcdc183..9db4000e587c 100644 --- a/internal/service/wafregional/rule_group.go +++ b/internal/service/wafregional/rule_group.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -90,8 +89,6 @@ func resourceRuleGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafregional/web_acl.go b/internal/service/wafregional/web_acl.go index 3db76af7cb2d..6e1cc9c8622e 100644 --- a/internal/service/wafregional/web_acl.go +++ b/internal/service/wafregional/web_acl.go @@ -159,8 +159,6 @@ func resourceWebACL() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } From 9d6648bf4e16475949de54032114561f49f084b6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 149/232] Remove transparent tagging-only CustomizeDiff - wafv2. --- internal/service/wafv2/ip_set.go | 3 --- internal/service/wafv2/regex_pattern_set.go | 3 --- internal/service/wafv2/rule_group.go | 3 --- internal/service/wafv2/web_acl.go | 2 -- 4 files changed, 11 deletions(-) diff --git a/internal/service/wafv2/ip_set.go b/internal/service/wafv2/ip_set.go index 6ffc773c6a89..792356b40fec 100644 --- a/internal/service/wafv2/ip_set.go +++ b/internal/service/wafv2/ip_set.go @@ -25,7 +25,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -120,8 +119,6 @@ func resourceIPSet() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafv2/regex_pattern_set.go b/internal/service/wafv2/regex_pattern_set.go index e6a050d51ea2..23adf4b83343 100644 --- a/internal/service/wafv2/regex_pattern_set.go +++ b/internal/service/wafv2/regex_pattern_set.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -100,8 +99,6 @@ func resourceRegexPatternSet() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafv2/rule_group.go b/internal/service/wafv2/rule_group.go index 1fd056a9e487..3556b5d2ac53 100644 --- a/internal/service/wafv2/rule_group.go +++ b/internal/service/wafv2/rule_group.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -145,8 +144,6 @@ func resourceRuleGroup() *schema.Resource { "visibility_config": visibilityConfigSchema(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/wafv2/web_acl.go b/internal/service/wafv2/web_acl.go index 0979a216d9d5..e35b32c9c847 100644 --- a/internal/service/wafv2/web_acl.go +++ b/internal/service/wafv2/web_acl.go @@ -182,8 +182,6 @@ func resourceWebACL() *schema.Resource { "visibility_config": visibilityConfigSchema(), } }, - - CustomizeDiff: verify.SetTagsDiff, } } From 7032841aac4622f4303ba8e3bbb27492244f0355 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:06 -0500 Subject: [PATCH 150/232] Remove transparent tagging-only CustomizeDiff - workspaces. --- internal/service/workspaces/directory.go | 3 --- internal/service/workspaces/ip_group.go | 3 --- internal/service/workspaces/workspace.go | 3 --- 3 files changed, 9 deletions(-) diff --git a/internal/service/workspaces/directory.go b/internal/service/workspaces/directory.go index 588ae5cdb0e8..cb39da91a345 100644 --- a/internal/service/workspaces/directory.go +++ b/internal/service/workspaces/directory.go @@ -23,7 +23,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -238,8 +237,6 @@ func resourceDirectory() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/workspaces/ip_group.go b/internal/service/workspaces/ip_group.go index 8c717a1c7dd7..1187e77ffcdd 100644 --- a/internal/service/workspaces/ip_group.go +++ b/internal/service/workspaces/ip_group.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -66,8 +65,6 @@ func resourceIPGroup() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: verify.SetTagsDiff, } } diff --git a/internal/service/workspaces/workspace.go b/internal/service/workspaces/workspace.go index bfec6562c35f..416476e8d322 100644 --- a/internal/service/workspaces/workspace.go +++ b/internal/service/workspaces/workspace.go @@ -23,7 +23,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -150,8 +149,6 @@ func resourceWorkspace() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), }, - - CustomizeDiff: verify.SetTagsDiff, } } From cdbc848533a48d6d0502677c48c0a5c47a82a81c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 13:59:07 -0500 Subject: [PATCH 151/232] Remove transparent tagging-only CustomizeDiff - xray. --- internal/service/xray/group.go | 3 --- internal/service/xray/sampling_rule.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/internal/service/xray/group.go b/internal/service/xray/group.go index e02ae5aec3aa..54fbe03b9bdf 100644 --- a/internal/service/xray/group.go +++ b/internal/service/xray/group.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,8 +35,6 @@ func resourceGroup() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/xray/sampling_rule.go b/internal/service/xray/sampling_rule.go index 1dda90691707..4f4ed1e09379 100644 --- a/internal/service/xray/sampling_rule.go +++ b/internal/service/xray/sampling_rule.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,8 +37,6 @@ func resourceSamplingRule() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: verify.SetTagsDiff, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 7bfa23998a8fd3d4affcf84c5c767d6c21399feb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:35 -0500 Subject: [PATCH 152/232] Remove transparent tagging-only CustomizeDiff - dynamodb. --- internal/service/dynamodb/table_replica.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/internal/service/dynamodb/table_replica.go b/internal/service/dynamodb/table_replica.go index 5d866e5b13f4..b73231f39dd2 100644 --- a/internal/service/dynamodb/table_replica.go +++ b/internal/service/dynamodb/table_replica.go @@ -17,7 +17,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -57,10 +56,6 @@ func resourceTableReplica() *schema.Resource { Update: schema.DefaultTimeout(20 * time.Minute), }, - CustomizeDiff: customdiff.All( - verify.SetTagsDiff, - ), - Schema: map[string]*schema.Schema{ names.AttrARN: { // direct to replica Type: schema.TypeString, From d6a2c970d92df4a37a4b7056dda68a935d1c848a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:35 -0500 Subject: [PATCH 153/232] Remove transparent tagging-only CustomizeDiff - ec2. --- internal/service/ec2/ec2_spot_instance_request.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index 1f9cf11ea092..8e41ecd79936 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -23,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -141,10 +139,6 @@ func resourceSpotInstanceRequest() *schema.Resource { return s }(), - - CustomizeDiff: customdiff.All( - verify.SetTagsDiff, - ), } } From 5f4e027b0fb44d6fe8f6ebef5b1cf775bd7cd50f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:36 -0500 Subject: [PATCH 154/232] Remove transparent tagging-only CustomizeDiff - elbv2. --- internal/service/elbv2/trust_store.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/internal/service/elbv2/trust_store.go b/internal/service/elbv2/trust_store.go index 6125e4d6e997..2c7159b1b505 100644 --- a/internal/service/elbv2/trust_store.go +++ b/internal/service/elbv2/trust_store.go @@ -13,7 +13,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -24,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -48,10 +46,6 @@ func resourceTrustStore() *schema.Resource { Delete: schema.DefaultTimeout(2 * time.Minute), }, - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, From 297f2323c9fe425e0383394bcd5a740a8bf06a60 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:37 -0500 Subject: [PATCH 155/232] Remove transparent tagging-only CustomizeDiff - fsx. --- internal/service/fsx/backup.go | 6 ------ internal/service/fsx/data_repository_association.go | 5 ----- internal/service/fsx/openzfs_snapshot.go | 6 ------ 3 files changed, 17 deletions(-) diff --git a/internal/service/fsx/backup.go b/internal/service/fsx/backup.go index 5741794bc63e..92b6888f1758 100644 --- a/internal/service/fsx/backup.go +++ b/internal/service/fsx/backup.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/fsx" awstypes "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -23,7 +22,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -75,10 +73,6 @@ func resourceBackup() *schema.Resource { ForceNew: true, }, }, - - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), } } diff --git a/internal/service/fsx/data_repository_association.go b/internal/service/fsx/data_repository_association.go index 3ad97e9a96ad..c8aab7e04548 100644 --- a/internal/service/fsx/data_repository_association.go +++ b/internal/service/fsx/data_repository_association.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/fsx" awstypes "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -156,10 +155,6 @@ func resourceDataRepositoryAssociation() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), } } diff --git a/internal/service/fsx/openzfs_snapshot.go b/internal/service/fsx/openzfs_snapshot.go index 68f9047eeb4e..69084a6a80c8 100644 --- a/internal/service/fsx/openzfs_snapshot.go +++ b/internal/service/fsx/openzfs_snapshot.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/fsx" awstypes "github.com/aws/aws-sdk-go-v2/service/fsx/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -25,7 +24,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,10 +70,6 @@ func resourceOpenZFSSnapshot() *schema.Resource { ValidateFunc: validation.StringLenBetween(23, 23), }, }, - - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), } } From 946d09b24927cdea21742ce4d855dc772b3709c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:41 -0500 Subject: [PATCH 156/232] Remove transparent tagging-only CustomizeDiff - lambda. --- internal/service/lambda/code_signing_config.go | 5 ----- internal/service/lambda/event_source_mapping.go | 5 ----- 2 files changed, 10 deletions(-) diff --git a/internal/service/lambda/code_signing_config.go b/internal/service/lambda/code_signing_config.go index 5f4b1af35202..a8727a7b1139 100644 --- a/internal/service/lambda/code_signing_config.go +++ b/internal/service/lambda/code_signing_config.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lambda" awstypes "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -95,10 +94,6 @@ func resourceCodeSigningConfig() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), } } diff --git a/internal/service/lambda/event_source_mapping.go b/internal/service/lambda/event_source_mapping.go index 83590022317f..91cf7d9e1517 100644 --- a/internal/service/lambda/event_source_mapping.go +++ b/internal/service/lambda/event_source_mapping.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lambda" awstypes "github.com/aws/aws-sdk-go-v2/service/lambda/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -415,10 +414,6 @@ func resourceEventSourceMapping() *schema.Resource { Computed: true, }, }, - - CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, - ), } } From aa4aecc93c7a377fcff474641d7ba8c652f0ad6b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:09:52 -0500 Subject: [PATCH 157/232] Remove transparent tagging-only CustomizeDiff - vpclattice. --- internal/service/vpclattice/listener_rule.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/internal/service/vpclattice/listener_rule.go b/internal/service/vpclattice/listener_rule.go index 909f7b847860..3bc0d4fd6a62 100644 --- a/internal/service/vpclattice/listener_rule.go +++ b/internal/service/vpclattice/listener_rule.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/vpclattice" "github.com/aws/aws-sdk-go-v2/service/vpclattice/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -239,10 +238,6 @@ func ResourceListenerRule() *schema.Resource { names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - - CustomizeDiff: customdiff.All( - verify.SetTagsDiff, - ), } } From 416ebff4a97975cd267416029f58b4d63c331686 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:14 -0500 Subject: [PATCH 158/232] Remove transparent tagging CustomizeDiff - acm. --- internal/service/acm/certificate.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/acm/certificate.go b/internal/service/acm/certificate.go index f9066ec34ebb..04d7a60d7e7d 100644 --- a/internal/service/acm/certificate.go +++ b/internal/service/acm/certificate.go @@ -324,7 +324,6 @@ func resourceCertificate() *schema.Resource { return nil }, - verify.SetTagsDiff, ), } } From cef2daca3554fd58e2b1f0f328fc04032cdfc283 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:14 -0500 Subject: [PATCH 159/232] Remove transparent tagging CustomizeDiff - amp. --- internal/service/amp/workspace.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/amp/workspace.go b/internal/service/amp/workspace.go index 503766eb6282..a6cd2ebd17b4 100644 --- a/internal/service/amp/workspace.go +++ b/internal/service/amp/workspace.go @@ -46,7 +46,6 @@ func resourceWorkspace() *schema.Resource { customdiff.ForceNewIfChange(names.AttrAlias, func(_ context.Context, old, new, meta interface{}) bool { return old.(string) != "" && new.(string) == "" }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From b2505e41f535e4bcdf83921277bbd277cb009e96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:14 -0500 Subject: [PATCH 160/232] Remove transparent tagging CustomizeDiff - amplify. --- internal/service/amplify/app.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/amplify/app.go b/internal/service/amplify/app.go index 038cfec6ee21..1a64481295f2 100644 --- a/internal/service/amplify/app.go +++ b/internal/service/amplify/app.go @@ -42,7 +42,6 @@ func resourceApp() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIfChange(names.AttrDescription, func(_ context.Context, old, new, meta interface{}) bool { // Any existing value cannot be cleared. return new.(string) == "" From 679aee5358688525cfab8dae8a7e00cc0a44c55d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:15 -0500 Subject: [PATCH 161/232] Remove transparent tagging CustomizeDiff - appstream. --- internal/service/appstream/fleet.go | 1 - internal/service/appstream/stack.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index b3522e5d6fc7..b6b93a5dffbe 100644 --- a/internal/service/appstream/fleet.go +++ b/internal/service/appstream/fleet.go @@ -44,7 +44,6 @@ func ResourceFleet() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceFleetCustDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/appstream/stack.go b/internal/service/appstream/stack.go index ea1eb74a3f90..391b8814a933 100644 --- a/internal/service/appstream/stack.go +++ b/internal/service/appstream/stack.go @@ -26,7 +26,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -206,7 +205,6 @@ func ResourceStack() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { if d.Id() == "" { return nil From 233b8fbd02ecae988d6b9f8928f645677759d596 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:16 -0500 Subject: [PATCH 162/232] Remove transparent tagging CustomizeDiff - batch. --- internal/service/batch/compute_environment.go | 1 - internal/service/batch/job_definition.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go index 288ba4685b7c..4a71d7afaa25 100644 --- a/internal/service/batch/compute_environment.go +++ b/internal/service/batch/compute_environment.go @@ -49,7 +49,6 @@ func resourceComputeEnvironment() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceComputeEnvironmentCustomizeDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go index ed591698a200..363ff547c2bd 100644 --- a/internal/service/batch/job_definition.go +++ b/internal/service/batch/job_definition.go @@ -29,7 +29,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -575,7 +574,6 @@ func resourceJobDefinition() *schema.Resource { CustomizeDiff: customdiff.Sequence( jobDefinitionCustomizeDiff, - verify.SetTagsDiff, ), } } From 9cbcbea0f3e7119e0ceb8a819f8564b8b863a25d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:17 -0500 Subject: [PATCH 163/232] Remove transparent tagging CustomizeDiff - chime. --- internal/service/chime/voice_connector.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/chime/voice_connector.go b/internal/service/chime/voice_connector.go index fd2f8dd9c808..a4556f568fe6 100644 --- a/internal/service/chime/voice_connector.go +++ b/internal/service/chime/voice_connector.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -68,7 +67,6 @@ func ResourceVoiceConnector() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, resourceVoiceConnectorDefaultRegion, ), } From 935994189d6e30e265f6b1c76c9ebb8d45894c3f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:17 -0500 Subject: [PATCH 164/232] Remove transparent tagging CustomizeDiff - cloudformation. --- internal/service/cloudformation/stack.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/cloudformation/stack.go b/internal/service/cloudformation/stack.go index d774572cc98b..aafc233348e4 100644 --- a/internal/service/cloudformation/stack.go +++ b/internal/service/cloudformation/stack.go @@ -135,7 +135,6 @@ func resourceStack() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, customdiff.ComputedIf("outputs", stackHasActualChanges), ), } From 5fb419d6171d9d85302dc421b145aaafad8757b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:18 -0500 Subject: [PATCH 165/232] Remove transparent tagging CustomizeDiff - cloudwatch. --- internal/service/cloudwatch/metric_alarm.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/cloudwatch/metric_alarm.go b/internal/service/cloudwatch/metric_alarm.go index 10e75bfdbe13..aa27de76df55 100644 --- a/internal/service/cloudwatch/metric_alarm.go +++ b/internal/service/cloudwatch/metric_alarm.go @@ -290,7 +290,6 @@ func resourceMetricAlarm() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, v interface{}) error { _, metricNameOk := diff.GetOk(names.AttrMetricName) _, statisticOk := diff.GetOk("statistic") From dbfa8b4e740109b619b0c8c4119d2f64f0117bf8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:18 -0500 Subject: [PATCH 166/232] Remove transparent tagging CustomizeDiff - codebuild. --- internal/service/codebuild/project.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/codebuild/project.go b/internal/service/codebuild/project.go index b683124495db..12a39af44f21 100644 --- a/internal/service/codebuild/project.go +++ b/internal/service/codebuild/project.go @@ -721,7 +721,6 @@ func resourceProject() *schema.Resource { } return fmt.Errorf(`cache location is required when cache type is %q`, cacheType.(string)) }, - verify.SetTagsDiff, ), } } From 8b3eea2041db37c966adb1d366fe4a6797a16a08 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:19 -0500 Subject: [PATCH 167/232] Remove transparent tagging CustomizeDiff - comprehend. --- internal/service/comprehend/document_classifier.go | 1 - internal/service/comprehend/entity_recognizer.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/comprehend/document_classifier.go b/internal/service/comprehend/document_classifier.go index c3b8c7f4ad44..e1df313eb57f 100644 --- a/internal/service/comprehend/document_classifier.go +++ b/internal/service/comprehend/document_classifier.go @@ -234,7 +234,6 @@ func ResourceDocumentClassifier() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { tfMap := getDocumentClassifierInputDataConfig(diff) if tfMap == nil { diff --git a/internal/service/comprehend/entity_recognizer.go b/internal/service/comprehend/entity_recognizer.go index 1081c12242cb..d1612dcb1572 100644 --- a/internal/service/comprehend/entity_recognizer.go +++ b/internal/service/comprehend/entity_recognizer.go @@ -33,7 +33,6 @@ import ( tfkms "github.com/hashicorp/terraform-provider-aws/internal/service/kms" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -255,7 +254,6 @@ func ResourceEntityRecognizer() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error { tfMap := getEntityRecognizerInputDataConfig(diff) if tfMap == nil { From 8cd48f5f03e29134e11fb5dd712c85685f5eef96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:19 -0500 Subject: [PATCH 168/232] Remove transparent tagging CustomizeDiff - configservice. --- internal/service/configservice/configuration_aggregator.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/configservice/configuration_aggregator.go b/internal/service/configservice/configuration_aggregator.go index 20f33d896273..e33e8c2fc0d7 100644 --- a/internal/service/configservice/configuration_aggregator.go +++ b/internal/service/configservice/configuration_aggregator.go @@ -47,7 +47,6 @@ func resourceConfigurationAggregator() *schema.Resource { customdiff.ForceNewIfChange("organization_aggregation_source", func(_ context.Context, old, new, meta interface{}) bool { return len(old.([]interface{})) == 0 && len(new.([]interface{})) > 0 }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 1bce05a4892dbd34ec27b47ac007c513617a631f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:21 -0500 Subject: [PATCH 169/232] Remove transparent tagging CustomizeDiff - directconnect. --- internal/service/directconnect/public_virtual_interface.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/directconnect/public_virtual_interface.go b/internal/service/directconnect/public_virtual_interface.go index d8257bb99abb..184b173c139f 100644 --- a/internal/service/directconnect/public_virtual_interface.go +++ b/internal/service/directconnect/public_virtual_interface.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -42,7 +41,6 @@ func resourcePublicVirtualInterface() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourcePublicVirtualInterfaceCustomizeDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 12d01e8df2b3eb2c3731a5150083fae2bce6d519 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:21 -0500 Subject: [PATCH 170/232] Remove transparent tagging CustomizeDiff - dms. --- internal/service/dms/endpoint.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/dms/endpoint.go b/internal/service/dms/endpoint.go index 8c148b556f89..22f34634533a 100644 --- a/internal/service/dms/endpoint.go +++ b/internal/service/dms/endpoint.go @@ -777,7 +777,6 @@ func resourceEndpoint() *schema.Resource { validateKMSKeyEngineCustomizeDiff, validateS3SSEKMSKeyCustomizeDiff, validateRedshiftSSEKMSKeyCustomizeDiff, - verify.SetTagsDiff, ), } } From 1e9d92c1888d22409611d183fa11f0d315506434 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:22 -0500 Subject: [PATCH 171/232] Remove transparent tagging CustomizeDiff - dynamodb. --- internal/service/dynamodb/table.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 307d7afb21b1..c7f13e953c9d 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -127,7 +127,6 @@ func resourceTable() *schema.Resource { return old.(string) != new.(string) && new.(string) != "" }), validateTTLCustomDiff, - verify.SetTagsDiff, ), SchemaVersion: 1, From 05e34de7342261989674cfe1f047c25bb4c80db8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:22 -0500 Subject: [PATCH 172/232] Remove transparent tagging CustomizeDiff - ec2. --- internal/service/ec2/ebs_volume.go | 1 - internal/service/ec2/ec2_fleet.go | 1 - internal/service/ec2/ec2_instance.go | 1 - internal/service/ec2/ec2_launch_template.go | 1 - internal/service/ec2/ec2_placement_group.go | 2 -- internal/service/ec2/ipam_.go | 1 - internal/service/ec2/ipam_resource_discovery.go | 1 - internal/service/ec2/transitgateway_.go | 1 - internal/service/ec2/vpc_.go | 1 - internal/service/ec2/vpc_managed_prefix_list.go | 2 -- internal/service/ec2/vpc_nat_gateway.go | 2 -- internal/service/ec2/vpc_network_interface.go | 1 - internal/service/ec2/vpnsite_connection.go | 2 -- 13 files changed, 17 deletions(-) diff --git a/internal/service/ec2/ebs_volume.go b/internal/service/ec2/ebs_volume.go index c1c0ba05f5ec..2734ff0bab88 100644 --- a/internal/service/ec2/ebs_volume.go +++ b/internal/service/ec2/ebs_volume.go @@ -49,7 +49,6 @@ func resourceEBSVolume() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceEBSVolumeCustomizeDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/ec2/ec2_fleet.go b/internal/service/ec2/ec2_fleet.go index 966127e72216..1eb428ca0bdc 100644 --- a/internal/service/ec2/ec2_fleet.go +++ b/internal/service/ec2/ec2_fleet.go @@ -52,7 +52,6 @@ func resourceFleet() *schema.Resource { CustomizeDiff: customdiff.All( resourceFleetCustomizeDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 647b1b32f52a..5c84e84c540e 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -850,7 +850,6 @@ func resourceInstance() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { _, ok := diff.GetOk(names.AttrLaunchTemplate) diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index d82fb0af5434..6068f75c5ea5 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -1011,7 +1011,6 @@ func resourceLaunchTemplate() *schema.Resource { } return false }), - verify.SetTagsDiff, ), } } diff --git a/internal/service/ec2/ec2_placement_group.go b/internal/service/ec2/ec2_placement_group.go index 4dc785db6885..ac2961f9a6cf 100644 --- a/internal/service/ec2/ec2_placement_group.go +++ b/internal/service/ec2/ec2_placement_group.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -81,7 +80,6 @@ func resourcePlacementGroup() *schema.Resource { CustomizeDiff: customdiff.All( resourcePlacementGroupCustomizeDiff, - verify.SetTagsDiff, ), } } diff --git a/internal/service/ec2/ipam_.go b/internal/service/ec2/ipam_.go index 5f95606389e3..029cbe188144 100644 --- a/internal/service/ec2/ipam_.go +++ b/internal/service/ec2/ipam_.go @@ -108,7 +108,6 @@ func resourceIPAM() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { if diff.Id() == "" { // Create. currentRegion := meta.(*conns.AWSClient).Region(ctx) diff --git a/internal/service/ec2/ipam_resource_discovery.go b/internal/service/ec2/ipam_resource_discovery.go index 8459323dd181..6df5389e8a65 100644 --- a/internal/service/ec2/ipam_resource_discovery.go +++ b/internal/service/ec2/ipam_resource_discovery.go @@ -84,7 +84,6 @@ func resourceIPAMResourceDiscovery() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, // user must define authn region within `operating_regions {}` func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { if diff.Id() == "" { // Create. diff --git a/internal/service/ec2/transitgateway_.go b/internal/service/ec2/transitgateway_.go index dbf2155e19da..43c71e580a9a 100644 --- a/internal/service/ec2/transitgateway_.go +++ b/internal/service/ec2/transitgateway_.go @@ -56,7 +56,6 @@ func resourceTransitGateway() *schema.Resource { // Only changes from disable to enable for feature_set should force a new resource. return old.(string) == string(awstypes.DefaultRouteTablePropagationValueDisable) && new.(string) == string(awstypes.DefaultRouteTablePropagationValueEnable) }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/ec2/vpc_.go b/internal/service/ec2/vpc_.go index ed2d1247c578..2f5b19768ba4 100644 --- a/internal/service/ec2/vpc_.go +++ b/internal/service/ec2/vpc_.go @@ -67,7 +67,6 @@ func resourceVPC() *schema.Resource { CustomizeDiff: customdiff.All( resourceVPCCustomizeDiff, - verify.SetTagsDiff, ), SchemaVersion: 1, diff --git a/internal/service/ec2/vpc_managed_prefix_list.go b/internal/service/ec2/vpc_managed_prefix_list.go index 81a93c049f60..85b5d0058939 100644 --- a/internal/service/ec2/vpc_managed_prefix_list.go +++ b/internal/service/ec2/vpc_managed_prefix_list.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -43,7 +42,6 @@ func resourceManagedPrefixList() *schema.Resource { customdiff.ComputedIf(names.AttrVersion, func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) bool { return diff.HasChange("entry") }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ diff --git a/internal/service/ec2/vpc_nat_gateway.go b/internal/service/ec2/vpc_nat_gateway.go index 26efc388af28..c7f304e5839b 100644 --- a/internal/service/ec2/vpc_nat_gateway.go +++ b/internal/service/ec2/vpc_nat_gateway.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -111,7 +110,6 @@ func resourceNATGateway() *schema.Resource { CustomizeDiff: customdiff.All( resourceNATGatewayCustomizeDiff, - verify.SetTagsDiff, ), } } diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 313fbf7976ba..da0e216bedfe 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -215,7 +215,6 @@ func resourceNetworkInterface() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIf("private_ips", func(_ context.Context, d *schema.ResourceDiff, meta interface{}) bool { privateIPListEnabled := d.Get("private_ip_list_enabled").(bool) if privateIPListEnabled { diff --git a/internal/service/ec2/vpnsite_connection.go b/internal/service/ec2/vpnsite_connection.go index 9ac28c50ef71..15286f00e244 100644 --- a/internal/service/ec2/vpnsite_connection.go +++ b/internal/service/ec2/vpnsite_connection.go @@ -29,7 +29,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -633,7 +632,6 @@ func resourceVPNConnection() *schema.Resource { CustomizeDiff: customdiff.Sequence( customizeDiffValidateOutsideIPAddressType, - verify.SetTagsDiff, ), } } From 0607f132dc4e18cd5789fb6ba13700c68af96894 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:22 -0500 Subject: [PATCH 173/232] Remove transparent tagging CustomizeDiff - ecs. --- internal/service/ecs/service.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index d2475c357dc7..72051ce463ae 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1150,7 +1150,6 @@ func resourceService() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, capacityProviderStrategyCustomizeDiff, triggersCustomizeDiff, ), From a9085bf7e845c447f0860939af430eeef2c790ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:22 -0500 Subject: [PATCH 174/232] Remove transparent tagging CustomizeDiff - eks. --- internal/service/eks/cluster.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index c0f792399f6a..bcf8897c6fb0 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -53,7 +53,6 @@ func resourceCluster() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, validateAutoModeCustomizeDiff, customdiff.ForceNewIfChange("encryption_config", func(_ context.Context, old, new, meta any) bool { // You cannot disable envelope encryption after enabling it. This action is irreversible. From ae04f55d65bc36902d7a5d6c4fe837df3421b1bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:23 -0500 Subject: [PATCH 175/232] Remove transparent tagging CustomizeDiff - elasticache. --- internal/service/elasticache/cluster.go | 1 - internal/service/elasticache/replication_group.go | 1 - internal/service/elasticache/subnet_group.go | 2 -- 3 files changed, 4 deletions(-) diff --git a/internal/service/elasticache/cluster.go b/internal/service/elasticache/cluster.go index 43133b9e5c25..4bb0d38d4a4f 100644 --- a/internal/service/elasticache/cluster.go +++ b/internal/service/elasticache/cluster.go @@ -342,7 +342,6 @@ func resourceCluster() *schema.Resource { clusterValidateNumCacheNodes, clusterForceNewOnMemcachedNodeTypeChange, clusterValidateMemcachedSnapshotIdentifier, - verify.SetTagsDiff, ), } } diff --git a/internal/service/elasticache/replication_group.go b/internal/service/elasticache/replication_group.go index 7e40c1ed8cad..57b0f6f618dd 100644 --- a/internal/service/elasticache/replication_group.go +++ b/internal/service/elasticache/replication_group.go @@ -420,7 +420,6 @@ func resourceReplicationGroup() *schema.Resource { return semver.LessThan(d.Get("engine_version_actual").(string), "7.0.5") }), replicationGroupValidateAutomaticFailoverNumCacheClusters, - verify.SetTagsDiff, ), } } diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go index 89920a47e3fb..c8a09f3b2c47 100644 --- a/internal/service/elasticache/subnet_group.go +++ b/internal/service/elasticache/subnet_group.go @@ -23,7 +23,6 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -76,7 +75,6 @@ func resourceSubnetGroup() *schema.Resource { CustomizeDiff: customdiff.All( resourceSubnetGroupCustomizeDiff, - verify.SetTagsDiff, ), } } From 6d0ac3eccfe0eb0019c2e188bd4d56620e333564 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:23 -0500 Subject: [PATCH 176/232] Remove transparent tagging CustomizeDiff - elasticsearch. --- internal/service/elasticsearch/domain.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/elasticsearch/domain.go b/internal/service/elasticsearch/domain.go index 8c32a55fe5ab..1b9123bab201 100644 --- a/internal/service/elasticsearch/domain.go +++ b/internal/service/elasticsearch/domain.go @@ -94,7 +94,6 @@ func resourceDomain() *schema.Resource { return !inPlaceEncryptionEnableVersion(d.Get("elasticsearch_version").(string)) }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 4ad4f4de7b8c11b9a48b01d35339f9f0fd3636c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:23 -0500 Subject: [PATCH 177/232] Remove transparent tagging CustomizeDiff - elb. --- internal/service/elb/load_balancer.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/elb/load_balancer.go b/internal/service/elb/load_balancer.go index fe84c36dd4a6..3c2b1828fa30 100644 --- a/internal/service/elb/load_balancer.go +++ b/internal/service/elb/load_balancer.go @@ -59,7 +59,6 @@ func resourceLoadBalancer() *schema.Resource { return removed.Equal(os) }), - verify.SetTagsDiff, ), Timeouts: &schema.ResourceTimeout{ From 553933cb07c15fc926b3ba5b8d2cfca0824c9026 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:23 -0500 Subject: [PATCH 178/232] Remove transparent tagging CustomizeDiff - elbv2. --- internal/service/elbv2/listener.go | 1 - internal/service/elbv2/listener_rule.go | 1 - internal/service/elbv2/load_balancer.go | 1 - internal/service/elbv2/target_group.go | 1 - 4 files changed, 4 deletions(-) diff --git a/internal/service/elbv2/listener.go b/internal/service/elbv2/listener.go index dd00722c0c7e..f0d8317b36fe 100644 --- a/internal/service/elbv2/listener.go +++ b/internal/service/elbv2/listener.go @@ -540,7 +540,6 @@ func resourceListener() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, validateListenerActionsCustomDiff(names.AttrDefaultAction), ), } diff --git a/internal/service/elbv2/listener_rule.go b/internal/service/elbv2/listener_rule.go index 44d8a703a3bf..239cd41738d6 100644 --- a/internal/service/elbv2/listener_rule.go +++ b/internal/service/elbv2/listener_rule.go @@ -466,7 +466,6 @@ func resourceListenerRule() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, validateListenerActionsCustomDiff(names.AttrAction), ), } diff --git a/internal/service/elbv2/load_balancer.go b/internal/service/elbv2/load_balancer.go index 7e42d590ad5b..31513f727062 100644 --- a/internal/service/elbv2/load_balancer.go +++ b/internal/service/elbv2/load_balancer.go @@ -55,7 +55,6 @@ func resourceLoadBalancer() *schema.Resource { customizeDiffLoadBalancerALB, customizeDiffLoadBalancerNLB, customizeDiffLoadBalancerGWLB, - verify.SetTagsDiff, ), Timeouts: &schema.ResourceTimeout{ diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go index 4ebb52c2eb6a..16b1f7206b4d 100644 --- a/internal/service/elbv2/target_group.go +++ b/internal/service/elbv2/target_group.go @@ -56,7 +56,6 @@ func resourceTargetGroup() *schema.Resource { resourceTargetGroupCustomizeDiff, customizeDiffTargetGroupTargetTypeLambda, customizeDiffTargetGroupTargetTypeNotLambda, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From f42f5def6319c9a5d7858c5ecae5734ca18bc8ca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:24 -0500 Subject: [PATCH 179/232] Remove transparent tagging CustomizeDiff - firehose. --- internal/service/firehose/delivery_stream.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/firehose/delivery_stream.go b/internal/service/firehose/delivery_stream.go index fd33aff98bd8..bb5dbba6c8a2 100644 --- a/internal/service/firehose/delivery_stream.go +++ b/internal/service/firehose/delivery_stream.go @@ -1446,7 +1446,6 @@ func resourceDeliveryStream() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error { destination := destinationType(d.Get(names.AttrDestination).(string)) requiredAttribute := map[destinationType]string{ From bb4b2af80589ced21f478661d243e31163170bb4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:24 -0500 Subject: [PATCH 180/232] Remove transparent tagging CustomizeDiff - fsx. --- internal/service/fsx/lustre_file_system.go | 1 - internal/service/fsx/ontap_file_system.go | 1 - internal/service/fsx/openzfs_file_system.go | 1 - 3 files changed, 3 deletions(-) diff --git a/internal/service/fsx/lustre_file_system.go b/internal/service/fsx/lustre_file_system.go index 205bb878d098..5727fc56aa52 100644 --- a/internal/service/fsx/lustre_file_system.go +++ b/internal/service/fsx/lustre_file_system.go @@ -316,7 +316,6 @@ func resourceLustreFileSystem() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, resourceLustreFileSystemStorageCapacityCustomizeDiff, resourceLustreFileSystemMetadataConfigCustomizeDiff, ), diff --git a/internal/service/fsx/ontap_file_system.go b/internal/service/fsx/ontap_file_system.go index a7b182196ce8..589279b5276d 100644 --- a/internal/service/fsx/ontap_file_system.go +++ b/internal/service/fsx/ontap_file_system.go @@ -249,7 +249,6 @@ func resourceONTAPFileSystem() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, resourceONTAPFileSystemThroughputCapacityPerHAPairCustomizeDiff, resourceONTAPFileSystemHAPairsCustomizeDiff, ), diff --git a/internal/service/fsx/openzfs_file_system.go b/internal/service/fsx/openzfs_file_system.go index e9d932f19773..efa5c34a56a8 100644 --- a/internal/service/fsx/openzfs_file_system.go +++ b/internal/service/fsx/openzfs_file_system.go @@ -315,7 +315,6 @@ func resourceOpenZFSFileSystem() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, validateDiskConfigurationIOPS, func(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { var ( From a2e6826c57ea9edac2c7082f1b50729583957f56 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:26 -0500 Subject: [PATCH 181/232] Remove transparent tagging CustomizeDiff - iot. --- internal/service/iot/authorizer.go | 1 - internal/service/iot/ca_certificate.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/iot/authorizer.go b/internal/service/iot/authorizer.go index 94c1053ffc15..483e8cc36353 100644 --- a/internal/service/iot/authorizer.go +++ b/internal/service/iot/authorizer.go @@ -42,7 +42,6 @@ func resourceAuthorizer() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, resourceAuthorizerCustomizeDiff, ), diff --git a/internal/service/iot/ca_certificate.go b/internal/service/iot/ca_certificate.go index cc8ff2c2d74f..6c1cbef63755 100644 --- a/internal/service/iot/ca_certificate.go +++ b/internal/service/iot/ca_certificate.go @@ -136,7 +136,6 @@ func resourceCACertificate() *schema.Resource { return nil }, - verify.SetTagsDiff, ), } } From 43a0e5d11794522525a8221a42f9f4dc87704fda Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:26 -0500 Subject: [PATCH 182/232] Remove transparent tagging CustomizeDiff - kafka. --- internal/service/kafka/cluster.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/kafka/cluster.go b/internal/service/kafka/cluster.go index 766209e6b1b1..a66f31c58df1 100644 --- a/internal/service/kafka/cluster.go +++ b/internal/service/kafka/cluster.go @@ -54,7 +54,6 @@ func resourceCluster() *schema.Resource { customdiff.ForceNewIfChange("kafka_version", func(_ context.Context, old, new, meta interface{}) bool { return semver.LessThan(new.(string), old.(string)) }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 47a535e48d37441d590a79ea31b67e5dbf9b9b23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 183/232] Remove transparent tagging CustomizeDiff - kendra. --- internal/service/kendra/data_source.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index 530ec6367acd..497c5b53f047 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -71,7 +71,6 @@ func ResourceDataSource() *schema.Resource { return nil }, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ names.AttrARN: { From 66988010d368ba5b260eaacc9583daa35d69791c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 184/232] Remove transparent tagging CustomizeDiff - keyspaces. --- internal/service/keyspaces/table.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/keyspaces/table.go b/internal/service/keyspaces/table.go index 4f7463d8954a..93cf2192a356 100644 --- a/internal/service/keyspaces/table.go +++ b/internal/service/keyspaces/table.go @@ -65,7 +65,6 @@ func resourceTable() *schema.Resource { return false }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 5aa9f7e82f9333a4ef93ac86831a1fb60371af70 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 185/232] Remove transparent tagging CustomizeDiff - kinesis. --- internal/service/kinesis/stream.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/kinesis/stream.go b/internal/service/kinesis/stream.go index c0b2b67d88af..d3bf4aa823ed 100644 --- a/internal/service/kinesis/stream.go +++ b/internal/service/kinesis/stream.go @@ -44,7 +44,6 @@ func resourceStream() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error { switch streamMode, shardCount := getStreamMode(diff), diff.Get("shard_count").(int); streamMode { case types.StreamModeOnDemand: From 7033a9873a950b164fa42cc663f4fa8e9696497e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 186/232] Remove transparent tagging CustomizeDiff - kinesisanalytics. --- internal/service/kinesisanalytics/application.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/kinesisanalytics/application.go b/internal/service/kinesisanalytics/application.go index 16ded0a25b64..2ac33ca01f67 100644 --- a/internal/service/kinesisanalytics/application.go +++ b/internal/service/kinesisanalytics/application.go @@ -40,7 +40,6 @@ func resourceApplication() *schema.Resource { DeleteWithoutTimeout: resourceApplicationDelete, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIfChange("inputs", func(_ context.Context, old, new, meta interface{}) bool { // An existing input configuration cannot be deleted. return len(old.([]interface{})) == 1 && len(new.([]interface{})) == 0 From 18f5c240a0c436e0c5bd0953cafd8835f33994b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 187/232] Remove transparent tagging CustomizeDiff - kinesisanalyticsv2. --- internal/service/kinesisanalyticsv2/application.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/kinesisanalyticsv2/application.go b/internal/service/kinesisanalyticsv2/application.go index b677a81c0377..64d0bc971727 100644 --- a/internal/service/kinesisanalyticsv2/application.go +++ b/internal/service/kinesisanalyticsv2/application.go @@ -42,7 +42,6 @@ func resourceApplication() *schema.Resource { DeleteWithoutTimeout: resourceApplicationDelete, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIfChange("application_configuration.0.sql_application_configuration.0.input", func(_ context.Context, old, new, meta interface{}) bool { // An existing input configuration cannot be deleted. return len(old.([]interface{})) == 1 && len(new.([]interface{})) == 0 From a3d2570b74c480d756ee2ef3e103258343dd2164 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:27 -0500 Subject: [PATCH 188/232] Remove transparent tagging CustomizeDiff - lambda. --- internal/service/lambda/function.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 5e646eada876..0c6820c89d02 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -460,7 +460,6 @@ func resourceFunction() *schema.Resource { CustomizeDiff: customdiff.Sequence( checkHandlerRuntimeForZipFunction, updateComputedAttributesOnPublish, - verify.SetTagsDiff, ), } } From 8e470a9cd42ba12252b0641b79679b9fe8269c44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:28 -0500 Subject: [PATCH 189/232] Remove transparent tagging CustomizeDiff - lightsail. --- internal/service/lightsail/certificate.go | 2 -- internal/service/lightsail/instance.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/service/lightsail/certificate.go b/internal/service/lightsail/certificate.go index 400d72116f0f..0ead8b5ca51a 100644 --- a/internal/service/lightsail/certificate.go +++ b/internal/service/lightsail/certificate.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -128,7 +127,6 @@ func ResourceCertificate() *schema.Resource { return nil }, - verify.SetTagsDiff, ), } } diff --git a/internal/service/lightsail/instance.go b/internal/service/lightsail/instance.go index 9c5c084062a9..e3188ba47fcf 100644 --- a/internal/service/lightsail/instance.go +++ b/internal/service/lightsail/instance.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -166,7 +165,6 @@ func ResourceInstance() *schema.Resource { } return nil }), - verify.SetTagsDiff, ), } } From 22060447153bcb2c99d8725dc406c3007ff8544a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:29 -0500 Subject: [PATCH 190/232] Remove transparent tagging CustomizeDiff - mq. --- internal/service/mq/broker.go | 1 - internal/service/mq/configuration.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/internal/service/mq/broker.go b/internal/service/mq/broker.go index c2434c454aff..b716c2aa02aa 100644 --- a/internal/service/mq/broker.go +++ b/internal/service/mq/broker.go @@ -375,7 +375,6 @@ func resourceBroker() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, v interface{}) error { if strings.EqualFold(diff.Get("engine_type").(string), string(types.EngineTypeRabbitmq)) { if v, ok := diff.GetOk("logs.0.audit"); ok { diff --git a/internal/service/mq/configuration.go b/internal/service/mq/configuration.go index 423f23d9b25d..27d6c04fbfdb 100644 --- a/internal/service/mq/configuration.go +++ b/internal/service/mq/configuration.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -55,7 +54,6 @@ func resourceConfiguration() *schema.Resource { } return nil }, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From 9545f4ec29445b8fa29ef344507e98c9d8247a38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:29 -0500 Subject: [PATCH 191/232] Remove transparent tagging CustomizeDiff - mwaa. --- internal/service/mwaa/environment.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/mwaa/environment.go b/internal/service/mwaa/environment.go index 96e69283e0b3..941f46e52f93 100644 --- a/internal/service/mwaa/environment.go +++ b/internal/service/mwaa/environment.go @@ -316,7 +316,6 @@ func resourceEnvironment() *schema.Resource { return false }), - verify.SetTagsDiff, ), } } From 17e2c35875bf6c66c87cfeb114445449de521c39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:30 -0500 Subject: [PATCH 192/232] Remove transparent tagging CustomizeDiff - networkfirewall. --- internal/service/networkfirewall/firewall.go | 1 - internal/service/networkfirewall/firewall_policy.go | 1 - internal/service/networkfirewall/rule_group.go | 1 - 3 files changed, 3 deletions(-) diff --git a/internal/service/networkfirewall/firewall.go b/internal/service/networkfirewall/firewall.go index 651e8e51001d..5fd384b51a97 100644 --- a/internal/service/networkfirewall/firewall.go +++ b/internal/service/networkfirewall/firewall.go @@ -49,7 +49,6 @@ func resourceFirewall() *schema.Resource { customdiff.ComputedIf("firewall_status", func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) bool { return diff.HasChange("subnet_mapping") }), - verify.SetTagsDiff, ), SchemaFunc: func() map[string]*schema.Schema { diff --git a/internal/service/networkfirewall/firewall_policy.go b/internal/service/networkfirewall/firewall_policy.go index a167e91ed940..e4ac0e577096 100644 --- a/internal/service/networkfirewall/firewall_policy.go +++ b/internal/service/networkfirewall/firewall_policy.go @@ -226,7 +226,6 @@ func resourceFirewallPolicy() *schema.Resource { func(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { return forceNewIfNotRuleOrderDefault("firewall_policy.0.stateful_engine_options.0.rule_order", d) }, - verify.SetTagsDiff, ), } } diff --git a/internal/service/networkfirewall/rule_group.go b/internal/service/networkfirewall/rule_group.go index 44116d968671..8e36e25c59d9 100644 --- a/internal/service/networkfirewall/rule_group.go +++ b/internal/service/networkfirewall/rule_group.go @@ -458,7 +458,6 @@ func resourceRuleGroup() *schema.Resource { func(_ context.Context, d *schema.ResourceDiff, meta interface{}) error { return forceNewIfNotRuleOrderDefault("rule_group.0.stateful_rule_options.0.rule_order", d) }, - verify.SetTagsDiff, ), } } From be447ac29ccffc3dcf596fc1646a2d1ebe688778 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:30 -0500 Subject: [PATCH 193/232] Remove transparent tagging CustomizeDiff - networkmanager. --- internal/service/networkmanager/vpc_attachment.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 8528614abb9b..bd5a4294c17b 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -40,7 +40,6 @@ func resourceVPCAttachment() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(ctx context.Context, d *schema.ResourceDiff, meta any) error { if d.Id() == "" { return nil From 313be656ce4afd478799526cff6fe6ee94191dbd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:30 -0500 Subject: [PATCH 194/232] Remove transparent tagging CustomizeDiff - opensearch. --- internal/service/opensearch/domain.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/opensearch/domain.go b/internal/service/opensearch/domain.go index 3d864706eec8..80e604993583 100644 --- a/internal/service/opensearch/domain.go +++ b/internal/service/opensearch/domain.go @@ -101,7 +101,6 @@ func resourceDomain() *schema.Resource { customdiff.ForceNewIfChange(names.AttrIPAddressType, func(_ context.Context, old, new, meta interface{}) bool { return (old.(string) == string(awstypes.IPAddressTypeDualstack)) && old.(string) != new.(string) }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From ef81b4e3225572cf32d2b00025bb43e841569f55 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:32 -0500 Subject: [PATCH 195/232] Remove transparent tagging CustomizeDiff - quicksight. --- internal/service/quicksight/data_set.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/quicksight/data_set.go b/internal/service/quicksight/data_set.go index 3ff6b23668ff..4a93125f31ea 100644 --- a/internal/service/quicksight/data_set.go +++ b/internal/service/quicksight/data_set.go @@ -95,7 +95,6 @@ func resourceDataSet() *schema.Resource { } return nil }, - verify.SetTagsDiff, ), } } From 0d4f74b7f5fb6cb65a7b748d1878b39d7a4095af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:32 -0500 Subject: [PATCH 196/232] Remove transparent tagging CustomizeDiff - rds. --- internal/service/rds/cluster.go | 1 - internal/service/rds/instance.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 11ace2a5d157..986d9f0fd876 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -626,7 +626,6 @@ func resourceCluster() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIf(names.AttrStorageType, func(_ context.Context, d *schema.ResourceDiff, meta interface{}) bool { // Aurora supports mutation of the storage_type parameter, other engines do not return !strings.HasPrefix(d.Get(names.AttrEngine).(string), "aurora") diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index 6543170086d4..23ceedf21e80 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -687,7 +687,6 @@ func resourceInstance() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, d *schema.ResourceDiff, meta any) error { if !d.Get("blue_green_update.0.enabled").(bool) { return nil From 9cadc6c7b1ee537d1fd3e3f6cad98a886f9d63a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:32 -0500 Subject: [PATCH 197/232] Remove transparent tagging CustomizeDiff - redshift. --- internal/service/redshift/cluster.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/redshift/cluster.go b/internal/service/redshift/cluster.go index 7bd05191246a..a62f5204e0f2 100644 --- a/internal/service/redshift/cluster.go +++ b/internal/service/redshift/cluster.go @@ -409,7 +409,6 @@ func resourceCluster() *schema.Resource { }, CustomizeDiff: customdiff.All( - verify.SetTagsDiff, func(_ context.Context, diff *schema.ResourceDiff, v interface{}) error { azRelocationEnabled, multiAZ := diff.Get("availability_zone_relocation_enabled").(bool), diff.Get("multi_az").(bool) From da6164e00367a6b0d54498d88ddd10edb4256dc3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:33 -0500 Subject: [PATCH 198/232] Remove transparent tagging CustomizeDiff - rolesanywhere. --- internal/service/rolesanywhere/trust_anchor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/rolesanywhere/trust_anchor.go b/internal/service/rolesanywhere/trust_anchor.go index 84b5f4d6ad2a..ec80adb96eae 100644 --- a/internal/service/rolesanywhere/trust_anchor.go +++ b/internal/service/rolesanywhere/trust_anchor.go @@ -135,7 +135,6 @@ func resourceTrustAnchor() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customizeDiffNotificationSettings, ), } From a84e21c4863aef115fa0656088badc7931933c00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:33 -0500 Subject: [PATCH 199/232] Remove transparent tagging CustomizeDiff - route53. --- internal/service/route53/health_check.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/route53/health_check.go b/internal/service/route53/health_check.go index 0e15590baf65..9a5e0a68f31d 100644 --- a/internal/service/route53/health_check.go +++ b/internal/service/route53/health_check.go @@ -184,7 +184,6 @@ func resourceHealthCheck() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, triggersCustomizeDiff, ), } From a4daa45331e182cd11754c1f17009113df08f5df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:33 -0500 Subject: [PATCH 200/232] Remove transparent tagging CustomizeDiff - route53resolver. --- internal/service/route53resolver/rule.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/route53resolver/rule.go b/internal/service/route53resolver/rule.go index e17291fd7ba5..8a1ca5255231 100644 --- a/internal/service/route53resolver/rule.go +++ b/internal/service/route53resolver/rule.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -119,7 +118,6 @@ func resourceRule() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceRuleCustomizeDiff, - verify.SetTagsDiff, ), } } From 67274571b8ef9bbbf732c8da255c4f4e0b503e7a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:34 -0500 Subject: [PATCH 201/232] Remove transparent tagging CustomizeDiff - s3. --- internal/service/s3/bucket_object.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go index 535382eae743..650d7366e317 100644 --- a/internal/service/s3/bucket_object.go +++ b/internal/service/s3/bucket_object.go @@ -55,7 +55,6 @@ func resourceBucketObject() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceBucketObjectCustomizeDiff, - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From b360738c3a3a92e2ebb5407c92163ededd3a0a45 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:34 -0500 Subject: [PATCH 202/232] Remove transparent tagging CustomizeDiff - sagemaker. --- internal/service/sagemaker/notebook_instance.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/sagemaker/notebook_instance.go b/internal/service/sagemaker/notebook_instance.go index 7a5d7f875df9..47624d4aabf2 100644 --- a/internal/service/sagemaker/notebook_instance.go +++ b/internal/service/sagemaker/notebook_instance.go @@ -46,7 +46,6 @@ func resourceNotebookInstance() *schema.Resource { customdiff.ForceNewIfChange(names.AttrVolumeSize, func(_ context.Context, old, new, meta interface{}) bool { return new.(int) < old.(int) }), - verify.SetTagsDiff, ), Schema: map[string]*schema.Schema{ From caed92fd6337f738ea967abda3633c4d7353e26e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:35 -0500 Subject: [PATCH 203/232] Remove transparent tagging CustomizeDiff - servicecatalog. --- internal/service/servicecatalog/provisioned_product.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index cd5bf72f3aa8..092c93955d76 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -25,7 +25,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -267,7 +266,6 @@ func resourceProvisionedProduct() *schema.Resource { CustomizeDiff: customdiff.All( refreshOutputsDiff, - verify.SetTagsDiff, ), } } From 82b3507e7eadf4073a45422dea05b9d164baed0f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:35 -0500 Subject: [PATCH 204/232] Remove transparent tagging CustomizeDiff - sfn. --- internal/service/sfn/state_machine.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/sfn/state_machine.go b/internal/service/sfn/state_machine.go index d6b33470e263..a0d29b7b5f27 100644 --- a/internal/service/sfn/state_machine.go +++ b/internal/service/sfn/state_machine.go @@ -196,7 +196,6 @@ func resourceStateMachine() *schema.Resource { CustomizeDiff: customdiff.Sequence( stateMachineDefinitionValidate, stateMachineUpdateComputedAttributesOnPublish, - verify.SetTagsDiff, ), } } From a738bd824e7ab8afef541147aafbb592991433ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:36 -0500 Subject: [PATCH 205/232] Remove transparent tagging CustomizeDiff - sns. --- internal/service/sns/topic.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go index 4829f6aaa7d7..0db0db808b40 100644 --- a/internal/service/sns/topic.go +++ b/internal/service/sns/topic.go @@ -254,7 +254,6 @@ func resourceTopic() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceTopicCustomizeDiff, - verify.SetTagsDiff, ), Schema: topicSchema, From 9c363ccd2c646576cd5808f53d1dcdec43fc050e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:36 -0500 Subject: [PATCH 206/232] Remove transparent tagging CustomizeDiff - sqs. --- internal/service/sqs/queue.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/sqs/queue.go b/internal/service/sqs/queue.go index ee6d750a5209..f044f4a43174 100644 --- a/internal/service/sqs/queue.go +++ b/internal/service/sqs/queue.go @@ -204,7 +204,6 @@ func resourceQueue() *schema.Resource { CustomizeDiff: customdiff.Sequence( resourceQueueCustomizeDiff, - verify.SetTagsDiff, ), Schema: queueSchema, From aaeea874cbc16f3e15dcd763a70cb9f0b7c9c6bd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:36 -0500 Subject: [PATCH 207/232] Remove transparent tagging CustomizeDiff - ssm. --- internal/service/ssm/document.go | 2 -- internal/service/ssm/parameter.go | 3 --- internal/service/ssm/patch_baseline.go | 2 -- 3 files changed, 7 deletions(-) diff --git a/internal/service/ssm/document.go b/internal/service/ssm/document.go index b77422989830..9300828fd694 100644 --- a/internal/service/ssm/document.go +++ b/internal/service/ssm/document.go @@ -30,7 +30,6 @@ import ( tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -208,7 +207,6 @@ func resourceDocument() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, func(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error { if v, ok := d.GetOk(names.AttrPermissions); ok && len(v.(map[string]interface{})) > 0 { // Validates permissions keys, if set, to be type and account_ids diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go index a5fe04fa2708..ec6e7e991950 100644 --- a/internal/service/ssm/parameter.go +++ b/internal/service/ssm/parameter.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -137,8 +136,6 @@ func resourceParameter() *schema.Resource { customdiff.ComputedIf("insecure_value", func(_ context.Context, diff *schema.ResourceDiff, meta interface{}) bool { return diff.HasChange(names.AttrValue) }), - - verify.SetTagsDiff, ), } } diff --git a/internal/service/ssm/patch_baseline.go b/internal/service/ssm/patch_baseline.go index 77ebcf1fdc6c..787f4723bc9f 100644 --- a/internal/service/ssm/patch_baseline.go +++ b/internal/service/ssm/patch_baseline.go @@ -27,7 +27,6 @@ import ( tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -239,7 +238,6 @@ func resourcePatchBaseline() *schema.Resource { return nil }, - verify.SetTagsDiff, ), } } From 442f4e97b87136785b92008c88fd39ed1422a5ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:37 -0500 Subject: [PATCH 208/232] Remove transparent tagging CustomizeDiff - storagegateway. --- internal/service/storagegateway/gateway.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/storagegateway/gateway.go b/internal/service/storagegateway/gateway.go index 081490a117b9..b8cd3ca8fb55 100644 --- a/internal/service/storagegateway/gateway.go +++ b/internal/service/storagegateway/gateway.go @@ -269,7 +269,6 @@ func resourceGateway() *schema.Resource { customdiff.ForceNewIfChange("smb_active_directory_settings", func(_ context.Context, old, new, meta interface{}) bool { return len(old.([]interface{})) == 1 && len(new.([]interface{})) == 0 }), - verify.SetTagsDiff, ), } } From 56978ffe4a5c7482f9ba71c597094e7ea1129af0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:38 -0500 Subject: [PATCH 209/232] Remove transparent tagging CustomizeDiff - transcribe. --- internal/service/transcribe/vocabulary_filter.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/transcribe/vocabulary_filter.go b/internal/service/transcribe/vocabulary_filter.go index 4188608f21b6..9403aeb7bacf 100644 --- a/internal/service/transcribe/vocabulary_filter.go +++ b/internal/service/transcribe/vocabulary_filter.go @@ -23,7 +23,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -79,7 +78,6 @@ func ResourceVocabularyFilter() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIfChange("words", func(_ context.Context, old, new, meta interface{}) bool { return len(old.([]interface{})) > 0 && len(new.([]interface{})) == 0 }), From 3ec7a0b03b746b5d0bb466440c9ae38638484f33 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:18:38 -0500 Subject: [PATCH 210/232] Remove transparent tagging CustomizeDiff - transfer. --- internal/service/transfer/server.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/transfer/server.go b/internal/service/transfer/server.go index 6ca5f4f2287c..a1028378a4b4 100644 --- a/internal/service/transfer/server.go +++ b/internal/service/transfer/server.go @@ -45,7 +45,6 @@ func resourceServer() *schema.Resource { }, CustomizeDiff: customdiff.Sequence( - verify.SetTagsDiff, customdiff.ForceNewIfChange("endpoint_details.0.vpc_id", func(_ context.Context, old, new, meta interface{}) bool { // "InvalidRequestException: Changing VpcId is not supported". if old, new := old.(string), new.(string); old != "" && new != old { From 52ecf22d6124a7184929d4509c32fe66165b0df0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:19:42 -0500 Subject: [PATCH 211/232] Remove 'verify.SetTagsDiff'. --- internal/verify/diff.go | 92 ----------------------------------------- 1 file changed, 92 deletions(-) diff --git a/internal/verify/diff.go b/internal/verify/diff.go index afffb80b4a9b..ca7791c2ced2 100644 --- a/internal/verify/diff.go +++ b/internal/verify/diff.go @@ -4,105 +4,13 @@ package verify import ( - "context" - "fmt" "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/hashicorp/terraform-provider-aws/internal/conns" - tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" ) // Find JSON diff functions in the json.go file. -// SetTagsDiff sets the new plan difference with the result of -// merging resource tags on to those defined at the provider-level; -// returns an error if unsuccessful or if the resource tags are identical -// to those configured at the provider-level to avoid non-empty plans -// after resource READ operations as resource and provider-level tags -// will be indistinguishable when returned from an AWS API. -func SetTagsDiff(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { - defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig(ctx) - ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig(ctx) - - resourceTags := tftags.New(ctx, diff.Get("tags").(map[string]interface{})) - - allTags := defaultTagsConfig.MergeTags(resourceTags).IgnoreConfig(ignoreTagsConfig) - // To ensure "tags_all" is correctly computed, we explicitly set the attribute diff - // when the merger of resource-level tags onto provider-level tags results in n > 0 tags, - // otherwise we mark the attribute as "Computed" only when there is a known diff (excluding an empty map) - // or a change for "tags_all". - // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/18366 - // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/19005 - - if !diff.GetRawPlan().GetAttr("tags").IsWhollyKnown() { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - return nil - } - - if diff.HasChange("tags") { - _, n := diff.GetChange("tags") - newTags := tftags.New(ctx, n.(map[string]interface{})) - - if newTags.HasZeroValue() { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - } - - if len(allTags) > 0 && (!newTags.HasZeroValue() || !allTags.HasZeroValue()) { - if err := diff.SetNew("tags_all", allTags.Map()); err != nil { - return fmt.Errorf("setting new tags_all diff: %w", err) - } - } - - if len(allTags) == 0 { - if err := diff.SetNew("tags_all", allTags.Map()); err != nil { - return fmt.Errorf("setting new tags_all diff: %w", err) - } - } - } else if !diff.HasChange("tags") { - if len(allTags) > 0 && !allTags.HasZeroValue() { - if err := diff.SetNew("tags_all", allTags.Map()); err != nil { - return fmt.Errorf("setting new tags_all diff: %w", err) - } - return nil - } - - var ta tftags.KeyValueTags - if tagsAll, ok := diff.Get("tags_all").(map[string]interface{}); ok { - ta = tftags.New(ctx, tagsAll) - } - if len(allTags) > 0 && !ta.DeepEqual(allTags) && allTags.HasZeroValue() { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - return nil - } - } else if tagsAll, ok := diff.Get("tags_all").(map[string]interface{}); ok { - ta := tftags.New(ctx, tagsAll) - if !ta.DeepEqual(allTags) { - if allTags.HasZeroValue() { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - } - } - } else if len(diff.Get("tags_all").(map[string]interface{})) > 0 { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - } else if diff.HasChange("tags_all") { - if err := diff.SetNewComputed("tags_all"); err != nil { - return fmt.Errorf("setting tags_all to computed: %w", err) - } - } - - return nil -} - // SuppressEquivalentRoundedTime returns a difference suppression function that compares // two time value with the specified layout rounded to the specified duration. func SuppressEquivalentRoundedTime(layout string, d time.Duration) schema.SchemaDiffSuppressFunc { From 8fcbf7cc3323b7ab70b66a7ed49f36084e234d1b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:27:10 -0500 Subject: [PATCH 212/232] Fix compilation errors. --- internal/service/ce/cost_category.go | 4 ---- internal/service/ec2/ipam_resource_discovery_association.go | 4 ---- internal/service/s3/object.go | 2 +- internal/service/s3/object_copy.go | 2 +- internal/service/storagegateway/file_system_association.go | 3 --- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/internal/service/ce/cost_category.go b/internal/service/ce/cost_category.go index 64124ac44df1..c68b61a2bc86 100644 --- a/internal/service/ce/cost_category.go +++ b/internal/service/ce/cost_category.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/costexplorer" awstypes "github.com/aws/aws-sdk-go-v2/service/costexplorer/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -22,7 +21,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -43,8 +41,6 @@ func resourceCostCategory() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence(verify.SetTagsDiff), - SchemaFunc: func() map[string]*schema.Schema { return map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/ec2/ipam_resource_discovery_association.go b/internal/service/ec2/ipam_resource_discovery_association.go index 26059543654a..5328d4e34f2c 100644 --- a/internal/service/ec2/ipam_resource_discovery_association.go +++ b/internal/service/ec2/ipam_resource_discovery_association.go @@ -13,14 +13,12 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -34,8 +32,6 @@ func resourceIPAMResourceDiscoveryAssociation() *schema.Resource { UpdateWithoutTimeout: resourceIPAMResourceDiscoveryAssociationUpdate, DeleteWithoutTimeout: resourceIPAMResourceDiscoveryAssociationDelete, - CustomizeDiff: customdiff.Sequence(verify.SetTagsDiff), - Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, diff --git a/internal/service/s3/object.go b/internal/service/s3/object.go index 297b20fd0a1f..babefc4ccbb4 100644 --- a/internal/service/s3/object.go +++ b/internal/service/s3/object.go @@ -62,7 +62,7 @@ func resourceObject() *schema.Resource { if ignoreProviderDefaultTags(ctx, d) { return d.SetNew(names.AttrTagsAll, d.Get(names.AttrTags)) } - return verify.SetTagsDiff(ctx, d, meta) + return nil }, ), diff --git a/internal/service/s3/object_copy.go b/internal/service/s3/object_copy.go index be53f5de65a9..a97f85be2c62 100644 --- a/internal/service/s3/object_copy.go +++ b/internal/service/s3/object_copy.go @@ -44,7 +44,7 @@ func resourceObjectCopy() *schema.Resource { if ignoreProviderDefaultTags(ctx, d) { return d.SetNew(names.AttrTagsAll, d.Get(names.AttrTags)) } - return verify.SetTagsDiff(ctx, d, meta) + return nil }, Schema: map[string]*schema.Schema{ diff --git a/internal/service/storagegateway/file_system_association.go b/internal/service/storagegateway/file_system_association.go index bc341bab447b..c9ffc1621be6 100644 --- a/internal/service/storagegateway/file_system_association.go +++ b/internal/service/storagegateway/file_system_association.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/storagegateway" awstypes "github.com/aws/aws-sdk-go-v2/service/storagegateway/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -37,8 +36,6 @@ func resourceFileSystemAssociation() *schema.Resource { UpdateWithoutTimeout: resourceFileSystemAssociationUpdate, DeleteWithoutTimeout: resourceFileSystemAssociationDelete, - CustomizeDiff: customdiff.Sequence(verify.SetTagsDiff), - Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, From 506460018ddc532c095911f786de4c7c6687b0fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:28:02 -0500 Subject: [PATCH 213/232] Not necessary. --- .ci/semgrep/framework/transparent_tagging.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .ci/semgrep/framework/transparent_tagging.yml diff --git a/.ci/semgrep/framework/transparent_tagging.yml b/.ci/semgrep/framework/transparent_tagging.yml deleted file mode 100644 index ad705796b6d1..000000000000 --- a/.ci/semgrep/framework/transparent_tagging.yml +++ /dev/null @@ -1,13 +0,0 @@ -rules: - - id: transparent-tagging-customizediff-in-wrapper - languages: [go] - message: Don't implement a transparent tagging CustomizeDiff function - paths: - include: - - "internal/service/*/*.go" - exclude: - - "internal/service/*/*_test.go" - patterns: - - pattern-regex: CustomizeDiff:\s+verify\.SetTagsDiff, - fix: "" - severity: WARNING From b5c900cac8e18619985c2f21920109616e285e00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:34:19 -0500 Subject: [PATCH 214/232] 'verify.SuppressEquivalentRoundedTime' ->'sdkv2.SuppressEquivalentRoundedTime'. --- internal/sdkv2/suppress.go | 15 +++++++++++++++ .../diff_test.go => sdkv2/suppress_test.go} | 2 +- internal/service/ec2/ec2_ami.go | 3 ++- internal/service/ec2/ec2_ami_copy.go | 3 ++- internal/service/ec2/ec2_ami_from_instance.go | 4 ++-- internal/verify/diff.go | 16 ---------------- 6 files changed, 22 insertions(+), 21 deletions(-) rename internal/{verify/diff_test.go => sdkv2/suppress_test.go} (98%) diff --git a/internal/sdkv2/suppress.go b/internal/sdkv2/suppress.go index 276159166ba8..e3fec6d9cb23 100644 --- a/internal/sdkv2/suppress.go +++ b/internal/sdkv2/suppress.go @@ -5,6 +5,7 @@ package sdkv2 import ( "strings" + "time" awspolicy "github.com/hashicorp/awspolicyequivalence" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -23,6 +24,20 @@ func SuppressEquivalentJSONDocuments(k, old, new string, d *schema.ResourceData) return json.EqualStrings(old, new) } +// SuppressEquivalentRoundedTime returns a difference suppression function that compares +// two time value with the specified layout rounded to the specified duration. +func SuppressEquivalentRoundedTime(layout string, d time.Duration) schema.SchemaDiffSuppressFunc { + return func(k, old, new string, _ *schema.ResourceData) bool { + if old, err := time.Parse(layout, old); err == nil { + if new, err := time.Parse(layout, new); err == nil { + return old.Round(d).Equal(new.Round(d)) + } + } + + return false + } +} + // SuppressEquivalentIAMPolicyDocuments provides custom difference suppression // for IAM policy documents in the given strings that are equivalent. func SuppressEquivalentIAMPolicyDocuments(k, old, new string, d *schema.ResourceData) bool { diff --git a/internal/verify/diff_test.go b/internal/sdkv2/suppress_test.go similarity index 98% rename from internal/verify/diff_test.go rename to internal/sdkv2/suppress_test.go index dc4cce0fd59b..697c59afab7b 100644 --- a/internal/verify/diff_test.go +++ b/internal/sdkv2/suppress_test.go @@ -1,7 +1,7 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package verify +package sdkv2 import ( "testing" diff --git a/internal/service/ec2/ec2_ami.go b/internal/service/ec2/ec2_ami.go index a4f2dd919d5b..aedcff5b9a15 100644 --- a/internal/service/ec2/ec2_ami.go +++ b/internal/service/ec2/ec2_ami.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -81,7 +82,7 @@ func resourceAMI() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.IsRFC3339Time, - DiffSuppressFunc: verify.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), + DiffSuppressFunc: sdkv2.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), DiffSuppressOnRefresh: true, }, names.AttrDescription: { diff --git a/internal/service/ec2/ec2_ami_copy.go b/internal/service/ec2/ec2_ami_copy.go index 35395762d5a2..79924897e107 100644 --- a/internal/service/ec2/ec2_ami_copy.go +++ b/internal/service/ec2/ec2_ami_copy.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" @@ -59,7 +60,7 @@ func resourceAMICopy() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.IsRFC3339Time, - DiffSuppressFunc: verify.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), + DiffSuppressFunc: sdkv2.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), DiffSuppressOnRefresh: true, }, names.AttrDescription: { diff --git a/internal/service/ec2/ec2_ami_from_instance.go b/internal/service/ec2/ec2_ami_from_instance.go index 64091291eb58..cd9b2824fb96 100644 --- a/internal/service/ec2/ec2_ami_from_instance.go +++ b/internal/service/ec2/ec2_ami_from_instance.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -59,7 +59,7 @@ func resourceAMIFromInstance() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.IsRFC3339Time, - DiffSuppressFunc: verify.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), + DiffSuppressFunc: sdkv2.SuppressEquivalentRoundedTime(time.RFC3339, time.Minute), DiffSuppressOnRefresh: true, }, names.AttrDescription: { diff --git a/internal/verify/diff.go b/internal/verify/diff.go index ca7791c2ced2..0a6e41dae4e0 100644 --- a/internal/verify/diff.go +++ b/internal/verify/diff.go @@ -4,27 +4,11 @@ package verify import ( - "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) // Find JSON diff functions in the json.go file. -// SuppressEquivalentRoundedTime returns a difference suppression function that compares -// two time value with the specified layout rounded to the specified duration. -func SuppressEquivalentRoundedTime(layout string, d time.Duration) schema.SchemaDiffSuppressFunc { - return func(k, old, new string, _ *schema.ResourceData) bool { - if old, err := time.Parse(layout, old); err == nil { - if new, err := time.Parse(layout, new); err == nil { - return old.Round(d).Equal(new.Round(d)) - } - } - - return false - } -} - // SuppressMissingOptionalConfigurationBlock handles configuration block attributes in the following scenario: // - The resource schema includes an optional configuration block with defaults // - The API response includes those defaults to refresh into the Terraform state From 2334e06a547c186145c23d65f43e96f40c8e4cfc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 5 Feb 2025 14:53:11 -0500 Subject: [PATCH 215/232] Slight simplification. --- internal/provider/wrap.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/internal/provider/wrap.go b/internal/provider/wrap.go index 85bdeaf24bdd..b2bdcc45c936 100644 --- a/internal/provider/wrap.go +++ b/internal/provider/wrap.go @@ -120,15 +120,9 @@ func (w *wrappedResource) state(f schema.StateContextFunc) schema.StateContextFu func (w *wrappedResource) customizeDiff(f schema.CustomizeDiffFunc) schema.CustomizeDiffFunc { if w.opts.usesTransparentTagging { if f == nil { - return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { - ctx = w.opts.bootstrapContext(ctx, meta) - return setTagsAll(ctx, d, meta) - } + return w.customizeDiffWithBootstrappedContext(setTagsAll) } else { - return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { - ctx = w.opts.bootstrapContext(ctx, meta) - return customdiff.Sequence(setTagsAll, f)(ctx, d, meta) - } + return w.customizeDiffWithBootstrappedContext(customdiff.Sequence(setTagsAll, f)) } } @@ -136,7 +130,11 @@ func (w *wrappedResource) customizeDiff(f schema.CustomizeDiffFunc) schema.Custo return nil } - return func(ctx context.Context, d *schema.ResourceDiff, meta any) error { + return w.customizeDiffWithBootstrappedContext(f) +} + +func (w *wrappedResource) customizeDiffWithBootstrappedContext(f schema.CustomizeDiffFunc) schema.CustomizeDiffFunc { + return func(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error { ctx = w.opts.bootstrapContext(ctx, meta) return f(ctx, d, meta) } From e0ea87a088ed5b8ad764861cb8c0f1227d436318 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 08:15:09 -0500 Subject: [PATCH 216/232] Remove transparent tagging CustomizeDiff from skaff generated code. --- skaff/resource/resource.gtpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/skaff/resource/resource.gtpl b/skaff/resource/resource.gtpl index f410b6e8d6aa..a30f6930878a 100644 --- a/skaff/resource/resource.gtpl +++ b/skaff/resource/resource.gtpl @@ -195,9 +195,6 @@ func Resource{{ .Resource }}() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), {{- end }} }, - {{- if .IncludeTags }} - CustomizeDiff: verify.SetTagsDiff, - {{- end }} } } From ea165b97e5acbd5ee2cc15dd5ed6df92246c0651 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 08:17:41 -0500 Subject: [PATCH 217/232] Remove transparent tagging CustomizeDiff from Contributor Guide. --- docs/resource-tagging.md | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/docs/resource-tagging.md b/docs/resource-tagging.md index f7f7f4535724..97abc6595afb 100644 --- a/docs/resource-tagging.md +++ b/docs/resource-tagging.md @@ -163,8 +163,8 @@ The `tags_all` attribute contains a union of the tags set directly on the resour } ``` -Add a plan modifier (Terraform Plugin Framework) or a `CustomizeDiff` function (Terraform Plugin SDK V2) to ensure tagging diffs are handled appropriately. -These functions handle the combination of tags set on the resource and default tags, and must be set for tagging to function properly. +Add a plan modifier (Terraform Plugin Framework) to ensure tagging diffs are handled appropriately. +This functiojn handles the combination of tags set on the resource and default tags, and must be set for tagging to function properly. === "Terraform Plugin Framework (Preferred)" ```go @@ -173,16 +173,6 @@ These functions handle the combination of tags set on the resource and default t } ``` -=== "Terraform Plugin SDK V2" - ```go - func ResourceExample() *schema.Resource { - return &schema.Resource{ - /* ... other configuration ... */ - CustomizeDiff: verify.SetTagsDiff, - } - } - ``` - If the resource already implements `ModifyPlan`, simply include the `SetTagsAll` function at the end of the method body. ### Transparent Tagging From 255a8c5b11934c78ea17d0246fb6cf912249cc1a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:58:58 -0500 Subject: [PATCH 218/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - appstream. --- internal/service/appstream/fleet.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index b6b93a5dffbe..612e92a126d0 100644 --- a/internal/service/appstream/fleet.go +++ b/internal/service/appstream/fleet.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/appstream" awstypes "github.com/aws/aws-sdk-go-v2/service/appstream/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -42,9 +41,7 @@ func ResourceFleet() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence( - resourceFleetCustDiff, - ), + CustomizeDiff: resourceFleetCustDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { From eb8b3bc6dfcee2664019a228f8a61902144ef5f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:58:59 -0500 Subject: [PATCH 219/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - batch. --- internal/service/batch/compute_environment.go | 5 +---- internal/service/batch/job_definition.go | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go index 4a71d7afaa25..f0d991562f89 100644 --- a/internal/service/batch/compute_environment.go +++ b/internal/service/batch/compute_environment.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/batch" awstypes "github.com/aws/aws-sdk-go-v2/service/batch/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -47,9 +46,7 @@ func resourceComputeEnvironment() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence( - resourceComputeEnvironmentCustomizeDiff, - ), + CustomizeDiff: resourceComputeEnvironmentCustomizeDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go index 363ff547c2bd..8e2f9e49baf7 100644 --- a/internal/service/batch/job_definition.go +++ b/internal/service/batch/job_definition.go @@ -16,7 +16,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/batch/types" "github.com/hashicorp/go-cty/cty" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" @@ -572,9 +571,7 @@ func resourceJobDefinition() *schema.Resource { }, }, - CustomizeDiff: customdiff.Sequence( - jobDefinitionCustomizeDiff, - ), + CustomizeDiff: jobDefinitionCustomizeDiff, } } From fbe484f2a5ab969268304bb8951f0c152e2ed587 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:00 -0500 Subject: [PATCH 220/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - chime. --- internal/service/chime/voice_connector.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/chime/voice_connector.go b/internal/service/chime/voice_connector.go index a4556f568fe6..cad72c33355a 100644 --- a/internal/service/chime/voice_connector.go +++ b/internal/service/chime/voice_connector.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" awstypes "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -66,9 +65,7 @@ func ResourceVoiceConnector() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: customdiff.All( - resourceVoiceConnectorDefaultRegion, - ), + CustomizeDiff: resourceVoiceConnectorDefaultRegion, } } From ed4ce03ad64b1604e96d6520ee49476733ad7cb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:04 -0500 Subject: [PATCH 221/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - directconnect. --- internal/service/directconnect/public_virtual_interface.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/directconnect/public_virtual_interface.go b/internal/service/directconnect/public_virtual_interface.go index 184b173c139f..09aeb41fa63d 100644 --- a/internal/service/directconnect/public_virtual_interface.go +++ b/internal/service/directconnect/public_virtual_interface.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/directconnect" awstypes "github.com/aws/aws-sdk-go-v2/service/directconnect/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -39,9 +38,7 @@ func resourcePublicVirtualInterface() *schema.Resource { StateContext: resourcePublicVirtualInterfaceImport, }, - CustomizeDiff: customdiff.Sequence( - resourcePublicVirtualInterfaceCustomizeDiff, - ), + CustomizeDiff: resourcePublicVirtualInterfaceCustomizeDiff, Schema: map[string]*schema.Schema{ "address_family": { From 543270275b06b9e31cad182107ee6d966003f2e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:05 -0500 Subject: [PATCH 222/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - ec2. --- internal/service/ec2/ebs_volume.go | 5 +---- internal/service/ec2/ec2_fleet.go | 5 +---- internal/service/ec2/ec2_placement_group.go | 5 +---- internal/service/ec2/ipam_pool_cidr.go | 5 +---- internal/service/ec2/vpc_.go | 5 +---- internal/service/ec2/vpc_nat_gateway.go | 5 +---- internal/service/ec2/vpnsite_connection.go | 5 +---- 7 files changed, 7 insertions(+), 28 deletions(-) diff --git a/internal/service/ec2/ebs_volume.go b/internal/service/ec2/ebs_volume.go index 2734ff0bab88..7edcc9edafc2 100644 --- a/internal/service/ec2/ebs_volume.go +++ b/internal/service/ec2/ebs_volume.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -47,9 +46,7 @@ func resourceEBSVolume() *schema.Resource { Delete: schema.DefaultTimeout(10 * time.Minute), }, - CustomizeDiff: customdiff.Sequence( - resourceEBSVolumeCustomizeDiff, - ), + CustomizeDiff: resourceEBSVolumeCustomizeDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/ec2/ec2_fleet.go b/internal/service/ec2/ec2_fleet.go index 1eb428ca0bdc..b69225c96f89 100644 --- a/internal/service/ec2/ec2_fleet.go +++ b/internal/service/ec2/ec2_fleet.go @@ -17,7 +17,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -50,9 +49,7 @@ func resourceFleet() *schema.Resource { Update: schema.DefaultTimeout(10 * time.Minute), }, - CustomizeDiff: customdiff.All( - resourceFleetCustomizeDiff, - ), + CustomizeDiff: resourceFleetCustomizeDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { diff --git a/internal/service/ec2/ec2_placement_group.go b/internal/service/ec2/ec2_placement_group.go index ac2961f9a6cf..49311834f768 100644 --- a/internal/service/ec2/ec2_placement_group.go +++ b/internal/service/ec2/ec2_placement_group.go @@ -14,7 +14,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -78,9 +77,7 @@ func resourcePlacementGroup() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: customdiff.All( - resourcePlacementGroupCustomizeDiff, - ), + CustomizeDiff: resourcePlacementGroupCustomizeDiff, } } diff --git a/internal/service/ec2/ipam_pool_cidr.go b/internal/service/ec2/ipam_pool_cidr.go index 9454465679f0..24fcc9db2008 100644 --- a/internal/service/ec2/ipam_pool_cidr.go +++ b/internal/service/ec2/ipam_pool_cidr.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -42,9 +41,7 @@ func resourceIPAMPoolCIDR() *schema.Resource { Delete: schema.DefaultTimeout(32 * time.Minute), }, - CustomizeDiff: customdiff.All( - resourceIPAMPoolCIDRCustomizeDiff, - ), + CustomizeDiff: resourceIPAMPoolCIDRCustomizeDiff, Schema: map[string]*schema.Schema{ "cidr": { diff --git a/internal/service/ec2/vpc_.go b/internal/service/ec2/vpc_.go index 2f5b19768ba4..32b730b07bab 100644 --- a/internal/service/ec2/vpc_.go +++ b/internal/service/ec2/vpc_.go @@ -17,7 +17,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -65,9 +64,7 @@ func resourceVPC() *schema.Resource { StateContext: resourceVPCImport, }, - CustomizeDiff: customdiff.All( - resourceVPCCustomizeDiff, - ), + CustomizeDiff: resourceVPCCustomizeDiff, SchemaVersion: 1, MigrateState: vpcMigrateState, diff --git a/internal/service/ec2/vpc_nat_gateway.go b/internal/service/ec2/vpc_nat_gateway.go index c7f304e5839b..023fc857bb56 100644 --- a/internal/service/ec2/vpc_nat_gateway.go +++ b/internal/service/ec2/vpc_nat_gateway.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -108,9 +107,7 @@ func resourceNATGateway() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: customdiff.All( - resourceNATGatewayCustomizeDiff, - ), + CustomizeDiff: resourceNATGatewayCustomizeDiff, } } diff --git a/internal/service/ec2/vpnsite_connection.go b/internal/service/ec2/vpnsite_connection.go index 15286f00e244..dc82fc1be772 100644 --- a/internal/service/ec2/vpnsite_connection.go +++ b/internal/service/ec2/vpnsite_connection.go @@ -21,7 +21,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -630,9 +629,7 @@ func resourceVPNConnection() *schema.Resource { }, }, - CustomizeDiff: customdiff.Sequence( - customizeDiffValidateOutsideIPAddressType, - ), + CustomizeDiff: customizeDiffValidateOutsideIPAddressType, } } From 833f511a2177797cbcda5cd53ec83e0debdac6f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:06 -0500 Subject: [PATCH 223/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - elasticache. --- internal/service/elasticache/subnet_group.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/elasticache/subnet_group.go b/internal/service/elasticache/subnet_group.go index c8a09f3b2c47..4b73481db170 100644 --- a/internal/service/elasticache/subnet_group.go +++ b/internal/service/elasticache/subnet_group.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/elasticache" awstypes "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,9 +72,7 @@ func resourceSubnetGroup() *schema.Resource { }, }, - CustomizeDiff: customdiff.All( - resourceSubnetGroupCustomizeDiff, - ), + CustomizeDiff: resourceSubnetGroupCustomizeDiff, } } From 0a2fa87b54f9c3b1ae9fb2f0bc81f440e2ec3a0d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:09 -0500 Subject: [PATCH 224/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - iot. --- internal/service/iot/authorizer.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/iot/authorizer.go b/internal/service/iot/authorizer.go index 483e8cc36353..c186bea39c5e 100644 --- a/internal/service/iot/authorizer.go +++ b/internal/service/iot/authorizer.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/iot" awstypes "github.com/aws/aws-sdk-go-v2/service/iot/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -41,9 +40,7 @@ func resourceAuthorizer() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence( - resourceAuthorizerCustomizeDiff, - ), + CustomizeDiff: resourceAuthorizerCustomizeDiff, Schema: map[string]*schema.Schema{ names.AttrARN: { From c3daf6fd748fb7e195842bddcdad93738aad6aa2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:17 -0500 Subject: [PATCH 225/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - rolesanywhere. --- internal/service/rolesanywhere/trust_anchor.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/rolesanywhere/trust_anchor.go b/internal/service/rolesanywhere/trust_anchor.go index ec80adb96eae..53b97736e65d 100644 --- a/internal/service/rolesanywhere/trust_anchor.go +++ b/internal/service/rolesanywhere/trust_anchor.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/rolesanywhere" awstypes "github.com/aws/aws-sdk-go-v2/service/rolesanywhere/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -134,9 +133,7 @@ func resourceTrustAnchor() *schema.Resource { names.AttrTagsAll: tftags.TagsSchemaComputed(), }, - CustomizeDiff: customdiff.Sequence( - customizeDiffNotificationSettings, - ), + CustomizeDiff: customizeDiffNotificationSettings, } } From 869ce124a528e3fb47eb81191bc25ba3c38cb7d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:17 -0500 Subject: [PATCH 226/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - route53. --- internal/service/route53/health_check.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/route53/health_check.go b/internal/service/route53/health_check.go index 9a5e0a68f31d..e9fc8eb122a7 100644 --- a/internal/service/route53/health_check.go +++ b/internal/service/route53/health_check.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/route53" awstypes "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -183,9 +182,7 @@ func resourceHealthCheck() *schema.Resource { }, }, - CustomizeDiff: customdiff.Sequence( - triggersCustomizeDiff, - ), + CustomizeDiff: triggersCustomizeDiff, } } From 95214be7dbc1143f47bee3acd24f79d2e0fd847c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:18 -0500 Subject: [PATCH 227/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - route53resolver. --- internal/service/route53resolver/rule.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/route53resolver/rule.go b/internal/service/route53resolver/rule.go index 8a1ca5255231..ca386b979b57 100644 --- a/internal/service/route53resolver/rule.go +++ b/internal/service/route53resolver/rule.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/route53resolver" awstypes "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -116,9 +115,7 @@ func resourceRule() *schema.Resource { }, }, - CustomizeDiff: customdiff.Sequence( - resourceRuleCustomizeDiff, - ), + CustomizeDiff: resourceRuleCustomizeDiff, } } From a2b9d532a60d12d3d2ffd433085f70760492dbaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:18 -0500 Subject: [PATCH 228/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - s3. --- internal/service/s3/bucket_object.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/s3/bucket_object.go b/internal/service/s3/bucket_object.go index 650d7366e317..6ebd16412cbe 100644 --- a/internal/service/s3/bucket_object.go +++ b/internal/service/s3/bucket_object.go @@ -21,7 +21,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -53,9 +52,7 @@ func resourceBucketObject() *schema.Resource { StateContext: resourceBucketObjectImport, }, - CustomizeDiff: customdiff.Sequence( - resourceBucketObjectCustomizeDiff, - ), + CustomizeDiff: resourceBucketObjectCustomizeDiff, Schema: map[string]*schema.Schema{ "acl": { From 8bba3f6452a4b8cdc36af69d542e8f6268ee20ca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:19 -0500 Subject: [PATCH 229/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - servicecatalog. --- internal/service/servicecatalog/provisioned_product.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 092c93955d76..207e163b3f7e 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -264,9 +263,7 @@ func resourceProvisionedProduct() *schema.Resource { }, }, - CustomizeDiff: customdiff.All( - refreshOutputsDiff, - ), + CustomizeDiff: refreshOutputsDiff, } } From 8549e2db9183ed142c45acb2f616248d6f1d31a9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:20 -0500 Subject: [PATCH 230/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - sns. --- internal/service/sns/topic.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go index 0db0db808b40..ddebe85f3d8e 100644 --- a/internal/service/sns/topic.go +++ b/internal/service/sns/topic.go @@ -17,7 +17,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/aws-sdk-go-v2/service/sns/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" @@ -252,9 +251,7 @@ func resourceTopic() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence( - resourceTopicCustomizeDiff, - ), + CustomizeDiff: resourceTopicCustomizeDiff, Schema: topicSchema, } From 80fca0cd585e5f03e180893328fb6fc1e4d1aed1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 15:59:20 -0500 Subject: [PATCH 231/232] Simplify 'customdiff.All' and 'customdiff.Sequence' with single argument - sqs. --- internal/service/sqs/queue.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/service/sqs/queue.go b/internal/service/sqs/queue.go index 357e76d7ecbb..261efd00fec7 100644 --- a/internal/service/sqs/queue.go +++ b/internal/service/sqs/queue.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" awspolicy "github.com/hashicorp/awspolicyequivalence" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" @@ -202,9 +201,7 @@ func resourceQueue() *schema.Resource { StateContext: schema.ImportStatePassthroughContext, }, - CustomizeDiff: customdiff.Sequence( - resourceQueueCustomizeDiff, - ), + CustomizeDiff: resourceQueueCustomizeDiff, Schema: queueSchema, From 679801d785be059866e2d7db62660593555bbea6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 6 Feb 2025 16:35:56 -0500 Subject: [PATCH 232/232] Add semgrep rules for CustomizeDiff simplification. --- .ci/semgrep/pluginsdk/customdiff.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .ci/semgrep/pluginsdk/customdiff.yml diff --git a/.ci/semgrep/pluginsdk/customdiff.yml b/.ci/semgrep/pluginsdk/customdiff.yml new file mode 100644 index 000000000000..80c552ced531 --- /dev/null +++ b/.ci/semgrep/pluginsdk/customdiff.yml @@ -0,0 +1,24 @@ +rules: + - id: simplify-customizediff-all-single + languages: [go] + message: Simplify CustomizeDiff All + paths: + include: + - "internal/service/*/*.go" + exclude: + - "internal/service/*/*_test.go" + patterns: + - pattern-regex: CustomizeDiff:\s+customdiff\.All\(\s*[a-zA-Z0-9]+,?\s*\) + severity: WARNING + + - id: simplify-customizediff-sequence-single + languages: [go] + message: Simplify CustomizeDiff Sequence + paths: + include: + - "internal/service/*/*.go" + exclude: + - "internal/service/*/*_test.go" + patterns: + - pattern-regex: CustomizeDiff:\s+customdiff\.Sequence\(\s*[a-zA-Z0-9]+,?\s*\) + severity: WARNING