Skip to content

Commit c8fde26

Browse files
qlikcoeqlikcoe
authored
Fix: Stop warning about deprecated external references from destroy provisioners. (terraform-google-modules#420)
1 parent cc53d1c commit c8fde26

File tree

7 files changed

+49
-14
lines changed

7 files changed

+49
-14
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,13 +495,18 @@ resource "google_container_node_pool" "pools" {
495495
resource "null_resource" "wait_for_cluster" {
496496
count = var.skip_provisioners ? 0 : 1
497497

498+
triggers = {
499+
project_id = var.project_id
500+
name = var.name
501+
}
502+
498503
provisioner "local-exec" {
499-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
504+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
500505
}
501506

502507
provisioner "local-exec" {
503508
when = destroy
504-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
509+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
505510
}
506511

507512
depends_on = [

‎cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,18 @@ resource "google_container_node_pool" "pools" {
227227
resource "null_resource" "wait_for_cluster" {
228228
count = var.skip_provisioners ? 0 : 1
229229

230+
triggers = {
231+
project_id = var.project_id
232+
name = var.name
233+
}
234+
230235
provisioner "local-exec" {
231-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
236+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
232237
}
233238

234239
provisioner "local-exec" {
235240
when = destroy
236-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
241+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
237242
}
238243

239244
depends_on = [

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,18 @@ resource "google_container_node_pool" "pools" {
447447
resource "null_resource" "wait_for_cluster" {
448448
count = var.skip_provisioners ? 0 : 1
449449

450+
triggers = {
451+
project_id = var.project_id
452+
name = var.name
453+
}
454+
450455
provisioner "local-exec" {
451-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
456+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
452457
}
453458

454459
provisioner "local-exec" {
455460
when = destroy
456-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
461+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
457462
}
458463

459464
depends_on = [

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,18 @@ resource "google_container_node_pool" "pools" {
374374
resource "null_resource" "wait_for_cluster" {
375375
count = var.skip_provisioners ? 0 : 1
376376

377+
triggers = {
378+
project_id = var.project_id
379+
name = var.name
380+
}
381+
377382
provisioner "local-exec" {
378-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
383+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
379384
}
380385

381386
provisioner "local-exec" {
382387
when = destroy
383-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
388+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
384389
}
385390

386391
depends_on = [

‎modules/beta-public-cluster/cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,18 @@ resource "google_container_node_pool" "pools" {
361361
resource "null_resource" "wait_for_cluster" {
362362
count = var.skip_provisioners ? 0 : 1
363363

364+
triggers = {
365+
project_id = var.project_id
366+
name = var.name
367+
}
368+
364369
provisioner "local-exec" {
365-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
370+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
366371
}
367372

368373
provisioner "local-exec" {
369374
when = destroy
370-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
375+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
371376
}
372377

373378
depends_on = [

‎modules/private-cluster-update-variant/cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,18 @@ resource "google_container_node_pool" "pools" {
313313
resource "null_resource" "wait_for_cluster" {
314314
count = var.skip_provisioners ? 0 : 1
315315

316+
triggers = {
317+
project_id = var.project_id
318+
name = var.name
319+
}
320+
316321
provisioner "local-exec" {
317-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
322+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
318323
}
319324

320325
provisioner "local-exec" {
321326
when = destroy
322-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
327+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
323328
}
324329

325330
depends_on = [

‎modules/private-cluster/cluster.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,18 @@ resource "google_container_node_pool" "pools" {
240240
resource "null_resource" "wait_for_cluster" {
241241
count = var.skip_provisioners ? 0 : 1
242242

243+
triggers = {
244+
project_id = var.project_id
245+
name = var.name
246+
}
247+
243248
provisioner "local-exec" {
244-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
249+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
245250
}
246251

247252
provisioner "local-exec" {
248253
when = destroy
249-
command = "${path.module}/scripts/wait-for-cluster.sh ${var.project_id} ${var.name}"
254+
command = "${path.module}/scripts/wait-for-cluster.sh ${self.triggers.project_id} ${self.triggers.name}"
250255
}
251256

252257
depends_on = [

0 commit comments

Comments
 (0)