diff --git a/.changelog/7675.txt b/.changelog/7675.txt new file mode 100644 index 0000000000..8ec013c069 --- /dev/null +++ b/.changelog/7675.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` diff --git a/google-beta/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go b/google-beta/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go index cce1ed86a9..86b33207c0 100644 --- a/google-beta/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go +++ b/google-beta/resource_apigee_keystores_aliases_self_signed_cert_generated_test.go @@ -53,8 +53,8 @@ func TestAccApigeeKeystoresAliasesSelfSignedCert_apigeeEnvKeystoreAliasSelfSigne func testAccApigeeKeystoresAliasesSelfSignedCert_apigeeEnvKeystoreAliasSelfSignedCertExample(context map[string]interface{}) string { return Nprintf(` resource "google_project" "project" { - project_id = "tf-test%{random_suffix}" - name = "tf-test%{random_suffix}" + project_id = "tf-test-my-project%{random_suffix}" + name = "tf-test-my-project%{random_suffix}" org_id = "%{org_id}" billing_account = "%{billing_account}" } @@ -110,13 +110,13 @@ resource "google_apigee_organization" "apigee_org" { resource "google_apigee_environment" "apigee_environment_keystore_ss_alias" { org_id = google_apigee_organization.apigee_org.id - name = "tf-test%{random_suffix}" + name = "tf-test-env-name%{random_suffix}" description = "Apigee Environment" display_name = "environment-1" } resource "google_apigee_env_keystore" "apigee_environment_keystore_alias" { - name = "tf-test-keystore%{random_suffix}" + name = "tf-test-env-keystore%{random_suffix}" env_id = google_apigee_environment.apigee_environment_keystore_ss_alias.id } @@ -124,7 +124,7 @@ resource "google_apigee_keystores_aliases_self_signed_cert" "apigee_environment_ environment = google_apigee_environment.apigee_environment_keystore_ss_alias.name org_id = google_apigee_organization.apigee_org.name keystore = google_apigee_env_keystore.apigee_environment_keystore_alias.name - alias = "tf test-alias%{random_suffix}" + alias = "alias%{random_suffix}" key_size = 1024 sig_alg = "SHA512withRSA" cert_validity_in_days = 4 diff --git a/website/docs/r/access_context_manager_access_level_condition.html.markdown b/website/docs/r/access_context_manager_access_level_condition.html.markdown index f2efd1666c..86b4d12c91 100644 --- a/website/docs/r/access_context_manager_access_level_condition.html.markdown +++ b/website/docs/r/access_context_manager_access_level_condition.html.markdown @@ -47,8 +47,8 @@ Your account must have the `serviceusage.services.use` permission on the ```hcl resource "google_access_context_manager_access_level" "access-level-service-account" { parent = "accessPolicies/${google_access_context_manager_access_policy.access-policy.name}" - name = "accessPolicies/${google_access_context_manager_access_policy.access-policy.name}/accessLevels/tf_test_chromeos_no_lock%{random_suffix}" - title = "tf_test_chromeos_no_lock%{random_suffix}" + name = "accessPolicies/${google_access_context_manager_access_policy.access-policy.name}/accessLevels/chromeos_no_lock" + title = "chromeos_no_lock" basic { conditions { device_policy { @@ -71,7 +71,7 @@ resource "google_access_context_manager_access_level" "access-level-service-acco } resource "google_service_account" "created-later" { - account_id = "tf-test-%{random_suffix}" + account_id = "my-account-id" } resource "google_access_context_manager_access_level_condition" "access-level-conditions" { diff --git a/website/docs/r/active_directory_peering.html.markdown b/website/docs/r/active_directory_peering.html.markdown index edbc1184ca..e8874dd3bb 100644 --- a/website/docs/r/active_directory_peering.html.markdown +++ b/website/docs/r/active_directory_peering.html.markdown @@ -46,7 +46,7 @@ resource "google_active_directory_peering" "ad-domain-peering" { resource "google_active_directory_domain" "ad-domain" { provider = google-beta - domain_name = "ad.test.d-%{random_suffix}.com" + domain_name = "ad.test.hashicorptest.com" locations = ["us-central1"] reserved_ip_range = "192.168.255.0/24" authorized_networks = [google_compute_network.source-network.id] @@ -71,8 +71,8 @@ resource "google_project_service" "compute" { resource "google_project" "peered-project" { provider = google-beta - name = "peered-project-%{random_suffix}" - project_id = "peered-project-%{random_suffix}" + name = "my-peered-project" + project_id = "my-peered-project" org_id = "123456789" billing_account = "000000-0000000-0000000-000000" } diff --git a/website/docs/r/apigee_envgroup.html.markdown b/website/docs/r/apigee_envgroup.html.markdown index f5e37b7600..9997d05345 100644 --- a/website/docs/r/apigee_envgroup.html.markdown +++ b/website/docs/r/apigee_envgroup.html.markdown @@ -60,7 +60,7 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_envgroup" "env_grp" { - name = "tf-test%{random_suffix}" + name = "my-envgroup" hostnames = ["abc.foo.com"] org_id = google_apigee_organization.apigee_org.id } diff --git a/website/docs/r/apigee_envgroup_attachment.html.markdown b/website/docs/r/apigee_envgroup_attachment.html.markdown index a4be721a01..cd19b549a7 100644 --- a/website/docs/r/apigee_envgroup_attachment.html.markdown +++ b/website/docs/r/apigee_envgroup_attachment.html.markdown @@ -33,8 +33,8 @@ To get more information about EnvgroupAttachment, see: ```hcl resource "google_project" "project" { - project_id = "tf-test%{random_suffix}" - name = "tf-test%{random_suffix}" + project_id = "my-project" + name = "my-project" org_id = "" billing_account = "" } @@ -88,15 +88,15 @@ resource "google_apigee_organization" "apigee_org" { resource "google_apigee_envgroup" "apigee_envgroup" { org_id = google_apigee_organization.apigee_org.id - name = "tf-test%{random_suffix}" + name = "my-envgroup" hostnames = ["abc.foo.com"] } resource "google_apigee_environment" "apigee_env" { org_id = google_apigee_organization.apigee_org.id - name = "tf-test%{random_suffix}" + name = "my-environment" description = "Apigee Environment" - display_name = "tf-test%{random_suffix}" + display_name = "my-environment" } resource "google_apigee_envgroup_attachment" "" { diff --git a/website/docs/r/apigee_environment.html.markdown b/website/docs/r/apigee_environment.html.markdown index 4235f17b4a..f95fdd1fdb 100644 --- a/website/docs/r/apigee_environment.html.markdown +++ b/website/docs/r/apigee_environment.html.markdown @@ -60,7 +60,7 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_environment" "env" { - name = "tf-test%{random_suffix}" + name = "my-environment" description = "Apigee Environment" display_name = "environment-1" org_id = google_apigee_organization.apigee_org.id diff --git a/website/docs/r/apigee_instance.html.markdown b/website/docs/r/apigee_instance.html.markdown index 9c00ce4dbe..023796a572 100644 --- a/website/docs/r/apigee_instance.html.markdown +++ b/website/docs/r/apigee_instance.html.markdown @@ -60,7 +60,7 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" + name = "my-instance-name" location = "us-central1" org_id = google_apigee_organization.apigee_org.id } @@ -97,7 +97,7 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" + name = "my-instance-name" location = "us-central1" org_id = google_apigee_organization.apigee_org.id peering_cidr_range = "SLASH_22" @@ -135,7 +135,7 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" + name = "my-instance-name" location = "us-central1" org_id = google_apigee_organization.apigee_org.id ip_range = "10.87.8.0/22" @@ -209,10 +209,10 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" + name = "my-instance-name" location = "us-central1" description = "Terraform-managed Apigee Runtime Instance" - display_name = "tf-test%{random_suffix}" + display_name = "my-instance-name" org_id = google_apigee_organization.apigee_org.id disk_encryption_key_name = google_kms_crypto_key.apigee_key.id } diff --git a/website/docs/r/apigee_instance_attachment.html.markdown b/website/docs/r/apigee_instance_attachment.html.markdown index f0bfe34600..ff03f0086d 100644 --- a/website/docs/r/apigee_instance_attachment.html.markdown +++ b/website/docs/r/apigee_instance_attachment.html.markdown @@ -33,8 +33,8 @@ To get more information about InstanceAttachment, see: ```hcl resource "google_project" "project" { - project_id = "tf-test%{random_suffix}" - name = "tf-test%{random_suffix}" + project_id = "my-project" + name = "my-project" org_id = "" billing_account = "" } @@ -87,14 +87,14 @@ resource "google_apigee_organization" "apigee_org" { } resource "google_apigee_instance" "apigee_ins" { - name = "tf-test%{random_suffix}" + name = "my-instance-name" location = "us-central1" org_id = google_apigee_organization.apigee_org.id } resource "google_apigee_environment" "apigee_env" { org_id = google_apigee_organization.apigee_org.id - name = "tf-test%{random_suffix}" + name = "my-environment-name" description = "Apigee Environment" display_name = "environment-1" } diff --git a/website/docs/r/apigee_keystores_aliases_self_signed_cert.html.markdown b/website/docs/r/apigee_keystores_aliases_self_signed_cert.html.markdown index ffbf13b442..ac20f5fc81 100644 --- a/website/docs/r/apigee_keystores_aliases_self_signed_cert.html.markdown +++ b/website/docs/r/apigee_keystores_aliases_self_signed_cert.html.markdown @@ -33,8 +33,8 @@ To get more information about KeystoresAliasesSelfSignedCert, see: ```hcl resource "google_project" "project" { - project_id = "tf-test%{random_suffix}" - name = "tf-test%{random_suffix}" + project_id = "my-project" + name = "my-project" org_id = "123456789" billing_account = "000000-0000000-0000000-000000" } @@ -90,13 +90,13 @@ resource "google_apigee_organization" "apigee_org" { resource "google_apigee_environment" "apigee_environment_keystore_ss_alias" { org_id = google_apigee_organization.apigee_org.id - name = "tf-test%{random_suffix}" + name = "env-name" description = "Apigee Environment" display_name = "environment-1" } resource "google_apigee_env_keystore" "apigee_environment_keystore_alias" { - name = "tf-test-keystore%{random_suffix}" + name = "env-keystore" env_id = google_apigee_environment.apigee_environment_keystore_ss_alias.id } @@ -104,7 +104,7 @@ resource "google_apigee_keystores_aliases_self_signed_cert" "apigee_environment_ environment = google_apigee_environment.apigee_environment_keystore_ss_alias.name org_id = google_apigee_organization.apigee_org.name keystore = google_apigee_env_keystore.apigee_environment_keystore_alias.name - alias = "tf test-alias%{random_suffix}" + alias = "alias" key_size = 1024 sig_alg = "SHA512withRSA" cert_validity_in_days = 4 diff --git a/website/docs/r/apigee_nat_address.html.markdown b/website/docs/r/apigee_nat_address.html.markdown index b35e6aa5d8..83ee0b6561 100644 --- a/website/docs/r/apigee_nat_address.html.markdown +++ b/website/docs/r/apigee_nat_address.html.markdown @@ -106,7 +106,7 @@ resource "google_apigee_instance" "apigee_instance" { } resource "google_apigee_nat_address" "apigee-nat" { - name = "tf-test%{random_suffix}" + name = "my-nat-address" instance_id = google_apigee_instance.apigee_instance.id } ```