diff --git a/README.md b/README.md index e0d82aac..be7a738c 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ This will allow the user to programmatically create an empty table schema inside Additional user accounts and permissions are necessary to begin querying the newly created table(s). ## Compatibility - -This module is meant for use with Terraform 0.12. If you haven't -[upgraded](https://www.terraform.io/upgrade-guides/0-12.html) and need a Terraform 0.11.x-compatible version of this module, -the last released version intended for Terraform 0.11.x is [1.0.0](https://registry.terraform.io/modules/terraform-google-modules/bigquery/google/1.0.0). +This module is meant for use with Terraform 0.13. If you haven't +[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform +0.12.x-compatible version of this module, the last released version +intended for Terraform 0.12.x is [v4.5.0](https://registry.terraform.io/modules/terraform-google-modules/-bigquery/google/v4.5.0). ## Upgrading @@ -200,7 +200,7 @@ These sections describe requirements for using this module. The following dependencies must be available: -- [Terraform][terraform] v0.12 +- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0 - [Terraform Provider for GCP][terraform-provider-gcp] plugin v3 ### Service Account diff --git a/modules/authorization/versions.tf b/modules/authorization/versions.tf index 87e91a37..96847f7a 100644 --- a/modules/authorization/versions.tf +++ b/modules/authorization/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,5 +15,17 @@ */ terraform { - required_version = "~> 0.12" + required_version = ">= 0.13" + required_providers { + + google = { + source = "hashicorp/google" + version = "~> 3.53" + } + } + + provider_meta "google" { + module_name = "blueprints/terraform/terraform-google-bigquery:authorization/v1.0.0" + } + } diff --git a/modules/udf/versions.tf b/modules/udf/versions.tf index 29704272..2d2877d3 100644 --- a/modules/udf/versions.tf +++ b/modules/udf/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,5 +15,17 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + + google = { + source = "hashicorp/google" + version = "~> 3.53" + } + } + + provider_meta "google" { + module_name = "blueprints/terraform/terraform-google-bigquery:udf/v1.0.0" + } + } diff --git a/test/setup/main.tf b/test/setup/main.tf index 064e10ae..f6f58e7d 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,14 +16,13 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 9.0" - - name = "ci-bigquery" - random_project_id = "true" - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account - skip_gcloud_download = true + version = "~> 10.0" + + name = "ci-bigquery" + random_project_id = "true" + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account activate_apis = [ "cloudkms.googleapis.com", diff --git a/test/setup/versions.tf b/test/setup/versions.tf index be321bd8..d6107744 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,9 +19,9 @@ terraform { } provider "google" { - version = "~> 3.46.0" + version = "~> 3.53.0" } provider "google-beta" { - version = "~> 3.46.0" + version = "~> 3.53.0" } diff --git a/versions.tf b/versions.tf index 32d83bf2..bae4576c 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,8 +15,17 @@ */ terraform { - required_version = ">= 0.12.6" + required_version = ">= 0.13" required_providers { - google = "~> 3.0" + + google = { + source = "hashicorp/google" + version = "~> 3.53" + } + } + + provider_meta "google" { + module_name = "blueprints/terraform/terraform-google-bigquery/v1.0.0" } + }