Skip to content

cloudsecuritycompliance: update built-in cloud control in framework test and samples [default] #18378

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.

Sign up for GitHub

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

Open
shuyama1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cloudsecuritycompliance: update built-in cloud control in framework test and samples [default] #18378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...securitycompliance/cloudsecuritycompliance_framework_deployment_org_project_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "google_cloud_security_compliance_framework" "{{$.PrimaryResourceId}}"
description = "A Terraform description for the framework"

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down Expand Up @@ -41,7 +41,7 @@ resource "google_cloud_security_compliance_framework_deployment" "{{$.PrimaryRes
enforcement_mode = "DETECTIVE"

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down
4 changes: 2 additions & 2 deletions ...compliance/cloudsecuritycompliance_framework_deployment_project_application_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resource "google_cloud_security_compliance_framework" "{{$.PrimaryResourceId}}"
description = "A Terraform description for the framework"

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down Expand Up @@ -51,7 +51,7 @@ resource "google_cloud_security_compliance_framework_deployment" "{{$.PrimaryRes
enforcement_mode = "DETECTIVE"

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down
64 changes: 35 additions & 29 deletions ...ples/services/cloudsecuritycompliance/cloudsecuritycompliance_framework_org_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,60 @@ resource "google_cloud_security_compliance_framework" "{{$.PrimaryResourceId}}"
description = "An Terraform description for the framework"

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-assess-resource-availability"
major_revision_id = "2"
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
name = "location"
parameter_value {
string_value = "us-central1"
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-cmek-key-in-use-for-bigquery-table"
major_revision_id = "1"

parameters {
name = "location"
name = "oneof-parameter"
parameter_value {
string_list_value {
values = ["us-central1", "us-west1"]
oneof_value {
name = "test-oneof"
parameter_value {
string_value = "test-value"
}
}
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-enable-automatic-backups-cloud-sql"
major_revision_id = "3"

parameters {
name = "location"
name = "bool-parameter"
parameter_value {
bool_value = true
oneof_value {
name = "bool-oneof"
parameter_value {
bool_value = true
}
}
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
major_revision_id = "2"

parameters {
name = "location"
name = "number-parameter"
parameter_value {
number_value = 1
oneof_value {
name = "number-oneof"
parameter_value {
number_value = 123.45
}
}
}
}
parameters {
name = "string-list-parameter"
parameter_value {
oneof_value {
name = "string-list-oneof"
parameter_value {
string_list_value {
values = ["value1", "value2"]
}
}
}
}
}
}


}
64 changes: 35 additions & 29 deletions ...ices/cloudsecuritycompliance/cloudsecuritycompliance_framework_org_basic_backward.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,60 @@ resource "google_cloud_security_compliance_framework" "{{$.PrimaryResourceId}}"
description = "An Terraform description for the framework"

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-assess-resource-availability"
major_revision_id = "2"
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
name = "location"
parameter_value {
string_value = "us-central1"
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-cmek-key-in-use-for-bigquery-table"
major_revision_id = "1"

parameters {
name = "location"
name = "oneof-parameter"
parameter_value {
string_list_value {
values = ["us-central1", "us-west1"]
oneof_value {
name = "test-oneof"
parameter_value {
string_value = "test-value"
}
}
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-enable-automatic-backups-cloud-sql"
major_revision_id = "3"

parameters {
name = "location"
name = "bool-parameter"
parameter_value {
bool_value = true
oneof_value {
name = "bool-oneof"
parameter_value {
bool_value = true
}
}
}
}
}

cloud_control_details {
name = "organizations/{{index $.TestEnvVars "org_id"}}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
major_revision_id = "2"

parameters {
name = "location"
name = "number-parameter"
parameter_value {
number_value = 1
oneof_value {
name = "number-oneof"
parameter_value {
number_value = 123.45
}
}
}
}
parameters {
name = "string-list-parameter"
parameter_value {
oneof_value {
name = "string-list-oneof"
parameter_value {
string_list_value {
values = ["value1", "value2"]
}
}
}
}
}
}


}
64 changes: 35 additions & 29 deletions .../services/cloudsecuritycompliance/cloudsecuritycompliance_framework_project_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,54 +8,60 @@ resource "google_cloud_security_compliance_framework" "{{$.PrimaryResourceId}}"
description = "An Terraform description for the framework"

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-assess-resource-availability"
major_revision_id = "2"
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
name = "location"
parameter_value {
string_value = "us-central1"
}
}
}

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-cmek-key-in-use-for-bigquery-table"
major_revision_id = "1"

parameters {
name = "location"
name = "oneof-parameter"
parameter_value {
string_list_value {
values = ["us-central1", "us-west1"]
oneof_value {
name = "test-oneof"
parameter_value {
string_value = "test-value"
}
}
}
}
}

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-enable-automatic-backups-cloud-sql"
major_revision_id = "3"

parameters {
name = "location"
name = "bool-parameter"
parameter_value {
bool_value = true
oneof_value {
name = "bool-oneof"
parameter_value {
bool_value = true
}
}
}
}
}

cloud_control_details {
name = "projects/${data.google_project.project.number}/locations/global/cloudControls/builtin-require-cmek-on-bigquery-datasets"
major_revision_id = "2"

parameters {
name = "location"
name = "number-parameter"
parameter_value {
number_value = 1
oneof_value {
name = "number-oneof"
parameter_value {
number_value = 123.45
}
}
}
}
parameters {
name = "string-list-parameter"
parameter_value {
oneof_value {
name = "string-list-oneof"
parameter_value {
string_list_value {
values = ["value1", "value2"]
}
}
}
}
}
}


}
8 changes: 4 additions & 4 deletions ...orm/services/cloudsecuritycompliance/resource_cloud_security_compliance_framework_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resource "google_cloud_security_compliance_framework" "example" {
description = "An Terraform description for the framework"

cloud_control_details {
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-assess-resource-availability"
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down Expand Up @@ -132,8 +132,8 @@ resource "google_cloud_security_compliance_framework" "example" {
description = "An updated description for the framework with additional details"

cloud_control_details {
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-data-access-governance"
major_revision_id = "1"
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
name = "region"
Expand Down Expand Up @@ -228,7 +228,7 @@ resource "google_cloud_security_compliance_framework" "example" {
description = "A Terraform description for the framework using organization for backward compatibility"

cloud_control_details {
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-assess-resource-availability"
name = "organizations/%{org_id}/locations/global/cloudControls/builtin-detective-policy-for-vertex-ai-runtime-template-idle-shutdown"
major_revision_id = "2"

parameters {
Expand Down
Loading