add module_name provider metadata

equinix/data_source_metal_project_acc_test.go

@@ -38,6 +38,12 @@ func TestAccDataSourceMetalProject_basic(t *testing.T) {
 
 func testAccDataSourceMetalProject_basic(r string) string {
 	return fmt.Sprintf(`
+terraform {
+	provider_meta "equinix" {
+		module_name = "test"
+	}
+}
+
 resource "equinix_metal_project" "foobar" {
 	name = "tfacc-project-%s"
 	bgp_config {

equinix/helpers_device.go

@@ -188,6 +188,12 @@ func waitForDeviceAttribute(d *schema.ResourceData, targets []string, pending []
 		Target:  targets,
 		Refresh: func() (interface{}, string, error) {
 			client := meta.(*Config).metal
+
+			userAgent, err := generateUserAgentString(d, client.UserAgent)
+			if err != nil {
+				return "error", "error", err
+			}
+			client.UserAgent = userAgent
 			device, _, err := client.Devices.Get(d.Id(), &packngo.GetOptions{Includes: []string{"project"}})
 			if err == nil {
 				retAttrVal := device.State
@@ -216,7 +222,13 @@ func waitForDeviceAttribute(d *schema.ResourceData, targets []string, pending []
 // powerOnAndWait Powers on the device and waits for it to be active.
 func powerOnAndWait(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
-	_, err := client.Devices.PowerOn(d.Id())
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+	_, err = client.Devices.PowerOn(d.Id())
 	if err != nil {
 		return friendlyError(err)
 	}

equinix/port_helpers.go

@@ -20,6 +20,12 @@ type ClientPortResource struct {
 func getClientPortResource(d *schema.ResourceData, meta interface{}) (*ClientPortResource, *packngo.Response, error) {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return nil, nil, err
+	}
+	client.UserAgent = userAgent
+
 	port_id := d.Get("port_id").(string)
 
 	getOpts := &packngo.GetOptions{Includes: []string{

equinix/provider.go

@@ -162,6 +162,12 @@ func Provider() *schema.Provider {
 			"equinix_metal_port_vlan_attachment": resourceMetalPortVlanAttachment(),
 			"equinix_metal_gateway":              resourceMetalGateway(),
 		},
+		ProviderMetaSchema: map[string]*schema.Schema{
+			"module_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+		},
 	}
 
 	provider.ConfigureContextFunc = func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
@@ -170,6 +176,10 @@ func Provider() *schema.Provider {
 	return provider
 }
 
+type providerMeta struct {
+	ModuleName string `cty:"module_name"`
+}
+
 func configureProvider(ctx context.Context, d *schema.ResourceData, p *schema.Provider) (interface{}, diag.Diagnostics) {
 	mrws := d.Get("max_retry_wait_seconds").(int)
 	rt := d.Get("request_timeout").(int)
@@ -185,7 +195,11 @@ func configureProvider(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 		MaxRetries:     d.Get("max_retries").(int),
 		MaxRetryWait:   time.Duration(mrws) * time.Second,
 	}
+	meta := providerMeta{}
 
+	if err := d.GetProviderMeta(&meta); err != nil {
+		return nil, diag.FromErr(err)
+	}
 	config.terraformVersion = p.TerraformVersion
 	if config.terraformVersion == "" {
 		// Terraform 0.12 introduced this field to the protocol
@@ -403,3 +417,18 @@ func schemaSetToMap(set *schema.Set) map[int]interface{} {
 	}
 	return transformed
 }
+
+func generateUserAgentString(d *schema.ResourceData, currentUserAgent string) (string, error) {
+	var m providerMeta
+
+	err := d.GetProviderMeta(&m)
+	if err != nil {
+		return currentUserAgent, err
+	}
+
+	if m.ModuleName != "" {
+		return strings.Join([]string{m.ModuleName, currentUserAgent}, " "), nil
+	}
+
+	return currentUserAgent, nil
+}

equinix/resource_metal_bgp_session.go

@@ -50,6 +50,13 @@ func resourceMetalBGPSession() *schema.Resource {
 
 func resourceMetalBGPSessionCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	dID := d.Get("device_id").(string)
 	addressFamily := d.Get("address_family").(string)
 	defaultRoute := d.Get("default_route").(bool)
@@ -69,6 +76,12 @@ func resourceMetalBGPSessionCreate(d *schema.ResourceData, meta interface{}) err
 
 func resourceMetalBGPSessionRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	bgpSession, _, err := client.BGPSessions.Get(d.Id(),
 		&packngo.GetOptions{Includes: []string{"device"}})
 	if err != nil {
@@ -97,6 +110,12 @@ func resourceMetalBGPSessionRead(d *schema.ResourceData, meta interface{}) error
 
 func resourceMetalBGPSessionDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	resp, err := client.BGPSessions.Delete(d.Id())
 	return ignoreResponseErrors(httpForbidden, httpNotFound)(resp, err)
 }

equinix/resource_metal_connection.go

@@ -188,6 +188,12 @@ func resourceMetalConnection() *schema.Resource {
 func resourceMetalConnectionCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	facility, facOk := d.GetOk("facility")
 	metro, metOk := d.GetOk("metro")
 
@@ -290,6 +296,12 @@ func resourceMetalConnectionCreate(d *schema.ResourceData, meta interface{}) err
 func resourceMetalConnectionUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	if d.HasChange("locked") {
 		var action func(string) (*packngo.Response, error)
 		if d.Get("locked").(bool) {
@@ -343,6 +355,12 @@ func resourceMetalConnectionUpdate(d *schema.ResourceData, meta interface{}) err
 
 func resourceMetalConnectionRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	connId := d.Id()
 
 	conn, _, err := client.Connections.Get(
@@ -402,6 +420,12 @@ func resourceMetalConnectionRead(d *schema.ResourceData, meta interface{}) error
 
 func resourceMetalConnectionDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	resp, err := client.Connections.Delete(d.Id(), true)
 	if ignoreResponseErrors(httpForbidden, httpNotFound)(resp, err) != nil {
 		return friendlyError(err)

equinix/resource_metal_device.go

@@ -445,6 +445,12 @@ func shouldReinstall(_ context.Context, d *schema.ResourceDiff, meta interface{}
 func resourceMetalDeviceCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	var addressTypesSlice []packngo.IPAddressCreateRequest
 	_, ok := d.GetOk("ip_address")
 	if ok {
@@ -579,6 +585,12 @@ func resourceMetalDeviceCreate(d *schema.ResourceData, meta interface{}) error {
 func resourceMetalDeviceRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	device, _, err := client.Devices.Get(d.Id(), deviceReadOptions)
 	if err != nil {
 		err = friendlyError(err)
@@ -681,6 +693,12 @@ func resourceMetalDeviceRead(d *schema.ResourceData, meta interface{}) error {
 func resourceMetalDeviceUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	if d.HasChange("locked") {
 		var action func(string) (*packngo.Response, error)
 		if d.Get("locked").(bool) {
@@ -783,6 +801,12 @@ func getReinstallOptions(d *schema.ResourceData) (packngo.DeviceReinstallFields,
 func resourceMetalDeviceDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	fdvIf, fdvOk := d.GetOk("force_detach_volumes")
 	fdv := false
 	if fdvOk && fdvIf.(bool) {

equinix/resource_metal_device_network_type.go

@@ -72,9 +72,15 @@ func getAndPossiblySetNetworkType(d *schema.ResourceData, c *packngo.Client, tar
 
 func resourceMetalDeviceNetworkTypeCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	ntype := d.Get("type").(string)
 
-	err := getAndPossiblySetNetworkType(d, client, ntype)
+	err = getAndPossiblySetNetworkType(d, client, ntype)
 	if err != nil {
 		return err
 	}
@@ -85,6 +91,12 @@ func resourceMetalDeviceNetworkTypeCreate(d *schema.ResourceData, meta interface
 func resourceMetalDeviceNetworkTypeRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	_, devNType, err := getDevIDandNetworkType(d, client)
 	if err != nil {
 		err = friendlyError(err)
@@ -112,6 +124,12 @@ func resourceMetalDeviceNetworkTypeRead(d *schema.ResourceData, meta interface{}
 
 func resourceMetalDeviceNetworkTypeUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	ntype := d.Get("type").(string)
 	if d.HasChange("type") {
 		err := getAndPossiblySetNetworkType(d, client, ntype)

equinix/resource_metal_gateway.go

@@ -95,6 +95,12 @@ func resourceMetalGateway() *schema.Resource {
 func resourceMetalGatewayCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	_, hasIPReservation := d.GetOk("ip_reservation_id")
 	_, hasSubnetSize := d.GetOk("private_ipv4_subnet_size")
 	if !(hasIPReservation || hasSubnetSize) {
@@ -120,6 +126,12 @@ func resourceMetalGatewayCreate(d *schema.ResourceData, meta interface{}) error
 
 func resourceMetalGatewayRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	mgId := d.Id()
 
 	includes := &packngo.GetOptions{Includes: []string{"project", "ip_reservation", "virtual_network", "vrf"}}
@@ -152,6 +164,12 @@ func resourceMetalGatewayRead(d *schema.ResourceData, meta interface{}) error {
 
 func resourceMetalGatewayDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	resp, err := client.MetalGateways.Delete(d.Id())
 	if ignoreResponseErrors(httpForbidden, httpNotFound)(resp, err) != nil {
 		return friendlyError(err)

equinix/resource_metal_ip_attachment.go

@@ -35,6 +35,12 @@ func resourceMetalIPAttachment() *schema.Resource {
 
 func resourceMetalIPAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	deviceID := d.Get("device_id").(string)
 	ipa := d.Get("cidr_notation").(string)
 
@@ -52,6 +58,12 @@ func resourceMetalIPAttachmentCreate(d *schema.ResourceData, meta interface{}) e
 
 func resourceMetalIPAttachmentRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
+
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
 	assignment, _, err := client.DeviceIPs.Get(d.Id(), nil)
 	if err != nil {
 		err = friendlyError(err)
@@ -88,6 +100,12 @@ func resourceMetalIPAttachmentRead(d *schema.ResourceData, meta interface{}) err
 func resourceMetalIPAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).metal
 
+	userAgent, err := generateUserAgentString(d, client.UserAgent)
+	if err != nil {
+		return err
+	}
+	client.UserAgent = userAgent
+
 	resp, err := client.DeviceIPs.Unassign(d.Id())
 	if ignoreResponseErrors(httpForbidden, httpNotFound)(resp, err) != nil {
 		return friendlyError(err)