Skip to content

Commit fc9b937

Browse files
Fix Issue 24367: The provider hashicorp/google does not support resource type "google_project_service_identity" (#15205)
1 parent e590477 commit fc9b937

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

mmv1/products/privateca/CaPool.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ examples:
5858
primary_resource_id: 'default'
5959
vars:
6060
name: 'my-pool'
61-
pool_location: 'asia-east1'
62-
cloud_kms_key: 'projects/keys-project/locations/asia-east1/keyRings/key-ring/cryptoKeys/crypto-key'
61+
cloud_kms_key: 'projects/keys-project/locations/us-central1/keyRings/key-ring/cryptoKeys/crypto-key'
6362
test_vars_overrides:
64-
'pool_location': '"asia-east1"'
65-
'cloud_kms_key': 'acctest.BootstrapKMSKeyWithPurposeInLocation(t, "ENCRYPT_DECRYPT", "asia-east1").CryptoKey.Name'
63+
'cloud_kms_key': 'acctest.BootstrapKMSKeyWithPurposeInLocation(t, "ENCRYPT_DECRYPT", "us-central1").CryptoKey.Name'
64+
# Test requires a beta-only resource
65+
min_version: beta
6666
- name: 'privateca_quickstart'
6767
primary_resource_id: 'default'
6868
vars:

mmv1/templates/terraform/examples/privateca_capool_all_fields.tf.tmpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
resource "google_project_service_identity" "privateca_sa" {
2+
provider = google-beta
23
service = "privateca.googleapis.com"
34
}
45

56
resource "google_kms_crypto_key_iam_member" "privateca_sa_keyuser_encrypterdecrypter" {
7+
provider = google-beta
68
crypto_key_id = "{{index $.Vars "cloud_kms_key"}}"
79
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
810
member = google_project_service_identity.privateca_sa.member
911
}
1012

1113
resource "google_privateca_ca_pool" "{{$.PrimaryResourceId}}" {
14+
provider = google-beta
1215
name = "{{index $.Vars "name"}}"
13-
location = "{{index $.Vars "pool_location"}}"
16+
location = "us-central1"
1417
tier = "ENTERPRISE"
1518
publishing_options {
1619
publish_ca_cert = false

0 commit comments

Comments
 (0)