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

feat: update TPG version constraints to allow 4.0 #34

Merged
merged 3 commits into from
Feb 23, 2022
Merged

feat: update TPG version constraints to allow 4.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9f0294
feat: update TPG version constraints to allow 4.0
cloud-foundation-bot Nov 17, 2021
4314608
remove kms id in example
bharathkkb Feb 23, 2022
06be91d
kitchen verify version skip
bharathkkb Feb 23, 2022
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

provisioner:
name: "terraform"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

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: '1.0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
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: '1.0'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
5 changes: 2 additions & 3 deletions examples/dlp_api_example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

provider "google" {
version = "~> 3.53"
region = var.region
region = var.region
}

resource "random_id" "random_suffix" {
Expand Down Expand Up @@ -86,7 +85,7 @@ resource "google_kms_key_ring" "create_kms_ring" {
resource "google_kms_crypto_key" "create_kms_key" {
count = var.create_key_ring ? 1 : 0
name = var.kms_key_name
key_ring = google_kms_key_ring.create_kms_ring[0].self_link
key_ring = google_kms_key_ring.create_kms_ring[0].id
depends_on = [google_kms_key_ring.create_kms_ring]
}

Expand Down
14 changes: 13 additions & 1 deletion examples/dlp_api_example/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,17 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
}
null = {
source = "hashicorp/null"
}
random = {
source = "hashicorp/random"
}
}
}
5 changes: 2 additions & 3 deletions examples/simple_example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

provider "google" {
version = "~> 3.53"
region = var.region
region = var.region
}

resource "random_id" "random_suffix" {
Expand All @@ -29,7 +28,7 @@ locals {

module "vpc" {
source = "terraform-google-modules/network/google"
version = "~> 3.0"
version = "~> 4.0"
project_id = var.project_id
network_name = "dataflow-network"

Expand Down
11 changes: 10 additions & 1 deletion examples/simple_example/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,14 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 4.0"
}
random = {
source = "hashicorp/random"
}
}
}
2 changes: 1 addition & 1 deletion modules/dataflow_bucket/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ terraform {

google = {
source = "hashicorp/google"
version = "~> 3.53"
version = ">= 3.53, < 5.0"
}
}

Expand Down
4 changes: 0 additions & 4 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
* limitations under the License.
*/

provider "google" {
version = "~> 3.53"
}

module "project-ci-dataflow" {
source = "terraform-google-modules/project-factory/google"
version = "~> 10.0"
Expand Down
8 changes: 7 additions & 1 deletion test/setup/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,11 @@
*/

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
version = "~> 3.53"
}
}
}
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 @@ -20,7 +20,7 @@ terraform {

google = {
source = "hashicorp/google"
version = "~> 3.53"
version = ">= 3.53, < 5.0"
}
}

Expand Down