Skip to content

Commit 6daeace

Browse files
committed
test for folder config
1 parent 19beebd commit 6daeace

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

mmv1/products/kms/AutokeyConfig.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ base_url: 'folders/{{folder}}/autokeyConfig'
3232
self_link: 'folders/{{folder}}/autokeyConfig'
3333
# This is a singleton resource that is already created, so create
3434
# is really an update, and therefore should be PATCHed.
35-
create_url: 'folders/{{folder}}/autokeyConfig?updateMask=keyProject'
35+
create_url: 'folders/{{folder}}/autokeyConfig?updateMask=Project,keyProjectResolutionMode'
3636
create_verb: 'PATCH'
37-
update_url: 'folders/{{folder}}/autokeyConfig?updateMask=keyProject'
37+
update_url: 'folders/{{folder}}/autokeyConfig?updateMask=Project,keyProjectResolutionMode'
3838
update_verb: 'PATCH'
39-
delete_url: 'folders/{{folder}}/autokeyConfig?updateMask=keyProject'
39+
delete_url: 'folders/{{folder}}/autokeyConfig?updateMask=Project,keyProjectResolutionMode'
4040
delete_verb: 'PATCH'
41+
update_mask: true
4142
import_format:
4243
- 'folders/{{folder}}/autokeyConfig'
4344
timeouts:
@@ -91,9 +92,7 @@ properties:
9192
- name: 'keyProjectResolutionMode'
9293
type: Enum
9394
description: 'How Autokey determines which project to use when provisioning CMEK keys.'
94-
ignore_read: true
9595
enum_values:
96-
- 'KEY_PROJECT_RESOLUTION_MODE_UNSPECIFIED'
9796
- 'DEDICATED_KEY_PROJECT'
9897
- 'RESOURCE_PROJECT'
9998
- 'DISABLED'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ resource "google_kms_autokey_config" "{{$.PrimaryResourceId}}" {
6565
provider = google-beta
6666
folder = google_folder.autokms_folder.id
6767
key_project = "projects/${google_project.key_project.project_id}"
68-
key_project_resolution_mode = "RESOURCE_PROJECT"
68+
key_project_resolution_mode = "DEDICATED_KEY_PROJECT"
6969
depends_on = [time_sleep.wait_srv_acc_permissions]
7070
}
7171

0 commit comments

Comments
 (0)