Stop editing the global config object with new useragent entries

products/appengine/terraform.yaml

@@ -195,8 +195,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     id_format: "apps/{{project}}/services/{{service}}"
     import_format: ["apps/{{project}}/services/{{service}}"]
     mutex: "apps/{{project}}"
+    skip_delete: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: templates/terraform/custom_delete/skip_delete.go.erb
       test_check_destroy: templates/terraform/custom_check_destroy/skip_delete_during_test.go.erb
     properties:
       split: !ruby/object:Overrides::Terraform::PropertyOverride

products/compute/terraform.yaml

@@ -1242,6 +1242,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     import_format: ["projects/{{project}}/global/networks/{{network}}/networkPeerings/{{peering}}"]
     # format from google_compute_network_peering
     mutex: 'projects/{{project}}/global/networks/{{network}}/peerings'
+    skip_delete: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "network_peering_routes_config_basic"
@@ -1266,7 +1267,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       exportCustomRoutes: !ruby/object:Overrides::Terraform::PropertyOverride
         send_empty_value: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: 'templates/terraform/custom_delete/skip_delete.go.erb'
       encoder: 'templates/terraform/encoders/network_peering_routes_config.go.erb'
   NodeGroup: !ruby/object:Overrides::Terraform::ResourceOverride
     docs: !ruby/object:Provider::Terraform::Docs

products/iap/terraform.yaml

@@ -168,6 +168,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       but *will not delete it from Google Cloud.*
     id_format: '{{name}}'
     import_format: ['{{name}}']
+    skip_delete: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "iap_brand"
@@ -179,7 +180,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           org_domain: :ORG_DOMAIN
         skip_test: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: templates/terraform/custom_delete/skip_delete.go.erb
       custom_import: templates/terraform/custom_import/iap_brand.go.erb
       post_create: templates/terraform/post_create/set_computed_name.erb
   Client: !ruby/object:Overrides::Terraform::ResourceOverride

products/kms/terraform.yaml

@@ -22,6 +22,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       *will not delete the resource on the server.*
     id_format: "projects/{{project}}/locations/{{location}}/keyRings/{{name}}"
     import_format: ["projects/{{project}}/locations/{{location}}/keyRings/{{name}}"]
+    skip_delete: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "kms_key_ring_basic"
@@ -42,7 +43,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       location: !ruby/object:Overrides::Terraform::PropertyOverride
         ignore_read: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: templates/terraform/custom_delete/skip_delete.go.erb
       decoder: templates/terraform/decoders/long_name_to_self_link.go.erb
       encoder: templates/terraform/encoders/send_nil_body.go.erb
       extra_schema_entry: templates/terraform/extra_schema_entry/kms_self_link.erb
@@ -144,6 +144,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     supports_indirect_user_project_override: true
     exclude_import: true
     exclude_validator: true
+    skip_delete: true
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "kms_secret_ciphertext_basic"
@@ -167,7 +168,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       ciphertext: !ruby/object:Overrides::Terraform::PropertyOverride
         ignore_read: true
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: templates/terraform/custom_delete/skip_delete.go.erb
       post_create: templates/terraform/post_create/kms_secret_ciphertext.go.erb
       decoder: templates/terraform/decoders/noop.go.erb
 # This is for copying files over

products/securitycenter/terraform.yaml

@@ -15,6 +15,7 @@
 legacy_name: scc
 overrides: !ruby/object:Overrides::ResourceOverrides
   Source: !ruby/object:Overrides::Terraform::ResourceOverride
+    skip_delete: true
     examples:
      - !ruby/object:Provider::Terraform::Examples
       name: "scc_source_basic"
@@ -33,7 +34,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         validation: !ruby/object:Provider::Terraform::Validation
           regex: '[\p{L}\p{N}]({\p{L}\p{N}_- ]{0,30}[\p{L}\p{N}])?'
     custom_code: !ruby/object:Provider::Terraform::CustomCode
-      custom_delete: templates/terraform/custom_delete/skip_delete.go.erb
       custom_import: templates/terraform/custom_import/scc_source_self_link_as_name_set_organization.go.erb
       post_create: templates/terraform/post_create/set_computed_name.erb
 # This is for copying files over

templates/terraform/resource.erb

@@ -562,7 +562,6 @@ func resource<%= resource_name -%>Update(d *schema.ResourceData, meta interface{
     if err != nil {
     	return err
     }
-    config.userAgent = userAgent
 
     billingProject := ""
 
@@ -821,7 +820,6 @@ func resource<%= resource_name -%>Delete(d *schema.ResourceData, meta interface{
     if err != nil {
     	return err
     }
-    config.userAgent = userAgent
 
 <% if object.custom_code.custom_delete -%>
 <%= lines(compile(pwd + '/' + object.custom_code.custom_delete)) -%>

third_party/terraform/resources/resource_google_project_service.go

@@ -119,11 +119,6 @@ func resourceGoogleProjectServiceImport(d *schema.ResourceData, m interface{}) (
 
 func resourceGoogleProjectServiceCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {

third_party/terraform/resources/resource_iam_audit_config.go

@@ -136,11 +136,6 @@ func iamAuditConfigImport(resourceIdParser resourceIdParserFunc) schema.StateFun
 func resourceIamAuditConfigCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) func(*schema.ResourceData, interface{}) error {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -170,11 +165,7 @@ func resourceIamAuditConfigCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc
 func resourceIamAuditConfigDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err

third_party/terraform/resources/resource_iam_binding.go.erb

@@ -117,11 +117,7 @@ func resourceIamBindingCreateUpdate(newUpdaterFunc newResourceIamUpdaterFunc, en
 func resourceIamBindingRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err
@@ -255,11 +251,7 @@ func iamBindingImport(newUpdaterFunc newResourceIamUpdaterFunc, resourceIdParser
 func resourceIamBindingDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
+
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
 			return err

third_party/terraform/resources/resource_iam_member.go.erb

@@ -168,11 +168,6 @@ func getResourceIamMember(d *schema.ResourceData) *cloudresourcemanager.Binding
 func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.CreateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -206,11 +201,6 @@ func resourceIamMemberCreate(newUpdaterFunc newResourceIamUpdaterFunc, enableBat
 func resourceIamMemberRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -273,11 +263,6 @@ func resourceIamMemberRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.Read
 func resourceIamMemberDelete(newUpdaterFunc newResourceIamUpdaterFunc, enableBatching bool) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {

third_party/terraform/resources/resource_iam_policy.go.erb

@@ -55,11 +55,6 @@ func ResourceIamPolicy(parentSpecificSchema map[string]*schema.Schema, newUpdate
 func ResourceIamPolicyCreate(newUpdaterFunc newResourceIamUpdaterFunc) schema.CreateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -78,11 +73,6 @@ func ResourceIamPolicyCreate(newUpdaterFunc newResourceIamUpdaterFunc) schema.Cr
 func ResourceIamPolicyRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.ReadFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -108,11 +98,6 @@ func ResourceIamPolicyRead(newUpdaterFunc newResourceIamUpdaterFunc) schema.Read
 func ResourceIamPolicyUpdate(newUpdaterFunc newResourceIamUpdaterFunc) schema.UpdateFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {
@@ -132,11 +117,6 @@ func ResourceIamPolicyUpdate(newUpdaterFunc newResourceIamUpdaterFunc) schema.Up
 func ResourceIamPolicyDelete(newUpdaterFunc newResourceIamUpdaterFunc) schema.DeleteFunc {
 	return func(d *schema.ResourceData, meta interface{}) error {
 		config := meta.(*Config)
-		userAgent, err := generateUserAgentString(d, config.userAgent)
-		if err != nil {
-			return err
-		}
-		config.userAgent = userAgent
 
 		updater, err := newUpdaterFunc(d, config)
 		if err != nil {

third_party/terraform/utils/provider_test.go.erb

@@ -507,7 +507,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProviderMeta_setModuleName(moduleName, randString(t, 10)),
-				Check:  testAccCheckConfigAgentModified(t, moduleName),
 			},
 			{
 				ResourceName:      "google_compute_address.default",
@@ -518,16 +517,6 @@ func TestAccProviderMeta_setModuleName(t *testing.T) {
 	})
 }
 
-func testAccCheckConfigAgentModified(t *testing.T, moduleName string) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		config := googleProviderConfig(t)
-		if !strings.Contains(config.userAgent, moduleName) {
-			return fmt.Errorf("expected userAgent to contain provider_meta set module_name")
-		}
-		return nil
-	}
-}
-
 func TestAccProviderUserProjectOverride(t *testing.T) {
 	// Parallel fine-grained resource creation
 	skipIfVcr(t)

third_party/terraform/utils/utils.go.erb

@@ -462,5 +462,9 @@ func generateUserAgentString(d *schema.ResourceData, currentUserAgent string) (s
 		return currentUserAgent, err
 	}
 
-	return strings.Join([]string{currentUserAgent, m.ModuleName}, " "), nil
+	if m.ModuleName != "" {
+		return strings.Join([]string{currentUserAgent, m.ModuleName}, " "), nil
+	}
+
+	return currentUserAgent, nil
 }