From ffff52293f0e9d01e5c5756ff4c21a9bef700fd2 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 17 Jun 2024 11:28:53 -0700 Subject: [PATCH] go rewrite - sort context map in test file (#10975) (#18461) [upstream:bb3772e87e97e5895f0271116c238faf0895c17c] Signed-off-by: Modular Magician --- .changelog/10975.txt | 3 +++ .../iam_apigee_environment_generated_test.go | 6 ++--- ...rce_apigee_addons_config_generated_test.go | 2 +- ...igee_endpoint_attachment_generated_test.go | 2 +- ...urce_apigee_env_keystore_generated_test.go | 2 +- ...ce_apigee_env_references_generated_test.go | 2 +- ...igee_envgroup_attachment_generated_test.go | 2 +- ...resource_apigee_envgroup_generated_test.go | 2 +- ...ource_apigee_environment_generated_test.go | 4 ++-- ...igee_instance_attachment_generated_test.go | 2 +- ...resource_apigee_instance_generated_test.go | 8 +++---- ...aliases_self_signed_cert_generated_test.go | 2 +- ...ource_apigee_nat_address_generated_test.go | 2 +- ...urce_apigee_organization_generated_test.go | 4 ++-- ...pigee_sync_authorization_generated_test.go | 2 +- ...rce_apigee_target_server_generated_test.go | 2 +- ...app_engine_firewall_rule_generated_test.go | 2 +- ...ine_flexible_app_version_generated_test.go | 2 +- .../resource_apphub_service_generated_test.go | 4 ++-- ...rvice_project_attachment_generated_test.go | 4 ++-- ...resource_apphub_workload_generated_test.go | 4 ++-- ..._cloud_asset_folder_feed_generated_test.go | 2 +- ..._asset_organization_feed_generated_test.go | 2 +- ...cloudfunctions2_function_generated_test.go | 22 +++++++++---------- ...urce_compute_reservation_generated_test.go | 4 ++-- ...vention_discovery_config_generated_test.go | 2 +- ...source_datastream_stream_generated_test.go | 2 +- ...esource_dns_managed_zone_generated_test.go | 2 +- .../dns/resource_dns_policy_generated_test.go | 2 +- .../iam_gke_hub_membership_generated_test.go | 6 ++--- ...ource_gke_hub_membership_generated_test.go | 2 +- ...e_hub_membership_binding_generated_test.go | 2 +- ...resource_iam_deny_policy_generated_test.go | 2 +- ...m_iap_app_engine_service_generated_test.go | 16 +++++++------- ..._iap_web_type_app_engine_generated_test.go | 16 +++++++------- .../iap/resource_iap_client_generated_test.go | 2 +- ...identity_platform_config_generated_test.go | 4 ++-- ..._connectors_managed_zone_generated_test.go | 2 +- ...ca_certificate_authority_generated_test.go | 12 +++++----- ...points_service_consumers_generated_test.go | 6 ++--- ..._featurestore_entitytype_generated_test.go | 2 +- ...e_vertex_ai_featurestore_generated_test.go | 4 ++-- 42 files changed, 90 insertions(+), 87 deletions(-) create mode 100644 .changelog/10975.txt diff --git a/.changelog/10975.txt b/.changelog/10975.txt new file mode 100644 index 00000000000..42b910df155 --- /dev/null +++ b/.changelog/10975.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` \ No newline at end of file diff --git a/google/services/apigee/iam_apigee_environment_generated_test.go b/google/services/apigee/iam_apigee_environment_generated_test.go index 0bd092ed300..52751998bbf 100644 --- 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 index a7c613d7886..ec803d7e96b 100644 --- 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 index 977fe5bf293..46db40b0daf 100644 --- 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 index c5fd02b3e09..b40c3a3eb24 100644 --- 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 index 68d31ee9dfa..81236311327 100644 --- 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 index 3b9906b453e..fb869c5806e 100644 --- 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 index 5345060c35a..353bf1bcc7b 100644 --- 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 index 91fe6a3785c..76d012b3deb 100644 --- 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 index 970b8ce259f..1e9d6ff1832 100644 --- 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 index 7ab9d72e84a..2ca91d718fe 100644 --- 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 index 6791bc84e03..663a8107214 100644 --- 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 index 5f4775f5f65..33d80928241 100644 --- 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 index 94b1aa1e094..a3a1543dfc4 100644 --- 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 index 164eeb6b639..af065fa5af6 100644 --- 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 index 064352c63a8..4bb8c4c514e 100644 --- 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 index 960f6d5832d..f7fb3118820 100644 --- 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 index 1510dc71b34..851d67ab849 100644 --- 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 index 7fe5adb2a45..dc49e5c9fce 100644 --- 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 index a599c66d891..ae68f0bff55 100644 --- 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 index 00ec8c32605..88b7f5a9b17 100644 --- 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 index e4c44306d07..137c8e12789 100644 --- 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 index 0bc83ccf0f6..7f43dd14ee8 100644 --- 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), } diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go index 58e7ae170c8..682ab8fde56 100644 --- a/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go +++ b/google/services/cloudfunctions2/resource_cloudfunctions2_function_generated_test.go @@ -36,8 +36,8 @@ func TestAccCloudfunctions2function_cloudfunctions2BasicExample(t *testing.T) { context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source.zip", "location": "us-central1", + "zip_path": "./test-fixtures/function-source.zip", "random_suffix": acctest.RandString(t, 10), } @@ -107,9 +107,9 @@ func TestAccCloudfunctions2function_cloudfunctions2FullExample(t *testing.T) { context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source-pubsub.zip", - "primary_resource_id": "terraform-test", "location": "us-central1", + "primary_resource_id": "terraform-test", + "zip_path": "./test-fixtures/function-source-pubsub.zip", "random_suffix": acctest.RandString(t, 10), } @@ -207,9 +207,9 @@ func TestAccCloudfunctions2function_cloudfunctions2BasicGcsExample(t *testing.T) context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source-eventarc-gcs.zip", - "primary_resource_id": "terraform-test", "policyChanged": acctest.BootstrapPSARole(t, "service-", "gcp-sa-pubsub", "roles/cloudkms.cryptoKeyEncrypterDecrypter"), + "primary_resource_id": "terraform-test", + "zip_path": "./test-fixtures/function-source-eventarc-gcs.zip", "random_suffix": acctest.RandString(t, 10), } @@ -343,9 +343,9 @@ func TestAccCloudfunctions2function_cloudfunctions2BasicAuditlogsExample(t *test context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source-eventarc-gcs.zip", - "primary_resource_id": "terraform-test", "policyChanged": acctest.BootstrapPSARole(t, "service-", "gcp-sa-pubsub", "roles/cloudkms.cryptoKeyEncrypterDecrypter"), + "primary_resource_id": "terraform-test", + "zip_path": "./test-fixtures/function-source-eventarc-gcs.zip", "random_suffix": acctest.RandString(t, 10), } @@ -485,8 +485,8 @@ func TestAccCloudfunctions2function_cloudfunctions2BasicBuilderExample(t *testin context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source.zip", "location": "us-central1", + "zip_path": "./test-fixtures/function-source.zip", "random_suffix": acctest.RandString(t, 10), } @@ -597,9 +597,9 @@ func TestAccCloudfunctions2function_cloudfunctions2SecretEnvExample(t *testing.T context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source.zip", "location": "us-central1", "policyChanged": acctest.BootstrapPSARole(t, "service-", "gcp-sa-pubsub", "roles/cloudkms.cryptoKeyEncrypterDecrypter"), + "zip_path": "./test-fixtures/function-source.zip", "random_suffix": acctest.RandString(t, 10), } @@ -696,9 +696,9 @@ func TestAccCloudfunctions2function_cloudfunctions2SecretVolumeExample(t *testin context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source.zip", "location": "us-central1", "policyChanged": acctest.BootstrapPSARole(t, "service-", "gcp-sa-pubsub", "roles/cloudkms.cryptoKeyEncrypterDecrypter"), + "zip_path": "./test-fixtures/function-source.zip", "random_suffix": acctest.RandString(t, 10), } @@ -794,8 +794,8 @@ func TestAccCloudfunctions2function_cloudfunctions2PrivateWorkerpoolExample(t *t context := map[string]interface{}{ "project": envvar.GetTestProjectFromEnv(), - "zip_path": "./test-fixtures/function-source.zip", "location": "us-central1", + "zip_path": "./test-fixtures/function-source.zip", "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/compute/resource_compute_reservation_generated_test.go b/google/services/compute/resource_compute_reservation_generated_test.go index 19f1e0f1a27..cc1f2b76b2d 100644 --- a/google/services/compute/resource_compute_reservation_generated_test.go +++ b/google/services/compute/resource_compute_reservation_generated_test.go @@ -78,9 +78,9 @@ func TestAccComputeReservation_sharedReservationBasicExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), + "project": envvar.GetTestProjectFromEnv(), "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go b/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go index db40df71462..ed3037d7b91 100644 --- a/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go +++ b/google/services/datalossprevention/resource_data_loss_prevention_discovery_config_generated_test.go @@ -35,8 +35,8 @@ func TestAccDataLossPreventionDiscoveryConfig_dlpDiscoveryConfigOrgFolderPausedE t.Parallel() context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), "organization": envvar.GetTestOrgFromEnv(t), + "project": envvar.GetTestProjectFromEnv(), "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/datastream/resource_datastream_stream_generated_test.go b/google/services/datastream/resource_datastream_stream_generated_test.go index 532f89ebb0e..13ac5c112cd 100644 --- a/google/services/datastream/resource_datastream_stream_generated_test.go +++ b/google/services/datastream/resource_datastream_stream_generated_test.go @@ -573,8 +573,8 @@ func TestAccDatastreamStream_datastreamStreamBigqueryExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "deletion_protection": false, "bigquery_destination_table_kms_key_name": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name, + "deletion_protection": false, "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/dns/resource_dns_managed_zone_generated_test.go b/google/services/dns/resource_dns_managed_zone_generated_test.go index 7463b0c83cd..45adb9f65e6 100644 --- a/google/services/dns/resource_dns_managed_zone_generated_test.go +++ b/google/services/dns/resource_dns_managed_zone_generated_test.go @@ -269,8 +269,8 @@ func TestAccDNSManagedZone_dnsManagedZonePrivateMultiprojectExample(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/dns/resource_dns_policy_generated_test.go b/google/services/dns/resource_dns_policy_generated_test.go index 1c8a5c5157b..9ae616ad0c8 100644 --- a/google/services/dns/resource_dns_policy_generated_test.go +++ b/google/services/dns/resource_dns_policy_generated_test.go @@ -97,8 +97,8 @@ func TestAccDNSPolicy_dnsPolicyMultiprojectExample(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/gkehub/iam_gke_hub_membership_generated_test.go b/google/services/gkehub/iam_gke_hub_membership_generated_test.go index 11565c5f174..6d3158d786e 100644 --- a/google/services/gkehub/iam_gke_hub_membership_generated_test.go +++ b/google/services/gkehub/iam_gke_hub_membership_generated_test.go @@ -33,8 +33,8 @@ func TestAccGKEHubMembershipIamBindingGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/viewer", - "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), @@ -73,8 +73,8 @@ func TestAccGKEHubMembershipIamMemberGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/viewer", - "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), @@ -104,8 +104,8 @@ func TestAccGKEHubMembershipIamPolicyGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/viewer", - "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), diff --git a/google/services/gkehub/resource_gke_hub_membership_generated_test.go b/google/services/gkehub/resource_gke_hub_membership_generated_test.go index 7a170c9fb22..895f241a99c 100644 --- a/google/services/gkehub/resource_gke_hub_membership_generated_test.go +++ b/google/services/gkehub/resource_gke_hub_membership_generated_test.go @@ -35,8 +35,8 @@ func TestAccGKEHubMembership_gkehubMembershipRegionalExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), "random_suffix": acctest.RandString(t, 10), diff --git a/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go b/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go index 9977fa75cbe..174a246f3ce 100644 --- a/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go +++ b/google/services/gkehub2/resource_gke_hub_membership_binding_generated_test.go @@ -35,8 +35,8 @@ func TestAccGKEHub2MembershipBinding_gkehubMembershipBindingBasicExample(t *test t.Parallel() context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), "location": envvar.GetTestRegionFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "deletion_protection": false, "network_name": acctest.BootstrapSharedTestNetwork(t, "gke-cluster"), "subnetwork_name": acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster")), diff --git a/google/services/iam2/resource_iam_deny_policy_generated_test.go b/google/services/iam2/resource_iam_deny_policy_generated_test.go index d7f78b9eda0..e2dbf5ec95b 100644 --- a/google/services/iam2/resource_iam_deny_policy_generated_test.go +++ b/google/services/iam2/resource_iam_deny_policy_generated_test.go @@ -35,8 +35,8 @@ func TestAccIAM2DenyPolicy_iamDenyPolicyBasicExample(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/iap/iam_iap_app_engine_service_generated_test.go b/google/services/iap/iam_iap_app_engine_service_generated_test.go index 679d714975e..989491f001f 100644 --- a/google/services/iap/iam_iap_app_engine_service_generated_test.go +++ b/google/services/iap/iam_iap_app_engine_service_generated_test.go @@ -36,8 +36,8 @@ func TestAccIapAppEngineServiceIamBindingGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -80,8 +80,8 @@ func TestAccIapAppEngineServiceIamMemberGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -115,8 +115,8 @@ func TestAccIapAppEngineServiceIamPolicyGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -159,8 +159,8 @@ func TestAccIapAppEngineServiceIamBindingGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -195,8 +195,8 @@ func TestAccIapAppEngineServiceIamBindingGenerated_withAndWithoutCondition(t *te "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -241,8 +241,8 @@ func TestAccIapAppEngineServiceIamMemberGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -277,8 +277,8 @@ func TestAccIapAppEngineServiceIamMemberGenerated_withAndWithoutCondition(t *tes "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -323,8 +323,8 @@ func TestAccIapAppEngineServiceIamPolicyGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, diff --git a/google/services/iap/iam_iap_web_type_app_engine_generated_test.go b/google/services/iap/iam_iap_web_type_app_engine_generated_test.go index 80de01124d7..2a83429ed5c 100644 --- a/google/services/iap/iam_iap_web_type_app_engine_generated_test.go +++ b/google/services/iap/iam_iap_web_type_app_engine_generated_test.go @@ -36,8 +36,8 @@ func TestAccIapWebTypeAppEngineIamBindingGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -84,8 +84,8 @@ func TestAccIapWebTypeAppEngineIamMemberGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -123,8 +123,8 @@ func TestAccIapWebTypeAppEngineIamPolicyGenerated(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -171,8 +171,8 @@ func TestAccIapWebTypeAppEngineIamBindingGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -211,8 +211,8 @@ func TestAccIapWebTypeAppEngineIamBindingGenerated_withAndWithoutCondition(t *te "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -261,8 +261,8 @@ func TestAccIapWebTypeAppEngineIamMemberGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -301,8 +301,8 @@ func TestAccIapWebTypeAppEngineIamMemberGenerated_withAndWithoutCondition(t *tes "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, @@ -351,8 +351,8 @@ func TestAccIapWebTypeAppEngineIamPolicyGenerated_withCondition(t *testing.T) { "random_suffix": acctest.RandString(t, 10), "role": "roles/iap.httpsResourceAccessor", "project_id": fmt.Sprintf("tf-test%s", acctest.RandString(t, 10)), - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "condition_title": "expires_after_2019_12_31", "condition_expr": `request.time < timestamp(\"2020-01-01T00:00:00Z\")`, diff --git a/google/services/iap/resource_iap_client_generated_test.go b/google/services/iap/resource_iap_client_generated_test.go index a0506636e11..beed03bc72d 100644 --- a/google/services/iap/resource_iap_client_generated_test.go +++ b/google/services/iap/resource_iap_client_generated_test.go @@ -35,8 +35,8 @@ func TestAccIapClient_iapClientExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "org_domain": envvar.GetTestOrgDomainFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/identityplatform/resource_identity_platform_config_generated_test.go b/google/services/identityplatform/resource_identity_platform_config_generated_test.go index 3b2c6fb1145..6315e1b38e7 100644 --- a/google/services/identityplatform/resource_identity_platform_config_generated_test.go +++ b/google/services/identityplatform/resource_identity_platform_config_generated_test.go @@ -32,8 +32,8 @@ func TestAccIdentityPlatformConfig_identityPlatformConfigBasicExample(t *testing t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "billing_acct": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "quota_start_time": time.Now().AddDate(0, 0, 1).Format(time.RFC3339), "random_suffix": acctest.RandString(t, 10), } @@ -131,8 +131,8 @@ func TestAccIdentityPlatformConfig_identityPlatformConfigMinimalExample(t *testi t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "billing_acct": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go b/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go index 5987a7336e3..13a7a0463e2 100644 --- a/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go +++ b/google/services/integrationconnectors/resource_integration_connectors_managed_zone_generated_test.go @@ -36,8 +36,8 @@ func TestAccIntegrationConnectorsManagedZone_integrationConnectorsManagedZoneExa 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/privateca/resource_privateca_certificate_authority_generated_test.go b/google/services/privateca/resource_privateca_certificate_authority_generated_test.go index 984a0ca9ef0..d29a9d2731b 100644 --- a/google/services/privateca/resource_privateca_certificate_authority_generated_test.go +++ b/google/services/privateca/resource_privateca_certificate_authority_generated_test.go @@ -34,9 +34,9 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityBasicExam t.Parallel() context := map[string]interface{}{ - "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), - "pool_location": "us-central1", "deletion_protection": false, + "pool_location": "us-central1", + "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), "random_suffix": acctest.RandString(t, 10), } @@ -116,9 +116,9 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthoritySubordina t.Parallel() context := map[string]interface{}{ - "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), - "pool_location": "us-central1", "deletion_protection": false, + "pool_location": "us-central1", + "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), "random_suffix": acctest.RandString(t, 10), } @@ -244,10 +244,10 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityCustomSki t.Parallel() context := map[string]interface{}{ + "deletion_protection": false, "kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocation(t, "ASYMMETRIC_SIGN", "us-central1").CryptoKey.Name, - "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), "pool_location": "us-central1", - "deletion_protection": false, + "pool_name": acctest.BootstrapSharedCaPoolInLocation(t, "us-central1"), "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go b/google/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go index 2e2976f6efb..0d8cac8bc38 100644 --- a/google/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go +++ b/google/services/servicemanagement/iam_endpoints_service_consumers_generated_test.go @@ -33,8 +33,8 @@ func TestAccServiceManagementServiceConsumersIamBindingGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/servicemanagement.serviceController", - "project_name": envvar.GetTestProjectFromEnv(), "consumer_project": envvar.GetTestProjectFromEnv(), + "project_name": envvar.GetTestProjectFromEnv(), } acctest.VcrTest(t, resource.TestCase{ @@ -70,8 +70,8 @@ func TestAccServiceManagementServiceConsumersIamMemberGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/servicemanagement.serviceController", - "project_name": envvar.GetTestProjectFromEnv(), "consumer_project": envvar.GetTestProjectFromEnv(), + "project_name": envvar.GetTestProjectFromEnv(), } acctest.VcrTest(t, resource.TestCase{ @@ -98,8 +98,8 @@ func TestAccServiceManagementServiceConsumersIamPolicyGenerated(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), "role": "roles/servicemanagement.serviceController", - "project_name": envvar.GetTestProjectFromEnv(), "consumer_project": envvar.GetTestProjectFromEnv(), + "project_name": envvar.GetTestProjectFromEnv(), } acctest.VcrTest(t, resource.TestCase{ diff --git a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go index a0dd5b8fc2f..7e7f94b2264 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore_entitytype_generated_test.go @@ -35,8 +35,8 @@ func TestAccVertexAIFeaturestoreEntitytype_vertexAiFeaturestoreEntitytypeExample t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "kms_key_name": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } diff --git a/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go b/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go index cf89f8f6386..9c7dbafae18 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore_generated_test.go @@ -35,8 +35,8 @@ func TestAccVertexAIFeaturestore_vertexAiFeaturestoreExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "kms_key_name": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } @@ -82,8 +82,8 @@ func TestAccVertexAIFeaturestore_vertexAiFeaturestoreScalingExample(t *testing.T t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), "billing_account": envvar.GetTestBillingAccountFromEnv(t), + "org_id": envvar.GetTestOrgFromEnv(t), "kms_key_name": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), }