Skip to content

Commit 0c201c7

Browse files
committed
add deletion_protection variabel in folder resources 1-org, updt service control versions.tf module
1 parent 55e4f5b commit 0c201c7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

1-org/envs/shared/folders.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
*****************************************/
2020

2121
resource "google_folder" "common" {
22-
display_name = "${local.folder_prefix}-common"
23-
parent = local.parent
24-
# deletion_protection = var.folder_deletion_protection // uncommnet after updating "GoogleCloudPlatform/cloud-functions/google" to provider v6
22+
display_name = "${local.folder_prefix}-common"
23+
parent = local.parent
24+
deletion_protection = var.folder_deletion_protection // uncommnet after updating "GoogleCloudPlatform/cloud-functions/google" to provider v6
2525
}
2626

2727
resource "google_folder" "network" {
28-
display_name = "${local.folder_prefix}-network"
29-
parent = local.parent
30-
# deletion_protection = var.folder_deletion_protection // uncommnet after updating "GoogleCloudPlatform/cloud-functions/google" to provider v6
28+
display_name = "${local.folder_prefix}-network"
29+
parent = local.parent
30+
deletion_protection = var.folder_deletion_protection // uncommnet after updating "GoogleCloudPlatform/cloud-functions/google" to provider v6
3131
}

1-org/modules/service_control/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ terraform {
2020
google = {
2121
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
2222
source = "hashicorp/google"
23-
version = ">= 3.50, < 6.26.0"
23+
version = ">= 3.50, != 6.26.0, != 6.27.0, < 7.0"
2424
}
2525
google-beta = {
2626
// version 6.26.0 removed because of the bug https://github.com/hashicorp/terraform-provider-google/issues/21950
2727
source = "hashicorp/google-beta"
28-
version = ">= 3.50, < 6.26.0"
28+
version = ">= 3.50, != 6.26.0, != 6.27.0, < 7.0"
2929
}
3030
random = {
3131
source = "hashicorp/random"

0 commit comments

Comments
 (0)