structs for useragent

Author: drewmullen

.gitignore

@@ -23,6 +23,7 @@ website/node_modules
 .idea
 *.iml
 *.test
+*__debug_bin
 
 website/vendor
 

internal/acctest/data.go

@@ -46,14 +46,49 @@ terraform {
 			name    = "my-test-module"
 			version = "0.0.1"
 			comment = "testing user-agent comment"
-		  }]
+		  },
+		  {
+			name    = "2nd-user-agent"
+			version = "0.0.1"
+			comment = "2nd user agent"
+		  }
+		]
 	}
 }
 `, role) + config
 	}
 	return config
 }
 
+func (td *TestData) MetadataConfig() string {
+	config := fmt.Sprintf(`
+resource %[1]q %[2]q {}
+`, td.TerraformResourceType, td.ResourceLabel)
+
+	config = fmt.Sprintf(`
+resource awscc_ec2_vpc drew {
+	cidr_block = "10.0.0.0/16"
+}
+
+terraform {
+	provider_meta "awscc" {
+		user_agent = [{
+			product_name    = "my-test-module"
+			product_version = "0.0.1"
+			comment = "testing user-agent comment"
+		  },
+		  {
+			product_name    = "2nd-user-agent"
+			product_version = "0.0.1"
+			comment = "2nd user agent"
+		  }
+		]
+	}
+}
+` + config)
+	return config
+}
+
 // DataSourceWithEmptyResourceConfig returns a Terraform configuration for the data source and its respective resource.
 func (td *TestData) DataSourceWithEmptyResourceConfig() string {
 	return td.EmptyConfig() + fmt.Sprintf(`

internal/aws/ec2/vpc_resource_gen_test.go

@@ -13,6 +13,7 @@ import (
 	hclog "github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	tfcloudcontrol "github.com/hashicorp/terraform-provider-awscc/internal/service/cloudcontrol"
@@ -394,11 +395,33 @@ var (
 	idAttributePath = tftypes.NewAttributePath().WithAttributeName("id")
 )
 
+type meta struct {
+	UserAgents []userAgentProduct `tfsdk:"user_agent"`
+}
+
+type userAgentProduct struct {
+	ProductName    types.String `tfsdk:"product_name"`
+	ProductVersion types.String `tfsdk:"product_version"`
+	Comment        types.String `tfsdk:"comment"`
+}
+
 func (r *resource) Create(ctx context.Context, request tfsdk.CreateResourceRequest, response *tfsdk.CreateResourceResponse) {
 	ctx = r.cfnTypeContext(ctx)
 
 	traceEntry(ctx, "Resource.Create")
 
+	var m []meta
+	providerMeta := request.ProviderMeta
+
+	diags := providerMeta.Get(ctx, &m)
+
+	// userAgentProducts
+
+	//(*(*r).resourceType).cfTypeName == "AWS::EC2::VPC"
+	//providerMeta.Raw.value != nil
+	// newCtx := context.WithValue(ctx, "meta", m)
+
+	// conn := r.provider.CloudControlApiClient(newCtx)
 	conn := r.provider.CloudControlApiClient(ctx)
 
 	tflog.Debug(ctx, "Request.Plan.Raw", map[string]interface{}{
@@ -480,7 +503,7 @@ func (r *resource) Create(ctx context.Context, request tfsdk.CreateResourceReque
 		}
 	}
 
-	diags := r.populateUnknownValues(ctx, id, &response.State)
+	diags = r.populateUnknownValues(ctx, id, &response.State)
 
 	if diags.HasError() {
 		response.Diagnostics.Append(diags...)

internal/generic/resource.go

@@ -304,6 +304,9 @@ type providerData struct {
 	UserAgent                 []userAgentProduct             `tfsdk:"user_agent"`
 	terraformVersion          string
 }
+type providerMeta struct {
+	UserAgent []userAgentProduct `tfsdk:"user_agent"`
+}
 
 type userAgentProduct struct {
 	ProductName    types.String `tfsdk:"product_name"`
@@ -508,6 +511,8 @@ func (p *AwsCloudControlApiProvider) RoleARN(_ context.Context) string {
 
 // newCloudControlClient configures and returns a fully initialized AWS Cloud Control API client with the configured region.
 func newCloudControlClient(ctx context.Context, pd *providerData) (*cloudcontrol.Client, string, error) {
+	// m, _ := ctx.Value("meta").(*tfsdk.Config) // _ was ok
+
 	config := awsbase.Config{
 		AccessKey:              pd.AccessKey.Value,
 		CallerDocumentationURL: "https://registry.terraform.io/providers/hashicorp/awscc",
@@ -527,6 +532,7 @@ func newCloudControlClient(ctx context.Context, pd *providerData) (*cloudcontrol
 		},
 	}
 	config.UserAgent = userAgentProducts(pd.UserAgent)
+	// config.UserAgent = userAgentProducts(m.Schema.)
 	if pd.MaxRetries.Null {
 		config.MaxRetries = defaultMaxRetries
 	} else {