Skip to content

Commit f233219

Browse files
mariammartinsmariammartins
committed
update 4-projects README instruction and bump cloud function module version
1 parent cd6dde4 commit f233219

File tree

3 files changed

+5
-83
lines changed

3 files changed

+5
-83
lines changed

‎1-org/envs/shared/folders.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
resource "google_folder" "common" {
2222
display_name = "${local.folder_prefix}-common"
2323
parent = local.parent
24-
deletion_protection = var.folder_deletion_protection // uncommnet after updating "GoogleCloudPlatform/cloud-functions/google" to provider v6
24+
deletion_protection = var.folder_deletion_protection
2525
}
2626

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

‎1-org/modules/cai-monitoring/main.tf‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,10 @@ resource "google_scc_v2_organization_source" "cai_monitoring" {
140140
}
141141

142142
// Cloud Function
143-
//Using branch 'release-please--branches--main' due to Registry v0.6 incompability with Google Provider.
144-
//TODO: update to the latest Registry version when released.
143+
145144
module "cloud_function" {
146-
source = "git::https://github.com/GoogleCloudPlatform/terraform-google-cloud-functions.git?ref=release-please--branches--main"
147-
# source = "GoogleCloudPlatform/cloud-functions/google"
148-
# version = "~> 0.6"
145+
source = "GoogleCloudPlatform/cloud-functions/google"
146+
version = "~> 0.7"
149147

150148
function_name = "caiMonitoring"
151149
description = "Check on the Organization for members (users, groups and service accounts) that contains the IAM roles listed."

‎4-projects/README.md‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -241,44 +241,6 @@ grep -rl 10.3.64.0 business_unit_2/ | xargs sed -i 's/10.3.64.0/10.4.64.0/g'
241241
sed -i'' -e "s/PRJ_APP_INFRA_ID/${cloudbuild_project_id}/" /envs/shared/service_control.tf
242242
```
243243

244-
1. Use `terraform output` to get the Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project.
245-
1. Use `gsutil cat` to get the project numbers of the SVPC and Peering projects in each environment (production, nonproduction, and development) for configuring the directional app infra policies.
246-
247-
```bash
248-
export projects_gcs_bucket_tfstate=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw projects_gcs_bucket_tfstate)
249-
echo "projects_gcs_bucket_tfstate = ${projects_gcs_bucket_tfstate}"
250-
251-
export peering_project_number_dev=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/development/default.tfstate \
252-
| jq -r '.outputs.peering_project_number.value')
253-
echo "peering_project_number_dev = ${peering_project_number_dev}"
254-
sed -i'' -e "s/PRJS_DEV_SAMPLE_PEERING_NUMBER/${peering_project_number_dev}/" envs/shared/service_control.tf
255-
256-
export peering_project_number_prod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/production/default.tfstate \
257-
| jq -r '.outputs.peering_project_number.value')
258-
echo "peering_project_number_prod = ${peering_project_number_prod}"
259-
sed -i'' -e "s/PRJS_PROD_SAMPLE_PEERING_NUMBER/${peering_project_number_prod}/" envs/shared/service_control.tf
260-
261-
export peering_project_number_nonprod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/nonproduction/default.tfstate \
262-
| jq -r '.outputs.peering_project_number.value')
263-
echo "peering_project_number_nonprod = ${peering_project_number_nonprod}"
264-
sed -i'' -e "s/PRJS_NONPROD_SAMPLE_PEERING_NUMBER/${peering_project_number_nonprod}/" envs/shared/service_control.tf
265-
266-
export shared_vpc_project_number_dev=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/development/default.tfstate \
267-
| jq -r '.outputs.shared_vpc_project_number.value')
268-
echo "shared_vpc_project_number_dev = ${shared_vpc_project_number_dev}"
269-
sed -i'' -e "s/PRJS_DEV_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_dev}/" /envs/shared/service_control.tf
270-
271-
export shared_vpc_project_number_prod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/production/default.tfstate \
272-
| jq -r '.outputs.shared_vpc_project_number.value')
273-
echo "shared_vpc_project_number_prod = ${shared_vpc_project_number_prod}"
274-
sed -i'' -e "s/PRJS_PROD_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_prod}/" /envs/shared/service_control.tf
275-
276-
export shared_vpc_project_number_nonprod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/nonproduction/default.tfstate \
277-
| jq -r '.outputs.shared_vpc_project_number.value')
278-
echo "shared_vpc_project_number_nonprod = ${shared_vpc_project_number_nonprod}"
279-
sed -i'' -e "s/PRJS_NONPROD_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_nonprod}/" /envs/shared/service_control.tf
280-
```
281-
282244
1. If you are deploying with VPC Service Controls in dry run mode, update the `required_egress_rule_app_infra_dry_run` and `required_ingress_rule_app_infra_dry_run` variables to true, if you are deploying with VPC Service Controls in enforced mode, update the `required_egress_rule_app_infra` and `required_ingress_rule_app_infra` variables to true in [service_control.tf](gcp-org/envs/shared/service_control.tf) file.
283245

284246
```bash
@@ -518,44 +480,6 @@ If you received any errors or made any changes to the Terraform config or any `.
518480
sed -i'' -e "s/PRJ_APP_INFRA_ID/${cloudbuild_project_id}/" /envs/shared/service_control.tf
519481
```
520482

521-
1. Use `terraform output` to get the Bucket used for storing terraform state for stage 4-projects foundations pipelines in seed project.
522-
1. Use `gsutil cat` to get the project numbers of the SVPC and Peering projects in each environment (production, nonproduction, and development) for configuring the directional app infra policies.
523-
524-
```bash
525-
export projects_gcs_bucket_tfstate=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw projects_gcs_bucket_tfstate)
526-
echo "projects_gcs_bucket_tfstate = ${projects_gcs_bucket_tfstate}"
527-
528-
export peering_project_number_dev=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/development/default.tfstate \
529-
| jq -r '.outputs.peering_project_number.value')
530-
echo "peering_project_number_dev = ${peering_project_number_dev}"
531-
sed -i'' -e "s/PRJS_DEV_SAMPLE_PEERING_NUMBER/${peering_project_number_dev}/" envs/shared/service_control.tf
532-
533-
export peering_project_number_prod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/production/default.tfstate \
534-
| jq -r '.outputs.peering_project_number.value')
535-
echo "peering_project_number_prod = ${peering_project_number_prod}"
536-
sed -i'' -e "s/PRJS_PROD_SAMPLE_PEERING_NUMBER/${peering_project_number_prod}/" envs/shared/service_control.tf
537-
538-
export peering_project_number_nonprod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/nonproduction/default.tfstate \
539-
| jq -r '.outputs.peering_project_number.value')
540-
echo "peering_project_number_nonprod = ${peering_project_number_nonprod}"
541-
sed -i'' -e "s/PRJS_NONPROD_SAMPLE_PEERING_NUMBER/${peering_project_number_nonprod}/" envs/shared/service_control.tf
542-
543-
export shared_vpc_project_number_dev=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/development/default.tfstate \
544-
| jq -r '.outputs.shared_vpc_project_number.value')
545-
echo "shared_vpc_project_number_dev = ${shared_vpc_project_number_dev}"
546-
sed -i'' -e "s/PRJS_DEV_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_dev}/" /envs/shared/service_control.tf
547-
548-
export shared_vpc_project_number_prod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/production/default.tfstate \
549-
| jq -r '.outputs.shared_vpc_project_number.value')
550-
echo "shared_vpc_project_number_prod = ${shared_vpc_project_number_prod}"
551-
sed -i'' -e "s/PRJS_PROD_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_prod}/" /envs/shared/service_control.tf
552-
553-
export shared_vpc_project_number_nonprod=$(gsutil cat gs://${projects_gcs_bucket_tfstate}/terraform/projects/business_unit_1/nonproduction/default.tfstate \
554-
| jq -r '.outputs.shared_vpc_project_number.value')
555-
echo "shared_vpc_project_number_nonprod = ${shared_vpc_project_number_nonprod}"
556-
sed -i'' -e "s/PRJS_NONPROD_SAMPLE_SVPC_NUMBER/${shared_vpc_project_number_nonprod}/" /envs/shared/service_control.tf
557-
```
558-
559483
1. If you are deploying with VPC Service Controls in dry run mode, update the `required_egress_rule_app_infra_dry_run` and `required_ingress_rule_app_infra_dry_run` variables to true, if you are deploying with VPC Service Controls in enforced mode, update the `required_egress_rule_app_infra` and `required_ingress_rule_app_infra` variables to true in [service_control.tf](gcp-org/envs/shared/service_control.tf) file.
560484

561485
```bash

0 commit comments

Comments
 (0)