diff --git a/README.md b/README.md index 36f03c17..1a34def3 100644 --- a/README.md +++ b/README.md @@ -189,24 +189,10 @@ determining that location is as follows: - [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0 - [jq](https://stedolan.github.io/jq/) >= 1.6 - [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0 -- [terraform-provider-google] plugin >= 3.1, < 4.0 -- [terraform-provider-google-beta] plugin >= 3.1, < 4.0 +- [terraform-provider-google] plugin ~> 4.5 +- [terraform-provider-google-beta] plugin ~> 4.5 - [terraform-provider-gsuite] plugin 0.1.x if GSuite functionality is desired -#### `terraform-provider-google` version 2.x - -Starting with version `6.3.0` of this module, `google_billing_budget` resources can now be created. This increases the minimum `terraform-provider-google` version to `3.1.0` - -To continue to use a version `>= 2.1, < 3.1` of the google provider pin this module to `6.2.1`. Or use the `core_project_factory` submodule directly. - -```hcl -module "project-factory" { - source = "terraform-google-modules/project-factory/google" - version = "~> 6.2.1" - ... -} -``` - ### Permissions In order to execute this module you must have a Service Account with the diff --git a/test/fixtures/minimal/main.tf b/test/fixtures/minimal/main.tf index 6cdb95c7..69d1b559 100644 --- a/test/fixtures/minimal/main.tf +++ b/test/fixtures/minimal/main.tf @@ -14,22 +14,27 @@ * limitations under the License. */ -provider "google" { - version = "~> 4.5" +terraform { + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.5" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.5" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + random = { + source = "hashicorp/random" + version = "~> 2.2" + } + } } - -provider "google-beta" { - version = "~> 4.5" -} - -provider "null" { - version = "~> 2.1" -} - -provider "random" { - version = "~> 2.2" -} - module "project-factory" { source = "../../../" diff --git a/test/fixtures/shared_vpc_no_subnets/main.tf b/test/fixtures/shared_vpc_no_subnets/main.tf index afd7cdc1..ba18d8e5 100644 --- a/test/fixtures/shared_vpc_no_subnets/main.tf +++ b/test/fixtures/shared_vpc_no_subnets/main.tf @@ -14,12 +14,29 @@ * limitations under the License. */ -provider "google" { - version = "~> 4.5" -} - -provider "google-beta" { - version = "~> 4.5" +terraform { + required_version = ">= 0.13" + required_providers { + google = { + source = "hashicorp/google" + version = "~> 4.5" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 4.5" + } + null = { + source = "hashicorp/null" + version = "~> 2.1" + } + random = { + source = "hashicorp/random" + version = "~> 2.2" + } + gsuite = { + version = "~> 0.1.12" + } + } } provider "gsuite" { @@ -29,16 +46,6 @@ provider "gsuite" { "https://www.googleapis.com/auth/admin.directory.group", "https://www.googleapis.com/auth/admin.directory.group.member", ] - - version = "~> 0.1.12" -} - -provider "null" { - version = "~> 2.1" -} - -provider "random" { - version = "~> 2.2" } module "project-factory" {