go rewrite - sort context map in test file (#10975) (#18461)

[upstream:bb3772e87e97e5895f0271116c238faf0895c17c] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 17, 2024 · ffff522 · ffff522
1 parent da164ee
commit ffff522
Show file tree

Hide file tree

Showing 42 changed files with 90 additions and 87 deletions.
diff --git a/.changelog/10975.txt b/.changelog/10975.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/services/apigee/iam_apigee_environment_generated_test.go b/google/services/apigee/iam_apigee_environment_generated_test.go
@@ -33,8 +33,8 @@ func TestAccApigeeEnvironmentIamBindingGenerated(t *testing.T) {
 	context := map[string]interface{}{
 		"random_suffix":   acctest.RandString(t, 10),
 		"role":            "roles/viewer",
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -70,8 +70,8 @@ func TestAccApigeeEnvironmentIamMemberGenerated(t *testing.T) {
 	context := map[string]interface{}{
 		"random_suffix":   acctest.RandString(t, 10),
 		"role":            "roles/viewer",
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -98,8 +98,8 @@ func TestAccApigeeEnvironmentIamPolicyGenerated(t *testing.T) {
 	context := map[string]interface{}{
 		"random_suffix":   acctest.RandString(t, 10),
 		"role":            "roles/viewer",
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{

diff --git a/google/services/apigee/resource_apigee_addons_config_generated_test.go b/google/services/apigee/resource_apigee_addons_config_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApigeeAddonsConfig_apigeeAddonsTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_endpoint_attachment_generated_test.go b/google/services/apigee/resource_apigee_endpoint_attachment_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(t
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_env_keystore_generated_test.go b/google/services/apigee/resource_apigee_env_keystore_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApigeeEnvKeystore_apigeeEnvironmentKeystoreTestExample(t *testing.T)
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_env_references_generated_test.go b/google/services/apigee/resource_apigee_env_references_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApigeeEnvReferences_apigeeEnvironmentReferenceTestExample(t *testing
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go b/google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeEnvgroupAttachment_apigeeEnvironmentGroupAttachmentBasicTestEx
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_envgroup_generated_test.go b/google/services/apigee/resource_apigee_envgroup_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeEnvgroup_apigeeEnvironmentGroupBasicTestExample(t *testing.T)
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_environment_generated_test.go b/google/services/apigee/resource_apigee_environment_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -131,8 +131,8 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicDeploymentApiproxyTypeTestEx
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_instance_attachment_generated_test.go b/google/services/apigee/resource_apigee_instance_attachment_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeInstanceAttachment_apigeeInstanceAttachmentBasicTestExample(t
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_instance_generated_test.go b/google/services/apigee/resource_apigee_instance_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeInstance_apigeeInstanceBasicTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -128,8 +128,8 @@ func TestAccApigeeInstance_apigeeInstanceCidrRangeTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -221,8 +221,8 @@ func TestAccApigeeInstance_apigeeInstanceIpRangeTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -314,8 +314,8 @@ func TestAccApigeeInstance_apigeeInstanceServiceAttachmentBasicTestExample(t *te
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeKeystoresAliasesSelfSignedCert_apigeeEnvKeystoreAliasSelfSigne
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_nat_address_generated_test.go b/google/services/apigee/resource_apigee_nat_address_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeNatAddress_apigeeNatAddressBasicTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_organization_generated_test.go b/google/services/apigee/resource_apigee_organization_generated_test.go
@@ -36,8 +36,8 @@ func TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample(t *testin
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -122,8 +122,8 @@ func TestAccApigeeOrganization_apigeeOrganizationCloudBasicDisableVpcPeeringTest
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_sync_authorization_generated_test.go b/google/services/apigee/resource_apigee_sync_authorization_generated_test.go
@@ -30,8 +30,8 @@ func TestAccApigeeSyncAuthorization_apigeeSyncAuthorizationBasicTestExample(t *t
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apigee/resource_apigee_target_server_generated_test.go b/google/services/apigee/resource_apigee_target_server_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApigeeTargetServer_apigeeTargetServerTestExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go b/google/services/appengine/resource_app_engine_firewall_rule_generated_test.go
@@ -35,8 +35,8 @@ func TestAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(t *testing.T
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/appengine/resource_app_engine_flexible_app_version_generated_test.go b/google/services/appengine/resource_app_engine_flexible_app_version_generated_test.go
@@ -33,8 +33,8 @@ func TestAccAppEngineFlexibleAppVersion_appEngineFlexibleAppVersionExample(t *te
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apphub/resource_apphub_service_generated_test.go b/google/services/apphub/resource_apphub_service_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApphubService_apphubServiceBasicExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -179,8 +179,8 @@ func TestAccApphubService_apphubServiceFullExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go b/google/services/apphub/resource_apphub_service_project_attachment_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApphubServiceProjectAttachment_serviceProjectAttachmentBasicExample(
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"host_project":  envvar.GetTestProjectFromEnv(),
+		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -87,8 +87,8 @@ func TestAccApphubServiceProjectAttachment_serviceProjectAttachmentFullExample(t
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"host_project":  envvar.GetTestProjectFromEnv(),
+		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/apphub/resource_apphub_workload_generated_test.go b/google/services/apphub/resource_apphub_workload_generated_test.go
@@ -35,8 +35,8 @@ func TestAccApphubWorkload_apphubWorkloadBasicExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 
@@ -197,8 +197,8 @@ func TestAccApphubWorkload_apphubWorkloadFullExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"random_suffix":   acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go b/google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go
@@ -35,8 +35,8 @@ func TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       envvar.GetTestProjectFromEnv(),
 		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"project":       envvar.GetTestProjectFromEnv(),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 

diff --git a/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go b/google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go
@@ -35,8 +35,8 @@ func TestAccCloudAssetOrganizationFeed_cloudAssetOrganizationFeedExample(t *test
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       envvar.GetTestProjectFromEnv(),
 		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"project":       envvar.GetTestProjectFromEnv(),
 		"random_suffix": acctest.RandString(t, 10),
 	}