fix(TPG>=6.11)!: add deletion protection variable to google_workflows_workflow (#370)

SamuZad · web-flow · commit 72335270b153 · 2025-01-23T15:24:13.000-08:00
diff --git a/metadata.display.yaml b/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/authorization/metadata.display.yaml b/modules/authorization/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/authorization/metadata.yaml b/modules/authorization/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -106,4 +106,4 @@ spec:
       - iam.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.39, < 7"
+        version: ">= 4.44, < 7"
diff --git a/modules/data_warehouse/metadata.display.yaml b/modules/data_warehouse/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/data_warehouse/metadata.yaml b/modules/data_warehouse/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -140,5 +140,17 @@ spec:
       - serviceusage.googleapis.com
       - iam.googleapis.com
     providerVersions:
+      - source: hashicorp/archive
+        version: 2.4.2
       - source: hashicorp/google
-        version: ">= 5.39, < 7"
+        version: ">= 6.11, < 7"
+      - source: hashicorp/google-beta
+        version: ">= 6.11, < 7"
+      - source: hashicorp/http
+        version: ">= 2"
+      - source: hashicorp/local
+        version: ">=2.4"
+      - source: hashicorp/random
+        version: 3.6.2
+      - source: hashicorp/time
+        version: ">= 0.9.1"
diff --git a/modules/data_warehouse/versions.tf b/modules/data_warehouse/versions.tf
@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.52, < 7"
+      version = ">= 6.11, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.52, < 7"
+      version = ">= 6.11, < 7"
     }
     archive = {
       source  = "hashicorp/archive"
diff --git a/modules/data_warehouse/workflows.tf b/modules/data_warehouse/workflows.tf
@@ -66,6 +66,8 @@ resource "google_workflows_workflow" "workflow" {
     function_name = google_cloudfunctions2_function.notebook_deploy_function.name
   })
 
+  deletion_protection = var.deletion_protection
+
   labels = var.labels
 
   depends_on = [
diff --git a/modules/scheduled_queries/metadata.display.yaml b/modules/scheduled_queries/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/scheduled_queries/metadata.yaml b/modules/scheduled_queries/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -72,4 +72,4 @@ spec:
       - iam.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.39, < 7"
+        version: ">= 4.0, < 7"
diff --git a/modules/udf/metadata.display.yaml b/modules/udf/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/udf/metadata.yaml b/modules/udf/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -76,4 +76,4 @@ spec:
       - iam.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 5.39, < 7"
+        version: ">= 3.53, < 7"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2024 Google LLC`
	`1`	`+# Copyright 2025 Google LLC`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ terraform {`
`18`	`18`	`required_providers {`
`19`	`19`	`google = {`
`20`	`20`	`source = "hashicorp/google"`
`21`		`- version = ">= 4.52, < 7"`
	`21`	`+ version = ">= 6.11, < 7"`
`22`	`22`	`}`
`23`	`23`	`google-beta = {`
`24`	`24`	`source = "hashicorp/google-beta"`
`25`		`- version = ">= 4.52, < 7"`
	`25`	`+ version = ">= 6.11, < 7"`
`26`	`26`	`}`
`27`	`27`	`archive = {`
`28`	`28`	`source = "hashicorp/archive"`