Skip to content

Commit ffff522

Browse files
modular-magicianmodular-magician
authored
go rewrite - sort context map in test file (#10975) (#18461)
[upstream:bb3772e87e97e5895f0271116c238faf0895c17c] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent da164ee commit ffff522

File tree

42 files changed

+90
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+90
-87
lines changed

‎.changelog/10975.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/services/apigee/iam_apigee_environment_generated_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func TestAccApigeeEnvironmentIamBindingGenerated(t *testing.T) {
3333
context := map[string]interface{}{
3434
"random_suffix": acctest.RandString(t, 10),
3535
"role": "roles/viewer",
36-
"org_id": envvar.GetTestOrgFromEnv(t),
3736
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
37+
"org_id": envvar.GetTestOrgFromEnv(t),
3838
}
3939

4040
acctest.VcrTest(t, resource.TestCase{
@@ -70,8 +70,8 @@ func TestAccApigeeEnvironmentIamMemberGenerated(t *testing.T) {
7070
context := map[string]interface{}{
7171
"random_suffix": acctest.RandString(t, 10),
7272
"role": "roles/viewer",
73-
"org_id": envvar.GetTestOrgFromEnv(t),
7473
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
74+
"org_id": envvar.GetTestOrgFromEnv(t),
7575
}
7676

7777
acctest.VcrTest(t, resource.TestCase{
@@ -98,8 +98,8 @@ func TestAccApigeeEnvironmentIamPolicyGenerated(t *testing.T) {
9898
context := map[string]interface{}{
9999
"random_suffix": acctest.RandString(t, 10),
100100
"role": "roles/viewer",
101-
"org_id": envvar.GetTestOrgFromEnv(t),
102101
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
102+
"org_id": envvar.GetTestOrgFromEnv(t),
103103
}
104104

105105
acctest.VcrTest(t, resource.TestCase{

‎google/services/apigee/resource_apigee_addons_config_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApigeeAddonsConfig_apigeeAddonsTestExample(t *testing.T) {
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/apigee/resource_apigee_endpoint_attachment_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(t
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_env_keystore_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApigeeEnvKeystore_apigeeEnvironmentKeystoreTestExample(t *testing.T)
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/apigee/resource_apigee_env_references_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApigeeEnvReferences_apigeeEnvironmentReferenceTestExample(t *testing
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeEnvgroupAttachment_apigeeEnvironmentGroupAttachmentBasicTestEx
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_envgroup_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeEnvgroup_apigeeEnvironmentGroupBasicTestExample(t *testing.T)
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_environment_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(t *testing.T) {
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

@@ -131,8 +131,8 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicDeploymentApiproxyTypeTestEx
131131
t.Parallel()
132132

133133
context := map[string]interface{}{
134-
"org_id": envvar.GetTestOrgFromEnv(t),
135134
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
135+
"org_id": envvar.GetTestOrgFromEnv(t),
136136
"random_suffix": acctest.RandString(t, 10),
137137
}
138138

‎google/services/apigee/resource_apigee_instance_attachment_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeInstanceAttachment_apigeeInstanceAttachmentBasicTestExample(t
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_instance_generated_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeInstance_apigeeInstanceBasicTestExample(t *testing.T) {
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

@@ -128,8 +128,8 @@ func TestAccApigeeInstance_apigeeInstanceCidrRangeTestExample(t *testing.T) {
128128
t.Parallel()
129129

130130
context := map[string]interface{}{
131-
"org_id": envvar.GetTestOrgFromEnv(t),
132131
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
132+
"org_id": envvar.GetTestOrgFromEnv(t),
133133
"random_suffix": acctest.RandString(t, 10),
134134
}
135135

@@ -221,8 +221,8 @@ func TestAccApigeeInstance_apigeeInstanceIpRangeTestExample(t *testing.T) {
221221
t.Parallel()
222222

223223
context := map[string]interface{}{
224-
"org_id": envvar.GetTestOrgFromEnv(t),
225224
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
225+
"org_id": envvar.GetTestOrgFromEnv(t),
226226
"random_suffix": acctest.RandString(t, 10),
227227
}
228228

@@ -314,8 +314,8 @@ func TestAccApigeeInstance_apigeeInstanceServiceAttachmentBasicTestExample(t *te
314314
t.Parallel()
315315

316316
context := map[string]interface{}{
317-
"org_id": envvar.GetTestOrgFromEnv(t),
318317
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
318+
"org_id": envvar.GetTestOrgFromEnv(t),
319319
"random_suffix": acctest.RandString(t, 10),
320320
}
321321

‎google/services/apigee/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeKeystoresAliasesSelfSignedCert_apigeeEnvKeystoreAliasSelfSigne
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_nat_address_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeNatAddress_apigeeNatAddressBasicTestExample(t *testing.T) {
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

‎google/services/apigee/resource_apigee_organization_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestAccApigeeOrganization_apigeeOrganizationCloudBasicTestExample(t *testin
3636
t.Parallel()
3737

3838
context := map[string]interface{}{
39-
"org_id": envvar.GetTestOrgFromEnv(t),
4039
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
40+
"org_id": envvar.GetTestOrgFromEnv(t),
4141
"random_suffix": acctest.RandString(t, 10),
4242
}
4343

@@ -122,8 +122,8 @@ func TestAccApigeeOrganization_apigeeOrganizationCloudBasicDisableVpcPeeringTest
122122
t.Parallel()
123123

124124
context := map[string]interface{}{
125-
"org_id": envvar.GetTestOrgFromEnv(t),
126125
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
126+
"org_id": envvar.GetTestOrgFromEnv(t),
127127
"random_suffix": acctest.RandString(t, 10),
128128
}
129129

‎google/services/apigee/resource_apigee_sync_authorization_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestAccApigeeSyncAuthorization_apigeeSyncAuthorizationBasicTestExample(t *t
3030
t.Parallel()
3131

3232
context := map[string]interface{}{
33-
"org_id": envvar.GetTestOrgFromEnv(t),
3433
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
34+
"org_id": envvar.GetTestOrgFromEnv(t),
3535
"random_suffix": acctest.RandString(t, 10),
3636
}
3737

‎google/services/apigee/resource_apigee_target_server_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApigeeTargetServer_apigeeTargetServerTestExample(t *testing.T) {
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/appengine/resource_app_engine_firewall_rule_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccAppEngineFirewallRule_appEngineFirewallRuleBasicExample(t *testing.T
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/appengine/resource_app_engine_flexible_app_version_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func TestAccAppEngineFlexibleAppVersion_appEngineFlexibleAppVersionExample(t *te
3333
t.Parallel()
3434

3535
context := map[string]interface{}{
36-
"org_id": envvar.GetTestOrgFromEnv(t),
3736
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
37+
"org_id": envvar.GetTestOrgFromEnv(t),
3838
"random_suffix": acctest.RandString(t, 10),
3939
}
4040

‎google/services/apphub/resource_apphub_service_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApphubService_apphubServiceBasicExample(t *testing.T) {
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

@@ -179,8 +179,8 @@ func TestAccApphubService_apphubServiceFullExample(t *testing.T) {
179179
t.Parallel()
180180

181181
context := map[string]interface{}{
182-
"org_id": envvar.GetTestOrgFromEnv(t),
183182
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
183+
"org_id": envvar.GetTestOrgFromEnv(t),
184184
"random_suffix": acctest.RandString(t, 10),
185185
}
186186

‎google/services/apphub/resource_apphub_service_project_attachment_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApphubServiceProjectAttachment_serviceProjectAttachmentBasicExample(
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"host_project": envvar.GetTestProjectFromEnv(),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

@@ -87,8 +87,8 @@ func TestAccApphubServiceProjectAttachment_serviceProjectAttachmentFullExample(t
8787
t.Parallel()
8888

8989
context := map[string]interface{}{
90-
"org_id": envvar.GetTestOrgFromEnv(t),
9190
"host_project": envvar.GetTestProjectFromEnv(),
91+
"org_id": envvar.GetTestOrgFromEnv(t),
9292
"random_suffix": acctest.RandString(t, 10),
9393
}
9494

‎google/services/apphub/resource_apphub_workload_generated_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccApphubWorkload_apphubWorkloadBasicExample(t *testing.T) {
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"org_id": envvar.GetTestOrgFromEnv(t),
3938
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
39+
"org_id": envvar.GetTestOrgFromEnv(t),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

@@ -197,8 +197,8 @@ func TestAccApphubWorkload_apphubWorkloadFullExample(t *testing.T) {
197197
t.Parallel()
198198

199199
context := map[string]interface{}{
200-
"org_id": envvar.GetTestOrgFromEnv(t),
201200
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
201+
"org_id": envvar.GetTestOrgFromEnv(t),
202202
"random_suffix": acctest.RandString(t, 10),
203203
}
204204

‎google/services/cloudasset/resource_cloud_asset_folder_feed_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccCloudAssetFolderFeed_cloudAssetFolderFeedExample(t *testing.T) {
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"project": envvar.GetTestProjectFromEnv(),
3938
"org_id": envvar.GetTestOrgFromEnv(t),
39+
"project": envvar.GetTestProjectFromEnv(),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

‎google/services/cloudasset/resource_cloud_asset_organization_feed_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ func TestAccCloudAssetOrganizationFeed_cloudAssetOrganizationFeedExample(t *test
3535
t.Parallel()
3636

3737
context := map[string]interface{}{
38-
"project": envvar.GetTestProjectFromEnv(),
3938
"org_id": envvar.GetTestOrgFromEnv(t),
39+
"project": envvar.GetTestProjectFromEnv(),
4040
"random_suffix": acctest.RandString(t, 10),
4141
}
4242

0 commit comments

Comments
 (0)