refactor module attribution work

templates/terraform/custom_check_destroy/storage_hmac_key.go.erb

@@ -5,7 +5,7 @@ if err != nil {
   return err
 }
 
-res, err := sendRequest(config, "GET", "", url, nil)
+res, err := sendRequest(config, "GET", "", url, config.userAgent, nil)
 if err != nil {
   return nil
 }

templates/terraform/custom_delete/active_directory_domain_trust.go.erb

@@ -55,13 +55,13 @@
 
     log.Printf("[DEBUG] Deleting DomainTrust %q", d.Id())
 
-    res, err := sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutDelete))
+    res, err := sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutDelete))
     if err != nil {
         return handleNotFoundError(err, d, "DomainTrust")
     }
 
     err = activeDirectoryOperationWaitTime(
-        config, res, project, "Deleting DomainTrust",
+        config, res, project, "Deleting DomainTrust", userAgent,
         d.Timeout(schema.TimeoutDelete))
 
     if err != nil {

templates/terraform/custom_delete/appversion_delete.go.erb

@@ -23,12 +23,12 @@ if d.Get("delete_service_on_destroy") == true {
 	}
 	var obj map[string]interface{}
 	log.Printf("[DEBUG] Deleting Service %q", d.Id())
-	res, err := sendRequestWithTimeout(config, "DELETE", project, url, obj, d.Timeout(schema.TimeoutDelete)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+	res, err := sendRequestWithTimeout(config, "DELETE", project, url, userAgent, obj, d.Timeout(schema.TimeoutDelete)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 	if err != nil {
 		return handleNotFoundError(err, d, "Service")
 	}
 	err = appEngineOperationWaitTime(
-		config, res, project, "Deleting Service",
+		config, res, project, "Deleting Service", userAgent,
 		d.Timeout(schema.TimeoutDelete))
 
 	if err != nil {
@@ -43,12 +43,12 @@ if d.Get("delete_service_on_destroy") == true {
 	}
 	var obj map[string]interface{}
 	log.Printf("[DEBUG] Deleting AppVersion %q", d.Id())
-	res, err := sendRequestWithTimeout(config, "DELETE", project, url, obj, d.Timeout(schema.TimeoutDelete)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+	res, err := sendRequestWithTimeout(config, "DELETE", project, url, userAgent, obj, d.Timeout(schema.TimeoutDelete)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 	if err != nil {
 		return handleNotFoundError(err, d, "AppVersion")
 	}
 	err = appEngineOperationWaitTime(
-		config, res, project, "Deleting AppVersion",
+		config, res, project, "Deleting AppVersion", userAgent,
 		d.Timeout(schema.TimeoutDelete))
 
 	if err != nil {

templates/terraform/custom_delete/clear_folder_access_approval_settings.go.erb

@@ -20,7 +20,7 @@ if err != nil {
 	return err
 }
 
-res, err := sendRequestWithTimeout(config, "PATCH", "", url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err := sendRequestWithTimeout(config, "PATCH", "", url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error emptying FolderSettings %q: %s", d.Id(), err)

templates/terraform/custom_delete/clear_organization_access_approval_settings.go.erb

@@ -20,7 +20,7 @@ if err != nil {
 	return err
 }
 
-res, err := sendRequestWithTimeout(config, "PATCH", "", url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err := sendRequestWithTimeout(config, "PATCH", "", url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error emptying OrganizationSettings %q: %s", d.Id(), err)

templates/terraform/custom_delete/clear_project_access_approval_settings.go.erb

@@ -20,7 +20,7 @@ if err != nil {
 	return err
 }
 
-res, err := sendRequestWithTimeout(config, "PATCH", "", url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err := sendRequestWithTimeout(config, "PATCH", "", url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error emptying ProjectSettings %q: %s", d.Id(), err)

templates/terraform/custom_delete/per_instance_config.go.erb

@@ -21,13 +21,13 @@
 	}
 	log.Printf("[DEBUG] Deleting PerInstanceConfig %q", d.Id())
 
-	res, err := sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutDelete))
+	res, err := sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return handleNotFoundError(err, d, "PerInstanceConfig")
 	}
 
 	err = computeOperationWaitTime(
-		config, res, project, "Deleting PerInstanceConfig",
+		config, res, project, "Deleting PerInstanceConfig", userAgent,
 		d.Timeout(schema.TimeoutDelete))
 
 	if err != nil {
@@ -52,14 +52,14 @@
 		}
 
 		log.Printf("[DEBUG] Applying updates to PerInstanceConfig %q: %#v", d.Id(), obj)
-		res, err = sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutUpdate))
+		res, err = sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 		if err != nil {
 			return fmt.Errorf("Error deleting PerInstanceConfig %q: %s", d.Id(), err)
 		}
 
 		err = computeOperationWaitTime(
-			config, res, project, "Applying update to PerInstanceConfig",
+			config, res, project, "Applying update to PerInstanceConfig", userAgent,
 			d.Timeout(schema.TimeoutUpdate))
 		if err != nil {
 			return fmt.Errorf("Error deleting PerInstanceConfig %q: %s", d.Id(), err)

templates/terraform/custom_delete/region_per_instance_config.go.erb

@@ -21,13 +21,13 @@
 	}
 	log.Printf("[DEBUG] Deleting RegionPerInstanceConfig %q", d.Id())
 
-	res, err := sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutDelete))
+	res, err := sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return handleNotFoundError(err, d, "RegionPerInstanceConfig")
 	}
 
 	err = computeOperationWaitTime(
-		config, res, project, "Deleting RegionPerInstanceConfig",
+		config, res, project, "Deleting RegionPerInstanceConfig", userAgent,
 		d.Timeout(schema.TimeoutDelete))
 
 	if err != nil {
@@ -52,14 +52,14 @@
 		}
 
 		log.Printf("[DEBUG] Applying updates to PerInstanceConfig %q: %#v", d.Id(), obj)
-		res, err = sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutUpdate))
+		res, err = sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 		if err != nil {
 			return fmt.Errorf("Error updating PerInstanceConfig %q: %s", d.Id(), err)
 		}
 
 		err = computeOperationWaitTime(
-			config, res, project, "Applying update to PerInstanceConfig",
+			config, res, project, "Applying update to PerInstanceConfig", userAgent,
 			d.Timeout(schema.TimeoutUpdate))
 
 		if err != nil {

templates/terraform/custom_delete/replace_all_access_levels_empty_list.go.erb

@@ -7,7 +7,7 @@ if err != nil {
 }
 
 log.Printf("[DEBUG] Deleting AccessLevels %q: %#v", d.Id(), obj)
-res, err := sendRequestWithTimeout(config, "POST", "", url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err := sendRequestWithTimeout(config, "POST", "", url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error deleting AccessLevels %q: %s", d.Id(), err)
@@ -16,7 +16,7 @@ if err != nil {
 }
 
 err = accessContextManagerOperationWaitTime(
-	config, res, "Updating AccessLevels",
+	config, res, "Updating AccessLevels", userAgent,
 	d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {

templates/terraform/custom_delete/replace_all_service_perimeters_empty_list.go.erb

@@ -7,7 +7,7 @@ if err != nil {
 }
 
 log.Printf("[DEBUG] Deleting servicePerimeters %q: %#v", d.Id(), obj)
-res, err := sendRequestWithTimeout(config, "POST", "", url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err := sendRequestWithTimeout(config, "POST", "", url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error deleting ServicePerimeters %q: %s", d.Id(), err)
@@ -16,7 +16,7 @@ if err != nil {
 }
 
 err = accessContextManagerOperationWaitTime(
-	config, res, "Updating ServicePerimeters",
+	config, res, "Updating ServicePerimeters", userAgent,
 	d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {

templates/terraform/custom_expand/secret_version_enable.go.erb

@@ -32,7 +32,12 @@ func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d T
 	parts := strings.Split(name, "/")
 	project := parts[1]
 
-	_, err = sendRequest(config, "POST", project, url, nil)
+	userAgent, err := generateUserAgentString(d.(*schema.ResourceData), config.userAgent)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = sendRequest(config, "POST", project, url, userAgent, nil)
 	if err != nil {
 		return nil, err
 	}

templates/terraform/custom_flatten/secret_version_access.go.erb

@@ -29,7 +29,12 @@ func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d
 	parts := strings.Split(d.Get("name").(string), "/")
 	project := parts[1]
 
-	accessRes, err := sendRequest(config, "GET", project, url, nil)
+	userAgent, err := generateUserAgentString(d, config.userAgent)
+	if err != nil {
+		return err
+	}
+
+	accessRes, err := sendRequest(config, "GET", project, url, userAgent, nil)
 	if err != nil {
 		return err
 	}

templates/terraform/examples/base_configs/test_file.go.erb

@@ -114,7 +114,7 @@ func testAccCheck<%= resource_name -%>DestroyProducer(t *testing.T) func(s *terr
 			return err
 		}
 
-		_, err = sendRequest(config, "<%= object.read_verb.to_s.upcase -%>", "", url, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+		_, err = sendRequest(config, "<%= object.read_verb.to_s.upcase -%>", "", url, config.userAgent, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 		if err == nil {
 				return fmt.Errorf("<%= resource_name -%> still exists at %s", url)
 			}

templates/terraform/iam_policy.go.erb

@@ -202,7 +202,12 @@ func (u *<%= resource_name -%>IamUpdater) GetResourceIamPolicy() (*cloudresource
 	}
 <%  end -%>
 
-	policy, err := sendRequest(u.Config, "<%= object.iam_policy.fetch_iam_policy_verb.to_s.upcase -%>", <% if resource_params.include?('project')  %>project<% else %>""<% end %>, url, obj<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return nil, err
+	}
+
+	policy, err := sendRequest(u.Config, "<%= object.iam_policy.fetch_iam_policy_verb.to_s.upcase -%>", <% if resource_params.include?('project')  %>project<% else %>""<% end %>, url, userAgent, obj<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 	if err != nil {
 		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
 	}
@@ -245,7 +250,12 @@ func (u *<%= resource_name -%>IamUpdater) SetResourceIamPolicy(policy *cloudreso
 	}
 <% end -%>
 
-	_, err = sendRequestWithTimeout(u.Config, "<%= object.iam_policy.set_iam_policy_verb.to_s.upcase -%>", <% if resource_params.include?('project')  %>project<% else %>""<% end %>, url, obj, u.d.Timeout(schema.TimeoutCreate)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return err
+	}
+
+	_, err = sendRequestWithTimeout(u.Config, "<%= object.iam_policy.set_iam_policy_verb.to_s.upcase -%>", <% if resource_params.include?('project')  %>project<% else %>""<% end %>, url, userAgent, obj, u.d.Timeout(schema.TimeoutCreate)<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 	if err != nil {
 		return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
 	}

templates/terraform/nested_query.go.erb

@@ -239,7 +239,13 @@ func resource<%= resource_name -%>ListForPatch(d *schema.ResourceData, meta inte
       return nil, err
   }
   <% end -%>
-  res, err := sendRequest(config, "<%= object.read_verb.to_s.upcase -%>", <% if has_project %>project<% else %>""<% end %>, url, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+
+  userAgent, err := generateUserAgentString(d, config.userAgent)
+  if err != nil {
+    return nil, err
+  }
+
+  res, err := sendRequest(config, "<%= object.read_verb.to_s.upcase -%>", <% if has_project %>project<% else %>""<% end %>, url, userAgent, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
   if err != nil {
     return nil, err
   }

templates/terraform/operation.go.erb

@@ -10,7 +10,8 @@ import (
 )
 
 type <%= product_name -%>OperationWaiter struct {
-  Config *Config
+  Config    *Config
+  UserAgent string
 <% if has_project -%>
   Project string
 <% end -%>
@@ -23,16 +24,18 @@ func (w *<%= product_name -%>OperationWaiter) QueryOp() (interface{}, error) {
   }
   // Returns the proper get.
   url := fmt.Sprintf("<%= [object.__product.base_url, async.operation.base_url].flatten.join.gsub('{{op_id}}', '%s') -%>", w.CommonOperationWaiter.Op.Name)
-  return sendRequest(w.Config, "GET", <% if has_project %>w.Project<% else %>""<% end %>, url, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+
+  return sendRequest(w.Config, "GET", <% if has_project %>w.Project<% else %>""<% end %>, url, w.UserAgent, nil<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
 }
 
-func create<%= product_name %>Waiter(config *Config, op map[string]interface{}, <% if has_project -%> project, <% end -%> activity string) (*<%=product_name%>OperationWaiter, error) {
+func create<%= product_name %>Waiter(config *Config, op map[string]interface{}, <% if has_project -%> project, <% end -%> activity, userAgent string) (*<%=product_name%>OperationWaiter, error) {
   if val, ok := op["name"]; !ok || val == "" {
     // This was a synchronous call - there is no operation to wait for.
     return nil, nil
   }
   w := &<%= product_name -%>OperationWaiter{
-    Config: config,
+    Config:    config,
+    UserAgent: userAgent,
 <% if has_project -%>
     Project: project,
 <% end -%>
@@ -49,8 +52,8 @@ func create<%= product_name %>Waiter(config *Config, op map[string]interface{},
     Might as well just nolint it so we can pass the linter checks.
 -%>
 // nolint: deadcode,unused
-func <%= product_name.camelize(:lower) -%>OperationWaitTimeWithResponse(config *Config, op map[string]interface{}, response *map[string]interface{},<% if has_project -%> project,<% end -%> activity string, timeout time.Duration) error {
-  w, err := create<%= product_name %>Waiter(config, op, <% if has_project -%> project, <%end-%> activity)
+func <%= product_name.camelize(:lower) -%>OperationWaitTimeWithResponse(config *Config, op map[string]interface{}, response *map[string]interface{},<% if has_project -%> project,<% end -%> activity, userAgent string, timeout time.Duration) error {
+  w, err := create<%= product_name %>Waiter(config, op, <% if has_project -%> project, <%end-%> activity, userAgent)
   if err != nil || w == nil {
       // If w is nil, the op was synchronous.
       return err
@@ -62,8 +65,8 @@ func <%= product_name.camelize(:lower) -%>OperationWaitTimeWithResponse(config *
 }
 <% end -%>
 
-func <%= product_name.camelize(:lower) -%>OperationWaitTime(config *Config, op map[string]interface{}, <% if has_project -%> project,<% end -%> activity string, timeout time.Duration) error {
-  w, err := create<%= product_name %>Waiter(config, op, <% if has_project -%> project, <%end-%> activity)
+func <%= product_name.camelize(:lower) -%>OperationWaitTime(config *Config, op map[string]interface{}, <% if has_project -%> project,<% end -%> activity, userAgent string, timeout time.Duration) error {
+  w, err := create<%= product_name %>Waiter(config, op, <% if has_project -%> project, <%end-%> activity, userAgent)
   if err != nil || w == nil {
       // If w is nil, the op was synchronous.
       return err

templates/terraform/post_create/compute_backend_service_security_policy.go.erb

@@ -12,7 +12,7 @@ if o, n := d.GetChange("security_policy"); o.(string) != n.(string) {
     return errwrap.Wrapf("Error setting Backend Service security policy: {{err}}", err)
   }
   // This uses the create timeout for simplicity, though technically this code appears in both create and update
-  waitErr := computeOperationWaitTime(config, op, project, "Setting Backend Service Security Policy", d.Timeout(schema.TimeoutCreate))
+  waitErr := computeOperationWaitTime(config, op, project, "Setting Backend Service Security Policy", userAgent, d.Timeout(schema.TimeoutCreate))
   if waitErr != nil {
     return waitErr
   }

templates/terraform/post_create/compute_network_delete_default_route.erb

@@ -19,7 +19,7 @@ if d.Get("delete_default_routes_on_create").(bool) {
 			if err != nil {
 				return fmt.Errorf("Error deleting route: %s", err)
 			}
-			err = computeOperationWaitTime(config, op, project, "Deleting Route", d.Timeout(schema.TimeoutCreate))
+			err = computeOperationWaitTime(config, op, project, "Deleting Route", userAgent, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return err
 			}

templates/terraform/post_create/global_network_endpoint_group.go.erb

@@ -19,7 +19,7 @@ if err != nil {
 }
 
 log.Printf("[DEBUG] Creating new GlobalNetworkEndpoint: %#v", wrappedReq)
-_, err = sendRequestWithTimeout(config, "POST", project, attachUrl, wrappedReq, d.Timeout(schema.TimeoutCreate))
+_, err = sendRequestWithTimeout(config, "POST", project, attachUrl, userAgent, wrappedReq, d.Timeout(schema.TimeoutCreate))
 if err != nil {
 	return fmt.Errorf("Error creating GlobalNetworkEndpoint: %s", err)
 }

templates/terraform/post_create/labels.erb

@@ -20,13 +20,13 @@ if v, ok := d.GetOkExists("labels"); !isEmptyValue(reflect.ValueOf(v)) && (ok ||
     if err != nil {
         return err
     }
-    res, err = sendRequest(config, "POST", project, url, obj<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
+    res, err = sendRequest(config, "POST", project, url, userAgent, obj<%= object.error_retry_predicates ? ", " + object.error_retry_predicates.join(',') : "" -%>)
     if err != nil {
       return fmt.Errorf("Error adding labels to <%= resource_name -%> %q: %s", d.Id(), err)
     }
 
     err = computeOperationWaitTime(
-        config, res, project, "Updating <%= resource_name -%> Labels",
+        config, res, project, "Updating <%= resource_name -%> Labels", userAgent,
         d.Timeout(schema.TimeoutUpdate))
 
     if err != nil {

templates/terraform/post_create/org_security_policy_association.go.erb

@@ -6,7 +6,7 @@ if err != nil {
 	return err
 }
 
-policyRes, err := sendRequest(config, "GET", "", url, nil)
+policyRes, err := sendRequest(config, "GET", "", url, userAgent, nil)
 if err != nil {
 	return handleNotFoundError(err, d, fmt.Sprintf("ComputeOrganizationSecurityPolicy %q", d.Get("policy_id")))
 }

templates/terraform/post_create/org_security_policy_rule.go.erb

@@ -6,7 +6,7 @@ if err != nil {
 	return err
 }
 
-policyRes, err := sendRequest(config, "GET", "", url, nil)
+policyRes, err := sendRequest(config, "GET", "", url, userAgent, nil)
 if err != nil {
 	return handleNotFoundError(err, d, fmt.Sprintf("ComputeOrganizationSecurityPolicy %q", d.Get("policy_id")))
 }

templates/terraform/post_update/compute_per_instance_config.go.erb

@@ -25,14 +25,14 @@ if err != nil {
 }
 
 log.Printf("[DEBUG] Applying updates to PerInstanceConfig %q: %#v", d.Id(), obj)
-res, err = sendRequestWithTimeout(config, "POST", project, url, obj, d.Timeout(schema.TimeoutUpdate))
+res, err = sendRequestWithTimeout(config, "POST", project, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {
 	return fmt.Errorf("Error updating PerInstanceConfig %q: %s", d.Id(), err)
 }
 
 err = computeOperationWaitTime(
-	config, res, project, "Applying update to PerInstanceConfig",
+	config, res, project, "Applying update to PerInstanceConfig", userAgent,
 	d.Timeout(schema.TimeoutUpdate))
 
 if err != nil {