From 1c2cde11c1a3686264eca13c2b5a668a6e0c827a Mon Sep 17 00:00:00 2001 From: Wietse Muizelaar Date: Mon, 3 Feb 2020 22:17:01 +0100 Subject: [PATCH] Allow for provider 3.x --- examples/boolean_org_exclude/main.tf | 2 +- examples/boolean_project_allow/main.tf | 2 +- examples/list_folder_deny/main.tf | 2 +- examples/list_org_exclude/main.tf | 2 +- test/setup/main.tf | 2 +- test/setup/versions.tf | 4 ++-- versions.tf | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/boolean_org_exclude/main.tf b/examples/boolean_org_exclude/main.tf index 0962cf2..34a1f4e 100644 --- a/examples/boolean_org_exclude/main.tf +++ b/examples/boolean_org_exclude/main.tf @@ -18,7 +18,7 @@ Provider configuration *****************************************/ provider "google" { - version = "~> 2.5.0" + version = "~> 3.6.0" } /****************************************** diff --git a/examples/boolean_project_allow/main.tf b/examples/boolean_project_allow/main.tf index 7c4c92b..5c9062e 100644 --- a/examples/boolean_project_allow/main.tf +++ b/examples/boolean_project_allow/main.tf @@ -18,7 +18,7 @@ Provider configuration *****************************************/ provider "google" { - version = "~> 2.5.0" + version = "~> 3.6.0" } /****************************************** diff --git a/examples/list_folder_deny/main.tf b/examples/list_folder_deny/main.tf index c4bbc86..bf416f7 100644 --- a/examples/list_folder_deny/main.tf +++ b/examples/list_folder_deny/main.tf @@ -18,7 +18,7 @@ Provider configuration *****************************************/ provider "google" { - version = "~> 2.5.0" + version = "~> 3.6.0" } /****************************************** diff --git a/examples/list_org_exclude/main.tf b/examples/list_org_exclude/main.tf index 2f30c8e..395b167 100644 --- a/examples/list_org_exclude/main.tf +++ b/examples/list_org_exclude/main.tf @@ -18,7 +18,7 @@ Provider configuration *****************************************/ provider "google" { - version = "~> 2.5.0" + version = "~> 3.6.0" } /****************************************** diff --git a/test/setup/main.tf b/test/setup/main.tf index 23cba9d..9585c8e 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 6.0" + version = "~> 7.0" name = "ci-org-policy" random_project_id = true diff --git a/test/setup/versions.tf b/test/setup/versions.tf index efbd8ea..c7e1532 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,9 +19,9 @@ terraform { } provider "google" { - version = "~> 2.13.0" + version = "~> 3.6.0" } provider "google-beta" { - version = "~> 2.13.0" + version = "~> 3.6.0" } diff --git a/versions.tf b/versions.tf index 2e03824..34bb3b2 100644 --- a/versions.tf +++ b/versions.tf @@ -16,6 +16,6 @@ terraform { required_version = ">= 0.12" required_providers { - google = "~> 2.5.0" + google = ">= 2.5, < 4.0" } }