From b48094a43a132e0c755f0aba5a16e26ce65f43ca Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Fri, 10 Jan 2020 09:07:23 +0100 Subject: [PATCH] Update foundations modules versions (#26) * update foundations modules versions * update Terraform version to v0.12.19 in CI test configuration --- .ci/cloudbuild.test.yaml | 2 +- foundations/business-units/main.tf | 8 ++++---- .../business-units/modules/business-unit-folders/main.tf | 6 +++--- foundations/environments/main.tf | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/cloudbuild.test.yaml b/.ci/cloudbuild.test.yaml index afb23d2a..24de3dfa 100644 --- a/.ci/cloudbuild.test.yaml +++ b/.ci/cloudbuild.test.yaml @@ -44,7 +44,7 @@ steps: - PYTHONDONTWRITEBYTECODE=true substitutions: - _TERRAFORM_VERSION: 0.12.8 + _TERRAFORM_VERSION: 0.12.19 tags: - "ci" diff --git a/foundations/business-units/main.tf b/foundations/business-units/main.tf index 3252e67c..21231261 100644 --- a/foundations/business-units/main.tf +++ b/foundations/business-units/main.tf @@ -26,7 +26,7 @@ locals { module "shared-folder" { source = "terraform-google-modules/folders/google" - version = "2.0.0" + version = "2.0.2" parent = var.root_node names = ["shared"] } @@ -53,7 +53,7 @@ module "project-tf" { module "service-accounts-tf-environments" { source = "terraform-google-modules/service-accounts/google" - version = "2.0.1" + version = "2.0.2" project_id = module.project-tf.project_id org_id = var.organization_id billing_account_id = var.billing_account_id @@ -151,7 +151,7 @@ module "project-audit" { module "bq-audit-export" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "3.1.0" + version = "3.2.0" project_id = module.project-audit.project_id dataset_name = "${replace(local.log_sink_name, "-", "_")}" log_sink_writer_identity = module.log-sink-audit.writer_identity @@ -161,7 +161,7 @@ module "bq-audit-export" { module "log-sink-audit" { source = "terraform-google-modules/log-export/google" - version = "3.1.0" + version = "3.2.0" filter = "logName: \"/logs/cloudaudit.googleapis.com%2Factivity\" OR logName: \"/logs/cloudaudit.googleapis.com%2Fsystem_event\"" log_sink_name = local.log_sink_name parent_resource_type = local.log_sink_parent_resource_type diff --git a/foundations/business-units/modules/business-unit-folders/main.tf b/foundations/business-units/modules/business-unit-folders/main.tf index e08616b7..0b48b544 100644 --- a/foundations/business-units/modules/business-unit-folders/main.tf +++ b/foundations/business-units/modules/business-unit-folders/main.tf @@ -18,7 +18,7 @@ module "business-unit-folder" { source = "terraform-google-modules/folders/google" - version = "2.0.0" + version = "2.0.2" parent = var.root_node names = [var.business_unit_folder_name] } @@ -29,7 +29,7 @@ module "business-unit-folder" { module "environment-folders" { source = "terraform-google-modules/folders/google" - version = "2.0.0" + version = "2.0.2" parent = module.business-unit-folder.id names = var.environments set_roles = true @@ -41,4 +41,4 @@ module "environment-folders" { "roles/compute.networkAdmin", "roles/compute.xpnAdmin" ] -} \ No newline at end of file +} diff --git a/foundations/environments/main.tf b/foundations/environments/main.tf index d96745cc..3aba9f7e 100644 --- a/foundations/environments/main.tf +++ b/foundations/environments/main.tf @@ -34,7 +34,7 @@ module "project-tf" { module "service-accounts-tf-environments" { source = "terraform-google-modules/service-accounts/google" - version = "2.0.1" + version = "2.0.2" project_id = module.project-tf.project_id org_id = var.organization_id billing_account_id = var.billing_account_id @@ -78,7 +78,7 @@ module "gcs-tf-environments" { module "folders-top-level" { source = "terraform-google-modules/folders/google" - version = "2.0.0" + version = "2.0.2" parent = var.root_node names = var.environments set_roles = true @@ -118,7 +118,7 @@ module "project-audit" { module "bq-audit-export" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "3.1.0" + version = "3.2.0" project_id = module.project-audit.project_id dataset_name = "logs_audit_${replace(var.environments[0], "-", "_")}" log_sink_writer_identity = module.log-sink-audit.writer_identity @@ -129,7 +129,7 @@ module "bq-audit-export" { module "log-sink-audit" { source = "terraform-google-modules/log-export/google" - version = "3.1.0" + version = "3.2.0" filter = "logName: \"/logs/cloudaudit.googleapis.com%2Factivity\" OR logName: \"/logs/cloudaudit.googleapis.com%2Fsystem_event\"" log_sink_name = "logs-audit-${var.environments[0]}" parent_resource_type = "folder"