feat: updates to support TF 0.13 (#268)

.kitchen.yml

@@ -16,6 +16,7 @@
 driver:
   name: terraform
   command_timeout: 2700
+  verify_version: false
 
 provisioner:
   name: terraform

0-bootstrap/main.tf

@@ -47,7 +47,7 @@ resource "google_folder" "bootstrap" {
 
 module "seed_bootstrap" {
   source                         = "terraform-google-modules/bootstrap/google"
-  version                        = "~> 1.3"
+  version                        = "~> 1.5"
   org_id                         = var.org_id
   folder_id                      = google_folder.bootstrap.id
   billing_account                = var.billing_account

0-bootstrap/modules/jenkins-agent/main.tf

@@ -30,7 +30,7 @@ resource "random_id" "suffix" {
 *******************************************/
 module "cicd_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   name                        = local.cicd_project_name
   random_project_id           = true
   disable_services_on_destroy = false

0-bootstrap/modules/jenkins-agent/versions.tf

@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">=0.13, <0.14"
 
   required_providers {
     google      = "~> 3.5"

0-bootstrap/versions.tf

@@ -15,5 +15,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.6"
+  required_version = ">=0.13, <0.14"
 }

1-org/envs/shared/projects.tf

@@ -20,7 +20,7 @@
 
 module "org_audit_logs" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"
@@ -47,7 +47,7 @@ module "org_audit_logs" {
 
 module "org_billing_logs" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"
@@ -78,7 +78,7 @@ module "org_billing_logs" {
 
 module "org_secrets" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"
@@ -109,7 +109,7 @@ module "org_secrets" {
 
 module "interconnect" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"
@@ -140,7 +140,7 @@ module "interconnect" {
 
 module "scc_notifications" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"
@@ -171,7 +171,7 @@ module "scc_notifications" {
 
 module "dns_hub" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"

2-environments/modules/env_baseline/monitoring.tf

@@ -20,7 +20,7 @@
 
 module "monitoring_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   name                        = "prj-${var.environment_code}-monitoring"

2-environments/modules/env_baseline/networking.tf

@@ -20,7 +20,7 @@
 
 module "base_shared_vpc_host_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   name                        = "prj-${var.environment_code}-shared-base"
@@ -54,7 +54,7 @@ module "base_shared_vpc_host_project" {
 
 module "restricted_shared_vpc_host_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   name                        = "prj-${var.environment_code}-shared-restricted"

2-environments/modules/env_baseline/secrets.tf

@@ -21,7 +21,7 @@
 
 module "env_secrets" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.0"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.terraform_service_account
   default_service_account     = "deprivilege"

3-networks/envs/shared/main.tf

@@ -109,7 +109,7 @@ module "dns-forwarding-zone" {
 
 module "dns_hub_region1_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-c-dns-hub-${var.default_region1}-cr1"
   project = local.dns_hub_project_id
   network = module.dns_hub_vpc.network_name
@@ -122,7 +122,7 @@ module "dns_hub_region1_router1" {
 
 module "dns_hub_region1_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-c-dns-hub-${var.default_region1}-cr2"
   project = local.dns_hub_project_id
   network = module.dns_hub_vpc.network_name
@@ -135,7 +135,7 @@ module "dns_hub_region1_router2" {
 
 module "dns_hub_region2_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-c-dns-hub-${var.default_region2}-cr3"
   project = local.dns_hub_project_id
   network = module.dns_hub_vpc.network_name
@@ -148,7 +148,7 @@ module "dns_hub_region2_router1" {
 
 module "dns_hub_region2_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-c-dns-hub-${var.default_region2}-cr4"
   project = local.dns_hub_project_id
   network = module.dns_hub_vpc.network_name

3-networks/modules/base_shared_vpc/main.tf

@@ -95,7 +95,7 @@ resource "google_service_networking_connection" "private_vpc_connection" {
 
 module "region1_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region1}-cr1"
   project = var.project_id
   network = module.main.network_name
@@ -109,7 +109,7 @@ module "region1_router1" {
 
 module "region1_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region1}-cr2"
   project = var.project_id
   network = module.main.network_name
@@ -123,7 +123,7 @@ module "region1_router2" {
 
 module "region2_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region2}-cr3"
   project = var.project_id
   network = module.main.network_name
@@ -137,7 +137,7 @@ module "region2_router1" {
 
 module "region2_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region2}-cr4"
   project = var.project_id
   network = module.main.network_name

3-networks/modules/dedicated_interconnect/main.tf

@@ -34,7 +34,7 @@ data "google_projects" "interconnect_project" {
 
 module "interconnect_attachment1_region1" {
   source  = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name    = "vl-${var.region1_interconnect1_location}-${var.vpc_name}-${var.region1}-${local.suffix1}"
   project = local.interconnect_project_id
@@ -57,7 +57,7 @@ module "interconnect_attachment1_region1" {
 
 module "interconnect_attachment2_region1" {
   source  = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name    = "vl-${var.region1_interconnect2_location}-${var.vpc_name}-${var.region1}-${local.suffix2}"
   project = local.interconnect_project_id
@@ -80,7 +80,7 @@ module "interconnect_attachment2_region1" {
 
 module "interconnect_attachment1_region2" {
   source  = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name    = "vl-${var.region2_interconnect1_location}-${var.vpc_name}-${var.region2}-${local.suffix3}"
   project = local.interconnect_project_id
@@ -103,7 +103,7 @@ module "interconnect_attachment1_region2" {
 
 module "interconnect_attachment2_region2" {
   source  = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name    = "vl-${var.region2_interconnect2_location}-${var.vpc_name}-${var.region2}-${local.suffix4}"
   project = local.interconnect_project_id

3-networks/modules/restricted_shared_vpc/main.tf

@@ -97,7 +97,7 @@ resource "google_service_networking_connection" "private_vpc_connection" {
 
 module "region1_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region1}-cr5"
   project = var.project_id
   network = module.main.network_name
@@ -111,7 +111,7 @@ module "region1_router1" {
 
 module "region1_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region1}-cr6"
   project = var.project_id
   network = module.main.network_name
@@ -125,7 +125,7 @@ module "region1_router2" {
 
 module "region2_router1" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region2}-cr7"
   project = var.project_id
   network = module.main.network_name
@@ -139,7 +139,7 @@ module "region2_router1" {
 
 module "region2_router2" {
   source  = "terraform-google-modules/cloud-router/google"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
   name    = "cr-${local.vpc_name}-${var.default_region2}-cr8"
   project = var.project_id
   network = module.main.network_name

4-projects/modules/single_project/main.tf

@@ -20,7 +20,7 @@ locals {
 
 module "project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 8.1"
+  version                     = "~> 9.2"
   random_project_id           = "true"
   impersonate_service_account = var.impersonate_service_account
   activate_apis               = distinct(concat(var.activate_apis, ["billingbudgets.googleapis.com"]))

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

build/int.cloudbuild.yaml

@@ -135,4 +135,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

build/lint.cloudbuild.yaml

@@ -21,7 +21,7 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
 options:
   machineType: 'N1_HIGHCPU_8'
   env:

test/integration/projects/controls/gcloud_projects.rb

@@ -238,7 +238,7 @@
           end
 
           it "has a peering with #{peering_networks[environment_code][business_unit]['network']}" do
-            expect(data[0]['peerings'][0]['network'].should eq peering_networks[environment_code][business_unit]['network'])
+            expect(data[0]['peerings'][0]['network'].should eq peering_networks[environment_code][business_unit][:network])
           end
         end
       end

test/setup/main.tf

@@ -25,7 +25,7 @@ resource "google_folder" "test_folder" {
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 8.0"
+  version = "~> 9.2"
 
   name                 = "ci-foundation"
   random_project_id    = true