Stop editing the global config object with new useragent entries (#4123…

…) (#2621) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Oct 19, 2020 · 85185ce · 85185ce
1 parent afbf87a
commit 85185ce
Show file tree

Hide file tree

Showing 199 changed files with 11 additions and 498 deletions.
diff --git a/.changelog/4123.txt b/.changelog/4123.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+provider: fixed an issue where the request headers would grow proportionally to the number of resources in a given `terraform apply`
+```
diff --git a/google-beta/provider_test.go b/google-beta/provider_test.go
@@ -497,7 +497,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",
@@ -508,16 +507,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)

diff --git a/google-beta/resource_access_approval_folder_settings.go b/google-beta/resource_access_approval_folder_settings.go
@@ -269,7 +269,6 @@ func resourceAccessApprovalFolderSettingsUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -331,7 +330,6 @@ func resourceAccessApprovalFolderSettingsDelete(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}

diff --git a/google-beta/resource_access_approval_organization_settings.go b/google-beta/resource_access_approval_organization_settings.go
@@ -231,7 +231,6 @@ func resourceAccessApprovalOrganizationSettingsUpdate(d *schema.ResourceData, me
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -293,7 +292,6 @@ func resourceAccessApprovalOrganizationSettingsDelete(d *schema.ResourceData, me
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}

diff --git a/google-beta/resource_access_approval_project_settings.go b/google-beta/resource_access_approval_project_settings.go
@@ -253,7 +253,6 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -321,7 +320,6 @@ func resourceAccessApprovalProjectSettingsDelete(d *schema.ResourceData, meta in
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["notificationEmails"] = []string{}

diff --git a/google-beta/resource_access_context_manager_access_level.go b/google-beta/resource_access_context_manager_access_level.go
@@ -432,7 +432,6 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -527,7 +526,6 @@ func resourceAccessContextManagerAccessLevelDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_access_context_manager_access_level_condition.go b/google-beta/resource_access_context_manager_access_level_condition.go
@@ -396,7 +396,6 @@ func resourceAccessContextManagerAccessLevelConditionDelete(d *schema.ResourceDa
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_access_context_manager_access_levels.go b/google-beta/resource_access_context_manager_access_levels.go
@@ -383,7 +383,6 @@ func resourceAccessContextManagerAccessLevelsUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -432,7 +431,6 @@ func resourceAccessContextManagerAccessLevelsDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["accessLevels"] = []string{}

diff --git a/google-beta/resource_access_context_manager_access_policy.go b/google-beta/resource_access_context_manager_access_policy.go
@@ -208,7 +208,6 @@ func resourceAccessContextManagerAccessPolicyUpdate(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -268,7 +267,6 @@ func resourceAccessContextManagerAccessPolicyDelete(d *schema.ResourceData, meta
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_access_context_manager_service_perimeter.go b/google-beta/resource_access_context_manager_service_perimeter.go
@@ -465,7 +465,6 @@ func resourceAccessContextManagerServicePerimeterUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -577,7 +576,6 @@ func resourceAccessContextManagerServicePerimeterDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_access_context_manager_service_perimeter_resource.go b/google-beta/resource_access_context_manager_service_perimeter_resource.go
@@ -202,7 +202,6 @@ func resourceAccessContextManagerServicePerimeterResourceDelete(d *schema.Resour
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_access_context_manager_service_perimeters.go b/google-beta/resource_access_context_manager_service_perimeters.go
@@ -387,7 +387,6 @@ func resourceAccessContextManagerServicePerimetersUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -442,7 +441,6 @@ func resourceAccessContextManagerServicePerimetersDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	obj := make(map[string]interface{})
 	obj["servicePerimeters"] = []string{}

diff --git a/google-beta/resource_active_directory_domain.go b/google-beta/resource_active_directory_domain.go
@@ -274,7 +274,6 @@ func resourceActiveDirectoryDomainUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -360,7 +359,6 @@ func resourceActiveDirectoryDomainDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_active_directory_domain_trust.go b/google-beta/resource_active_directory_domain_trust.go
@@ -310,7 +310,6 @@ func resourceActiveDirectoryDomainTrustUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -400,7 +399,6 @@ func resourceActiveDirectoryDomainTrustDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	project, err := getProject(d, config)
 	if err != nil {

diff --git a/google-beta/resource_app_engine_application_url_dispatch_rules.go b/google-beta/resource_app_engine_application_url_dispatch_rules.go
@@ -194,7 +194,6 @@ func resourceAppEngineApplicationUrlDispatchRulesUpdate(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -256,7 +255,6 @@ func resourceAppEngineApplicationUrlDispatchRulesDelete(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_app_engine_domain_mapping.go b/google-beta/resource_app_engine_domain_mapping.go
@@ -293,7 +293,6 @@ func resourceAppEngineDomainMappingUpdate(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -367,7 +366,6 @@ func resourceAppEngineDomainMappingDelete(d *schema.ResourceData, meta interface
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_app_engine_firewall_rule.go b/google-beta/resource_app_engine_firewall_rule.go
@@ -252,7 +252,6 @@ func resourceAppEngineFirewallRuleUpdate(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -347,7 +346,6 @@ func resourceAppEngineFirewallRuleDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_app_engine_flexible_app_version.go b/google-beta/resource_app_engine_flexible_app_version.go
@@ -1184,7 +1184,6 @@ func resourceAppEngineFlexibleAppVersionUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -1389,7 +1388,6 @@ func resourceAppEngineFlexibleAppVersionDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	if d.Get("noop_on_destroy") == true {
 		log.Printf("[DEBUG] Keeping the AppVersion %q", d.Id())

diff --git a/google-beta/resource_app_engine_service_split_traffic.go b/google-beta/resource_app_engine_service_split_traffic.go
@@ -206,7 +206,6 @@ func resourceAppEngineServiceSplitTrafficUpdate(d *schema.ResourceData, meta int
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -284,13 +283,6 @@ func resourceAppEngineServiceSplitTrafficUpdate(d *schema.ResourceData, meta int
 }
 
 func resourceAppEngineServiceSplitTrafficDelete(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*Config)
-	userAgent, err := generateUserAgentString(d, config.userAgent)
-	if err != nil {
-		return err
-	}
-	config.userAgent = userAgent
-
 	log.Printf("[WARNING] AppEngine ServiceSplitTraffic resources"+
 		" cannot be deleted from GCP. The resource %s will be removed from Terraform"+
 		" state, but will still be present on the server.", d.Id())

diff --git a/google-beta/resource_app_engine_service_split_traffic_generated_test.go b/google-beta/resource_app_engine_service_split_traffic_generated_test.go
@@ -15,12 +15,9 @@
 package google
 
 import (
-	"log"
-	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(t *testing.T) {
@@ -37,7 +34,6 @@ func TestAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(t *
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
-		CheckDestroy: testAccCheckAppEngineServiceSplitTrafficDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAppEngineServiceSplitTraffic_appEngineServiceSplitTrafficExample(context),
@@ -116,20 +112,3 @@ resource "google_app_engine_service_split_traffic" "liveapp" {
 }
 `, context)
 }
-
-func testAccCheckAppEngineServiceSplitTrafficDestroyProducer(t *testing.T) func(s *terraform.State) error {
-	return func(s *terraform.State) error {
-		for name, rs := range s.RootModule().Resources {
-			if rs.Type != "google_app_engine_service_split_traffic" {
-				continue
-			}
-			if strings.HasPrefix(name, "data.") {
-				continue
-			}
-
-			log.Printf("[DEBUG] Ignoring destroy during test")
-		}
-
-		return nil
-	}
-}
diff --git a/google-beta/resource_app_engine_standard_app_version.go b/google-beta/resource_app_engine_standard_app_version.go
@@ -689,7 +689,6 @@ func resourceAppEngineStandardAppVersionUpdate(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -835,7 +834,6 @@ func resourceAppEngineStandardAppVersionDelete(d *schema.ResourceData, meta inte
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	if d.Get("noop_on_destroy") == true {
 		log.Printf("[DEBUG] Keeping the AppVersion %q", d.Id())

diff --git a/google-beta/resource_artifact_registry_repository.go b/google-beta/resource_artifact_registry_repository.go
@@ -270,7 +270,6 @@ func resourceArtifactRegistryRepositoryUpdate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -343,7 +342,6 @@ func resourceArtifactRegistryRepositoryDelete(d *schema.ResourceData, meta inter
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_big_query_dataset.go b/google-beta/resource_big_query_dataset.go
@@ -495,7 +495,6 @@ func resourceBigQueryDatasetUpdate(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 
@@ -590,7 +589,6 @@ func resourceBigQueryDatasetDelete(d *schema.ResourceData, meta interface{}) err
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""
 

diff --git a/google-beta/resource_big_query_dataset_access.go b/google-beta/resource_big_query_dataset_access.go
@@ -488,7 +488,6 @@ func resourceBigQueryDatasetAccessDelete(d *schema.ResourceData, meta interface{
 	if err != nil {
 		return err
 	}
-	config.userAgent = userAgent
 
 	billingProject := ""