Skip to content

Commit

Permalink
feat!: add Terraform 0.13 constraint and module attribution (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
cloud-foundation-bot committed Mar 15, 2021
1 parent 6159ce0 commit be74f6b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 13 deletions.
13 changes: 6 additions & 7 deletions test/setup/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ resource "google_organization_iam_member" "sa_org" {
# Create a temporary project to host group member service accounts to pass to the examples.
module "project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 9.0"
version = "~> 10.0"

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

activate_apis = [
"cloudresourcemanager.googleapis.com",
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
24 changes: 20 additions & 4 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2018 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.
Expand All @@ -15,9 +15,25 @@
*/

terraform {
required_version = ">=0.12.6"
required_version = ">= 0.13"
required_providers {
google = ">= 3.29, <4.0.0"
google-beta = ">= 3.29, <4.0.0"

google = {
source = "hashicorp/google"
version = "~> 3.53"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 3.53"
}
}

provider_meta "google" {
module_name = "blueprints/terraform/terraform-google-group/v1.0.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-google-group/v1.0.0"
}

}

0 comments on commit be74f6b

Please sign in to comment.