Skip to content

Commit

Permalink
Fix client request only properties. (GoogleCloudPlatform#10299)
Browse files Browse the repository at this point in the history
  • Loading branch information
rohitjangid authored and pawelJas committed May 16, 2024
1 parent 7010c5f commit a4d694c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
8 changes: 4 additions & 4 deletions mmv1/products/integrations/Client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ properties:
description: |
Cloud KMS config for AuthModule to encrypt/decrypt credentials.
immutable: true
url_param_only: true
ignore_read: true
properties:
- !ruby/object:Api::Type::String
name: "kmsLocation"
Expand Down Expand Up @@ -88,19 +88,19 @@ properties:
description: |
Indicates if sample workflow should be created along with provisioning.
immutable: true
url_param_only: true
ignore_read: true
- !ruby/object:Api::Type::Boolean
name: 'provisionGmek'
description: |
Indicates provision with GMEK or CMEK.
immutable: true
url_param_only: true
ignore_read: true
- !ruby/object:Api::Type::String
name: 'runAsServiceAccount'
description: |
User input run-as service account, if empty, will bring up a new default service account.
immutable: true
url_param_only: true
ignore_read: true
examples:
- !ruby/object:Provider::Terraform::Examples
name: "integrations_client_basic"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ data "google_project" "test_project" {

resource "google_kms_key_ring" "keyring" {
name = "<%= ctx[:vars]['key_ring_name'] %>"
location = "us-central1"
location = "us-east1"
}

resource "google_kms_crypto_key" "cryptokey" {
Expand All @@ -18,17 +18,21 @@ resource "google_kms_crypto_key_version" "test_key" {
depends_on = [google_kms_crypto_key.cryptokey]
}

resource "google_service_account" "service_account" {
account_id = "service-account-id"
display_name = "Service Account"
}

resource "google_integrations_client" "<%= ctx[:primary_resource_id] %>" {
location = "us-central1"
location = "us-east1"
create_sample_workflows = true
provision_gmek = true
run_as_service_account = "radndom-service-account"
run_as_service_account = google_service_account.service_account.email
cloud_kms_config {
kms_location = "us-central1"
kms_location = "us-east1"
kms_ring = google_kms_key_ring.keyring.id
key = google_kms_crypto_key.cryptokey.id
key_version = google_kms_crypto_key_version.test_key.id
kms_project_id = data.google_project.test_project.id
kms_project_id = data.google_project.test_project.project_id
}
depends_on = [google_kms_crypto_key_version.test_key]
depends_on = [google_kms_crypto_key_version.test_key, google_service_account.service_account]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
resource "google_integrations_client" "<%= ctx[:primary_resource_id] %>" {
location = "us-central1"
provision_gmek = true
}

0 comments on commit a4d694c

Please sign in to comment.