Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: relax version constraints to enable terraform 0.13.x compatibility #57

Merged
merged 4 commits into from
Aug 28, 2020
Merged

fix: relax version constraints to enable terraform 0.13.x compatibility #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e64f99
fix: relax version constraints to enable terraform 0.13.x compatibility
brandonjbjelland Aug 26, 2020
e5f8876
fix: updating project-factory to help CI
brandonjbjelland Aug 27, 2020
997ca9a
fix: attempting to fix CI with newer provider versions as versioning …
brandonjbjelland Aug 28, 2020
ca43689
fix: shortening CI cycle w PF skipping gcloud download
brandonjbjelland Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
driver:
name: "terraform"
command_timeout: 1800
verify_version: false

verifier:
name: "terraform"
Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
4 changes: 2 additions & 2 deletions examples/bigquery/billing_account/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/bigquery/folder/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/bigquery/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/bigquery/project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
2 changes: 1 addition & 1 deletion examples/datadog-sink/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

provider "google" {
version = "~> 3.5"
version = "~> 3.36.0"
}

locals {
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-sink/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
4 changes: 2 additions & 2 deletions examples/pubsub/billing_account/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/pubsub/folder/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/pubsub/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/pubsub/project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/splunk-sink/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/storage/billing_account/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/storage/folder/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/storage/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
4 changes: 2 additions & 2 deletions examples/storage/project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
2 changes: 1 addition & 1 deletion modules/bigquery/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
required_providers {
google = "~> 3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/pubsub/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
required_providers {
google = "~> 3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/storage/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
required_providers {
google = "~> 3.5"
}
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/bigquery/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/bigquery/project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/computed_values/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/pubsub/folder/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/pubsub/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/pubsub/project/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/storage/folder/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
2 changes: 1 addition & 1 deletion test/fixtures/storage/organization/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}
13 changes: 7 additions & 6 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 7.0"
version = "~> 9.0"
brandonjbjelland marked this conversation as resolved.
Show resolved Hide resolved

name = "ci-log-export"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
name = "ci-log-export"
random_project_id = true
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
skip_gcloud_download = true

activate_apis = [
"cloudresourcemanager.googleapis.com",
Expand Down
6 changes: 3 additions & 3 deletions test/setup/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"
}

provider "google" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}

provider "google-beta" {
version = "~> 3.5.0"
version = "~> 3.36.0"
}
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">=0.12.6, <0.14"

required_providers {
google = "~> 3.5"
Expand Down