Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replacing random_suffix from a- docs #5457

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/7675.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand Down Expand Up @@ -110,21 +110,21 @@ 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
}

resource "google_apigee_keystores_aliases_self_signed_cert" "apigee_environment_keystore_ss_alias" {
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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" {
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/active_directory_peering.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/apigee_envgroup.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
10 changes: 5 additions & 5 deletions website/docs/r/apigee_envgroup_attachment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
}
Expand Down Expand Up @@ -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" "" {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/apigee_environment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions website/docs/r/apigee_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/apigee_instance_attachment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
}
Expand Down Expand Up @@ -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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -90,21 +90,21 @@ 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
}

resource "google_apigee_keystores_aliases_self_signed_cert" "apigee_environment_keystore_ss_alias" {
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
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/apigee_nat_address.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
```
Expand Down