Merge pull request #38243 from drewtul/f-sc-appregistry-application-u…

…pdates Add tags to application resource and datasource
hashicorp · Dec 6, 2024 · e7b7dd0 · e7b7dd0
2 parents 622c1b5 + 5e14f8b
commit e7b7dd0
Show file tree

Hide file tree

Showing 19 changed files with 2,745 additions and 2 deletions.
diff --git a/.changelog/38243.txt b/.changelog/38243.txt
@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_servicecatalogappregistry_application: Add `tags` argument and `tags_all` attribute
+```
+
+```release-note:enhancement
+data-source/aws_servicecatalogappregistry_application: Add `tags` attribute
+```
diff --git a/internal/service/servicecatalogappregistry/application.go b/internal/service/servicecatalogappregistry/application.go
@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -21,12 +22,13 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
 	"github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
+	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 // @FrameworkResource("aws_servicecatalogappregistry_application", name="Application")
-// @Testing(tagsTest=false)
+// @Tags(identifierAttribute="arn")
 func newResourceApplication(_ context.Context) (resource.ResourceWithConfigure, error) {
 	return &resourceApplication{}, nil
 }
@@ -63,7 +65,12 @@ func (r *resourceApplication) Schema(ctx context.Context, req resource.SchemaReq
 			"application_tag": schema.MapAttribute{
 				ElementType: types.StringType,
 				Computed:    true,
+				PlanModifiers: []planmodifier.Map{
+					mapplanmodifier.UseStateForUnknown(),
+				},
 			},
+			names.AttrTags:    tftags.TagsAttribute(),
+			names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
 		},
 	}
 }
@@ -83,6 +90,8 @@ func (r *resourceApplication) Create(ctx context.Context, req resource.CreateReq
 		return
 	}
 
+	in.Tags = getTagsIn(ctx)
+
 	out, err := conn.CreateApplication(ctx, in)
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -199,6 +208,10 @@ func (r *resourceApplication) ImportState(ctx context.Context, req resource.Impo
 	resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp)
 }
 
+func (r *resourceApplication) ModifyPlan(ctx context.Context, request resource.ModifyPlanRequest, response *resource.ModifyPlanResponse) {
+	r.SetTagsAll(ctx, request, response)
+}
+
 func findApplicationByID(ctx context.Context, conn *servicecatalogappregistry.Client, id string) (*servicecatalogappregistry.GetApplicationOutput, error) {
 	in := &servicecatalogappregistry.GetApplicationInput{
 		Application: aws.String(id),
@@ -229,4 +242,6 @@ type resourceApplicationData struct {
 	ID             types.String `tfsdk:"id"`
 	Name           types.String `tfsdk:"name"`
 	ApplicationTag types.Map    `tfsdk:"application_tag"`
+	Tags           tftags.Map   `tfsdk:"tags"`
+	TagsAll        tftags.Map   `tfsdk:"tags_all"`
 }
diff --git a/internal/service/servicecatalogappregistry/application_data_source.go b/internal/service/servicecatalogappregistry/application_data_source.go
@@ -12,11 +12,12 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
 	"github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
+	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 // @FrameworkDataSource("aws_servicecatalogappregistry_application", name="Application")
-// @Testing(tagsTest=false)
+// @Tags(identifierAttribute="arn")
 func newDataSourceApplication(context.Context) (datasource.DataSourceWithConfigure, error) {
 	return &dataSourceApplication{}, nil
 }
@@ -50,11 +51,13 @@ func (d *dataSourceApplication) Schema(ctx context.Context, req datasource.Schem
 				ElementType: types.StringType,
 				Computed:    true,
 			},
+			names.AttrTags: tftags.TagsAttributeComputedOnly(),
 		},
 	}
 }
 func (d *dataSourceApplication) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	conn := d.Meta().ServiceCatalogAppRegistryClient(ctx)
+	ignoreTagsConfig := d.Meta().IgnoreTagsConfig(ctx)
 
 	var data dataSourceApplicationData
 	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
@@ -72,6 +75,10 @@ func (d *dataSourceApplication) Read(ctx context.Context, req datasource.ReadReq
 	}
 
 	resp.Diagnostics.Append(flex.Flatten(ctx, out, &data)...)
+
+	// Transparent tagging doesn't work for DataSource yet
+	data.Tags = tftags.NewMapFromMapValue(flex.FlattenFrameworkStringValueMapLegacy(ctx, KeyValueTags(ctx, out.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()))
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
@@ -81,4 +88,5 @@ type dataSourceApplicationData struct {
 	ID             types.String `tfsdk:"id"`
 	Name           types.String `tfsdk:"name"`
 	ApplicationTag types.Map    `tfsdk:"application_tag"`
+	Tags           tftags.Map   `tfsdk:"tags"`
 }
diff --git a/internal/service/servicecatalogappregistry/application_data_source_tags_gen_test.go b/internal/service/servicecatalogappregistry/application_data_source_tags_gen_test.go