Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add deletion_protection field to Folders resource #11293

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ resource "google_pubsub_topic" "feed_output" {
resource "google_folder" "my_folder" {
display_name = "<%= ctx[:vars]["folder_name"] %>"
parent = "organizations/<%= ctx[:test_env_vars]["org_id"] %>"
deletion_protection = false
}

# Find the project number of the project whose identity will be used for sending
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "my_folder" {
display_name = "<%= ctx[:vars]['folder_name'] %>"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

resource "google_project" "my_project" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "my_folder" {
display_name = "<%= ctx[:vars]['folder_name'] %>"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

resource "google_folder_access_approval_settings" "<%= ctx[:primary_resource_id] %>" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ resource "google_pubsub_topic" "feed_output" {
resource "google_folder" "my_folder" {
display_name = "{{index $.Vars "folder_name"}}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

# Find the project number of the project whose identity will be used for sending
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "my_folder" {
display_name = "{{index $.Vars "folder_name"}}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

resource "google_project" "my_project" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "my_folder" {
display_name = "{{index $.Vars "folder_name"}}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

resource "google_folder_access_approval_settings" "{{$.PrimaryResourceId}}" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resource "google_folder" "autokms_folder" {
provider = google-beta
display_name = "{{index $.Vars "folder_name"}}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

# Create the key project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resource "google_folder" "autokms_folder" {
provider = google-beta
display_name = "folder-example"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

# Create the key project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resource "google_logging_folder_settings" "{{$.PrimaryResourceId}}" {
resource "google_folder" "my_folder" {
display_name = "{{index $.Vars "folder_name"}}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

data "google_logging_folder_settings" "settings" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ resource "google_org_policy_policy" "primary" {
resource "google_folder" "basic" {
parent = "organizations/123456789"
display_name = "folder"
deletion_protection = false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ resource "google_folder" "security_policy_target" {
provider = google-beta
display_name = "tf-test-secpol-%{random_suffix}"
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
deletion_protection = false
}

resource "google_compute_organization_security_policy" "policy" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
display_name = "{{index $.Vars "folder_display_name"}}"
deletion_protection = false
}

resource "google_scc_folder_custom_module" "{{$.PrimaryResourceId}}" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
display_name = "{{index $.Vars "folder_display_name"}}"
deletion_protection = false
}

resource "google_scc_folder_custom_module" "{{$.PrimaryResourceId}}" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
display_name = "{{index $.Vars "folder_display_name"}}"
deletion_protection = false
}

resource "google_scc_management_folder_security_health_analytics_custom_module" "{{$.PrimaryResourceId}}" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/{{index $.TestEnvVars "org_id"}}"
display_name = "{{index $.Vars "folder_display_name"}}"
deletion_protection = false
}

resource "google_scc_management_folder_security_health_analytics_custom_module" "{{$.PrimaryResourceId}}" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resource "google_folder" "autokms_folder" {
provider = google-beta
display_name = "<%= ctx[:vars]["folder_name"] %>"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

# Create the key project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ resource "google_folder" "autokms_folder" {
provider = google-beta
display_name = "folder-example"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

# Create the key project
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resource "google_logging_folder_settings" "<%= ctx[:primary_resource_id] %>" {
resource "google_folder" "my_folder" {
display_name = "<%= ctx[:vars]['folder_name'] %>"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

data "google_logging_folder_settings" "settings" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ resource "google_org_policy_policy" "primary" {
resource "google_folder" "basic" {
parent = "organizations/123456789"
display_name = "folder"
deletion_protection = false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ resource "google_folder" "security_policy_target" {
provider = google-beta
display_name = "tf-test-secpol-%{random_suffix}"
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
deletion_protection = false
}

resource "google_compute_organization_security_policy" "policy" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
display_name = "<%= ctx[:vars]['folder_display_name'] %>"
deletion_protection = false
}

resource "google_scc_folder_custom_module" "<%= ctx[:primary_resource_id] %>" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
display_name = "<%= ctx[:vars]['folder_display_name'] %>"
deletion_protection = false
}

resource "google_scc_folder_custom_module" "<%= ctx[:primary_resource_id] %>" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
display_name = "<%= ctx[:vars]['folder_display_name'] %>"
deletion_protection = false
}

resource "google_scc_management_folder_security_health_analytics_custom_module" "<%= ctx[:primary_resource_id] %>" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resource "google_folder" "folder" {
parent = "organizations/<%= ctx[:test_env_vars]['org_id'] %>"
display_name = "<%= ctx[:vars]['folder_display_name'] %>"
deletion_protection = false
}

resource "google_scc_management_folder_security_health_analytics_custom_module" "<%= ctx[:primary_resource_id] %>" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ func testAccDataSourceAccessApprovalFolderServiceAccount_basic(context map[strin
resource "google_folder" "my_folder" {
display_name = "tf-test-my-folder%{random_suffix}"
parent = "organizations/%{org_id}"
deletion_protection = false
}

# Wait after folder creation to limit eventual consistency errors.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func testAccAccessApprovalFolderSettings_full(context map[string]interface{}) st
resource "google_folder" "my_folder" {
display_name = "tf-test-my-folder%{random_suffix}"
parent = "organizations/%{org_id}"
deletion_protection = false
}

# Wait after folder creation to limit eventual consistency errors.
Expand Down Expand Up @@ -94,6 +95,7 @@ func testAccAccessApprovalFolderSettings_update(context map[string]interface{})
resource "google_folder" "my_folder" {
display_name = "tf-test-my-folder%{random_suffix}"
parent = "organizations/%{org_id}"
deletion_protection = false
}

# Wait after folder creation to limit eventual consistency errors.
Expand Down Expand Up @@ -121,6 +123,7 @@ func testAccAccessApprovalFolderSettings_activeKeyVersion(context map[string]int
resource "google_folder" "my_folder" {
display_name = "tf-test-my-folder%{random_suffix}"
parent = "organizations/%{org_id}"
deletion_protection = false
}

# Wait after folder creation to limit eventual consistency errors.
Expand Down
Loading
Loading