From ceef79860adbfe879bbb8ceaa8997f3bfc47d90d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:48:20 -0600 Subject: [PATCH 1/3] chore(master): release 7.0.0 (#249) --- CHANGELOG.md | 23 +++++++++++++++++++++++ README.md | 2 +- metadata.yaml | 2 +- modules/authorization/README.md | 2 +- modules/authorization/metadata.yaml | 2 +- modules/authorization/versions.tf | 2 +- modules/data_warehouse/metadata.yaml | 2 +- modules/data_warehouse/versions.tf | 2 +- modules/scheduled_queries/README.md | 2 +- modules/scheduled_queries/metadata.yaml | 2 +- modules/scheduled_queries/versions.tf | 2 +- modules/udf/README.md | 2 +- modules/udf/metadata.yaml | 2 +- modules/udf/versions.tf | 2 +- versions.tf | 2 +- 15 files changed, 37 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2765cc40..4da08d64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [7.0.0](https://github.com/terraform-google-modules/terraform-google-bigquery/compare/v6.1.1...v7.0.0) (2023-10-10) + + +### ⚠ BREAKING CHANGES + +* data_warehosue migrating to TheLook Ecommerce dataset ([#257](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/257)) + +### Features + +* data_warehosue migrating to TheLook Ecommerce dataset ([#257](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/257)) ([e97adfb](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/e97adfb1984592a6f9e4eea8f8bdc3d2969e3d2d)) +* data_warehouse add labels to objects ([#253](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/253)) ([70962af](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/70962afc68366e8ef1214b9ad747d3d15fa7f313)) + + +### Bug Fixes + +* data_warehouse add bigquery data policy api ([#254](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/254)) ([f2aa4f3](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/f2aa4f392e94603ca831c40c6c08dc3fbdae8af4)) +* data_warehouse api identity dependency for p/s ([#252](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/252)) ([d2c1256](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/d2c125676f176c8fa33eb9dad12b7ed992dee6ac)) +* **deps:** update terraform terraform-google-modules/project-factory/google to 14.3 ([#245](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/245)) ([cf6869c](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/cf6869c8f37999f4b765b7b9ac501c73a5ca3e36)) +* update architecture diagrams, fix integration test ([#241](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/241)) ([bc5abf8](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/bc5abf8cb55bfc2c9939a1be6d6adfa7212e3a17)) +* update workflow.tftpl bc subworkflow creates bq not biglake tables ([#246](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/246)) ([fc7d4ae](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/fc7d4ae15376a22a5f37c140fc4b1c1c4ad3aa52)) +* upgrade hashicorp/google to 5.0 ([#259](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/259)) ([096ca4e](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/096ca4ee651152d040f8c555832488991773ddb8)) +* upgraded versions.tf to include minor bumps from tpg v5 ([#261](https://github.com/terraform-google-modules/terraform-google-bigquery/issues/261)) ([7fd5bcb](https://github.com/terraform-google-modules/terraform-google-bigquery/commit/7fd5bcbb4eca4d71a0d1c9b7fb7f4d19ae21ddbf)) + ## [6.1.1](https://github.com/terraform-google-modules/terraform-google-bigquery/compare/v6.1.0...v6.1.1) (2023-07-20) diff --git a/README.md b/README.md index 4950d634..4637bab8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Basic usage of this module is as follows: ```hcl module "bigquery" { source = "terraform-google-modules/bigquery/google" - version = "~> 6.1" + version = "~> 7.0" dataset_id = "foo" dataset_name = "foo" diff --git a/metadata.yaml b/metadata.yaml index a6e399bd..a5399c26 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-bigquery sourceType: git - version: 6.1.0 + version: 7.0.0 actuationTool: flavor: Terraform version: '>= 0.13' diff --git a/modules/authorization/README.md b/modules/authorization/README.md index d8a3624d..87291515 100644 --- a/modules/authorization/README.md +++ b/modules/authorization/README.md @@ -17,7 +17,7 @@ Example: ```hcl module "dataset" { source = "terraform-google-modules/bigquery/google" - version = "~> 6.1" + version = "~> 7.0" dataset_id = "example_dataset" dataset_name = "example_dataset" diff --git a/modules/authorization/metadata.yaml b/modules/authorization/metadata.yaml index fea0bb6f..820510b9 100644 --- a/modules/authorization/metadata.yaml +++ b/modules/authorization/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-bigquery sourceType: git dir: /modules/authorization - version: 6.1.0 + version: 7.0.0 actuationTool: flavor: Terraform version: '>= 0.13' diff --git a/modules/authorization/versions.tf b/modules/authorization/versions.tf index ce6e8a5d..f494a773 100644 --- a/modules/authorization/versions.tf +++ b/modules/authorization/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-bigquery:authorization/v6.1.1" + module_name = "blueprints/terraform/terraform-google-bigquery:authorization/v7.0.0" } } diff --git a/modules/data_warehouse/metadata.yaml b/modules/data_warehouse/metadata.yaml index fca307d2..b8863075 100644 --- a/modules/data_warehouse/metadata.yaml +++ b/modules/data_warehouse/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-bigquery sourceType: git dir: /modules/data_warehouse - version: 6.1.0 + version: 7.0.0 actuationTool: flavor: Terraform version: '>= 0.13' diff --git a/modules/data_warehouse/versions.tf b/modules/data_warehouse/versions.tf index ba978100..8cfd8e9b 100644 --- a/modules/data_warehouse/versions.tf +++ b/modules/data_warehouse/versions.tf @@ -40,6 +40,6 @@ terraform { required_version = ">= 0.13" provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-bigquery:data_warehouse/v6.1.1" + module_name = "blueprints/terraform/terraform-google-bigquery:data_warehouse/v7.0.0" } } diff --git a/modules/scheduled_queries/README.md b/modules/scheduled_queries/README.md index 8347558c..96811182 100644 --- a/modules/scheduled_queries/README.md +++ b/modules/scheduled_queries/README.md @@ -7,7 +7,7 @@ Example: ```hcl module "dataset" { source = "terraform-google-modules/bigquery/google" - version = "~> 6.1" + version = "~> 7.0" dataset_id = "example_dataset" dataset_name = "example_dataset" diff --git a/modules/scheduled_queries/metadata.yaml b/modules/scheduled_queries/metadata.yaml index fbaa5a29..1edd83d8 100644 --- a/modules/scheduled_queries/metadata.yaml +++ b/modules/scheduled_queries/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-bigquery sourceType: git dir: /modules/scheduled_queries - version: 6.1.0 + version: 7.0.0 actuationTool: flavor: Terraform version: '>= 0.13' diff --git a/modules/scheduled_queries/versions.tf b/modules/scheduled_queries/versions.tf index 390e1958..07b70238 100644 --- a/modules/scheduled_queries/versions.tf +++ b/modules/scheduled_queries/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-bigquery:scheduled_queries/v6.1.1" + module_name = "blueprints/terraform/terraform-google-bigquery:scheduled_queries/v7.0.0" } } diff --git a/modules/udf/README.md b/modules/udf/README.md index 8bd56717..ea65a655 100644 --- a/modules/udf/README.md +++ b/modules/udf/README.md @@ -18,7 +18,7 @@ module "dataset" { module "add_udfs" { source = "terraform-google-modules/bigquery/google//modules/udf" - version = "~> 6.1" + version = "~> 7.0" dataset_id = module.dataset.bigquery_dataset.dataset_id project_id = module.dataset.bigquery_dataset.project diff --git a/modules/udf/metadata.yaml b/modules/udf/metadata.yaml index c0712239..4c791c7e 100644 --- a/modules/udf/metadata.yaml +++ b/modules/udf/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-bigquery sourceType: git dir: /modules/udf - version: 6.1.0 + version: 7.0.0 actuationTool: flavor: Terraform version: '>= 0.13' diff --git a/modules/udf/versions.tf b/modules/udf/versions.tf index 7ceda2d3..37ecb836 100644 --- a/modules/udf/versions.tf +++ b/modules/udf/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-bigquery:udf/v6.1.1" + module_name = "blueprints/terraform/terraform-google-bigquery:udf/v7.0.0" } } diff --git a/versions.tf b/versions.tf index 352f7878..7b7dc5f4 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-bigquery/v6.1.1" + module_name = "blueprints/terraform/terraform-google-bigquery/v7.0.0" } } From 1046e0d2960665a9ad24dc9bbcf61d81a5f0a260 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 09:29:48 -0700 Subject: [PATCH 2/3] chore(deps): update cft/developer-tools docker tag to v1.17 (#265) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Makefile | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fb2b149a..2bd060df 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # Make will use bash instead of sh SHELL := /usr/bin/env bash -DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd ENABLE_BPMETADATA := 1 diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 812e560d..705e9ed9 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -53,4 +53,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index fab56a49..410bea53 100644 --- a/build/lint.cloudbuild.yaml +++ b/build/lint.cloudbuild.yaml @@ -21,4 +21,4 @@ tags: - 'lint' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17' From 405972a27da0c0165b93f83162e4a595ec289263 Mon Sep 17 00:00:00 2001 From: Shane Glass <23001651+shanecglass@users.noreply.github.com> Date: Tue, 17 Oct 2023 17:03:10 -0400 Subject: [PATCH 3/3] fix: update workflow.tftpl (#266) --- modules/data_warehouse/templates/workflow.tftpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/data_warehouse/templates/workflow.tftpl b/modules/data_warehouse/templates/workflow.tftpl index 51ff0ee3..7198d6f7 100644 --- a/modules/data_warehouse/templates/workflow.tftpl +++ b/modules/data_warehouse/templates/workflow.tftpl @@ -80,10 +80,11 @@ create_tables: - assignStepTables: assign: - results: {} + - dataset_id: ${dataset_id} - project_id: $${sys.get_env("GOOGLE_CLOUD_PROJECT_ID")} - map: - 1: $${"CALL `"+project_id+".dataset_id.sp_provision_lookup_tables`();"} - 2: $${"CALL `"+project_id+".dataset_id.sp_lookerstudio_report`();"} + 1: $${"CALL `"+project_id+"."+dataset_id+".sp_provision_lookup_tables`();"} + 2: $${"CALL `"+project_id+"."+dataset_id+".sp_lookerstudio_report`();"} - loopStepTables: for: value: key