Skip to content

Commit 6f5b8f2

Browse files
Make acctest use bootstrapped KMS key, instead of making new key that resembles a shared key (#9926) (#6938)
[upstream:ad957b2163d533b15bc85fff8f2016127a15317e] Signed-off-by: Modular Magician <[email protected]>
1 parent 86add51 commit 6f5b8f2

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

.changelog/9926.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/services/workbench/resource_workbench_instance_generated_test.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ func TestAccWorkbenchInstance_workbenchInstanceFullExample(t *testing.T) {
170170

171171
context := map[string]interface{}{
172172
"service_account": envvar.GetTestServiceAccountFromEnv(t),
173+
"key_name": acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name,
173174
"random_suffix": acctest.RandString(t, 10),
174175
}
175176

@@ -205,16 +206,6 @@ resource "google_compute_subnetwork" "my_subnetwork" {
205206
ip_cidr_range = "10.0.1.0/24"
206207
}
207208
208-
resource "google_kms_key_ring" "keyring" {
209-
name = "tf-test-tftest-shared-keyring-1%{random_suffix}"
210-
location = "global"
211-
}
212-
213-
resource "google_kms_crypto_key" "crypto-key" {
214-
name = "tf-test-tftest-shared-key-1%{random_suffix}"
215-
key_ring = google_kms_key_ring.keyring.id
216-
}
217-
218209
resource "google_workbench_instance" "instance" {
219210
name = "tf-test-workbench-instance%{random_suffix}"
220211
location = "us-central1-a"
@@ -236,14 +227,14 @@ resource "google_workbench_instance" "instance" {
236227
disk_size_gb = 310
237228
disk_type = "PD_SSD"
238229
disk_encryption = "GMEK"
239-
kms_key = google_kms_crypto_key.crypto-key.id
230+
kms_key = "%{key_name}"
240231
}
241232
242233
data_disks {
243234
disk_size_gb = 330
244235
disk_type = "PD_SSD"
245236
disk_encryption = "GMEK"
246-
kms_key = google_kms_crypto_key.crypto-key.id
237+
kms_key = "%{key_name}"
247238
}
248239
249240
network_interfaces {

website/docs/r/workbench_instance.html.markdown

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,6 @@ resource "google_compute_subnetwork" "my_subnetwork" {
107107
ip_cidr_range = "10.0.1.0/24"
108108
}
109109
110-
resource "google_kms_key_ring" "keyring" {
111-
name = "tftest-shared-keyring-1"
112-
location = "global"
113-
}
114-
115-
resource "google_kms_crypto_key" "crypto-key" {
116-
name = "tftest-shared-key-1"
117-
key_ring = google_kms_key_ring.keyring.id
118-
}
119-
120110
resource "google_workbench_instance" "instance" {
121111
name = "workbench-instance"
122112
location = "us-central1-a"
@@ -138,14 +128,14 @@ resource "google_workbench_instance" "instance" {
138128
disk_size_gb = 310
139129
disk_type = "PD_SSD"
140130
disk_encryption = "GMEK"
141-
kms_key = google_kms_crypto_key.crypto-key.id
131+
kms_key = "my-crypto-key"
142132
}
143133
144134
data_disks {
145135
disk_size_gb = 330
146136
disk_type = "PD_SSD"
147137
disk_encryption = "GMEK"
148-
kms_key = google_kms_crypto_key.crypto-key.id
138+
kms_key = "my-crypto-key"
149139
}
150140
151141
network_interfaces {

0 commit comments

Comments
 (0)