Merge pull request #44682 from hashicorp/td-logging-resource-attr

Encapsulates resource attribute logging key

Author: gdavison

internal/logging/keys.go

@@ -13,9 +13,13 @@ import (
 const (
 	HTTPKeyRequestBody  = "http.request.body"
 	HTTPKeyResponseBody = "http.response.body"
-	KeyResourceId       = "id"
+	KeyResourceId       = "tf_aws.resource_attribute." + "id"
 )
 
+func ResourceAttributeKey(name string) string {
+	return "tf_aws.resource_attribute." + name
+}
+
 // MaskSensitiveValuesByKey masks sensitive values using tflog
 func MaskSensitiveValuesByKey(ctx context.Context, keys ...string) context.Context {
 	l := baselogging.RetrieveLogger(ctx)

internal/service/ec2/vpc_.go

@@ -31,6 +31,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
 	fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
 	fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
+	"github.com/hashicorp/terraform-provider-aws/internal/logging"
 	"github.com/hashicorp/terraform-provider-aws/internal/provider/sdkv2/importer"
 	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
@@ -875,7 +876,7 @@ func (l *vpcListResource) List(ctx context.Context, request list.ListRequest, st
 			}
 
 			for _, vpc := range page.Vpcs {
-				ctx := tflog.SetField(ctx, "tf_aws.resource_attribute.id", aws.ToString(vpc.VpcId))
+				ctx := tflog.SetField(ctx, logging.ResourceAttributeKey(names.AttrID), aws.ToString(vpc.VpcId))
 
 				result := request.NewListResult(ctx)
 

internal/service/ec2/vpc_subnet.go

@@ -823,7 +823,7 @@ func (l *subnetListResource) List(ctx context.Context, request list.ListRequest,
 			}
 
 			for _, subnet := range page.Subnets {
-				ctx := tflog.SetField(ctx, "tf_aws.resource_attribute.id", aws.ToString(subnet.SubnetId))
+				ctx := tflog.SetField(ctx, logging.ResourceAttributeKey(names.AttrID), aws.ToString(subnet.SubnetId))
 
 				result := request.NewListResult(ctx)