feat: upgraded versions.tf to include minor bumps from tpg v5

Makefile

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

README.md

@@ -177,7 +177,7 @@ don't you run the risk of failing validation (at the least) or surfacing the
 dreaded `value of 'count' cannot be computed` error. Future versions of
 Terraform may change this fact, but this is the current limitation.
 
-[^]: (autogen_docs_start)
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -213,7 +213,7 @@ Terraform may change this fact, but this is the current limitation.
 | reverse\_dns\_fqdns | List of reverse DNS PTR records registered in Cloud DNS.  (e.g. ["1.2.11.10.in-addr.arpa", "2.2.11.10.in-addr.arpa"]) |
 | self\_links | List of URIs of the created address resources |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 
 ## Requirements

build/int.cloudbuild.yaml

@@ -43,7 +43,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestIpAddressOnly --verbose --stage teardown']
 - id: create ip-address-with-specific-ip-local
   waitFor:
-    - prepare
+    - destroy ip-address-only-local
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestIpAddressWithSpecificIp --verbose --stage init']
 - id: converge ip-address-with-specific-ip-local
@@ -63,7 +63,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestIpAddressWithSpecificIp --verbose --stage teardown']
 - id: create TestDnsForwardExample
   waitFor:
-    - prepare
+    - destroy ip-address-with-specific-ip-local
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExample --verbose --stage init']
 - id: converge TestDnsForwardExample
@@ -83,7 +83,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExample --verbose --stage teardown']
 - id: create TestDnsForwardExampleMultiNames
   waitFor:
-    - prepare
+    - destroy TestDnsForwardExample
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExampleMultiNames --verbose --stage init']
 - id: converge TestDnsForwardExampleMultiNames
@@ -103,7 +103,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExampleMultiNames --verbose --stage teardown']
 - id: create TestDnsForwardAndReverse
   waitFor:
-    - prepare
+    - destroy TestDnsForwardExampleMultiNames
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestDnsForwardAndReverse --verbose --stage init ']
 - id: converge TestDnsForwardAndReverse
@@ -126,6 +126,6 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
 options:
   machineType: 'N1_HIGHCPU_8'

build/lint.cloudbuild.yaml

@@ -22,6 +22,6 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
 options:
   machineType: 'N1_HIGHCPU_8'

examples/dns_forward_and_reverse/README.md

@@ -4,7 +4,7 @@ This example illustrates how to reserve multiple IP addresses at the same
 time, and how to enable the Google Cloud DNS registration functionality for
 both forward and reverse DNS lookup zones.
 
-[^]: (autogen_docs_start)
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -32,7 +32,7 @@ both forward and reverse DNS lookup zones.
 | reverse\_dns\_fqdns | List of reverse DNS PTR records registered in Cloud DNS. |
 | reverse\_zone | The GCP name of the reverse lookup DNS zone being used |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 To provision this example, run the following from within this directory:
 - `terraform init` to get the plugins

examples/dns_forward_and_reverse/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }

examples/dns_forward_example/README.md

@@ -5,7 +5,7 @@ time, and how to enable the Google Cloud DNS registration functionality that
 will register the IP addresses and their corresponding DNS names with Google
 Cloud DNS.
 
-[^]: (autogen_docs_start)
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -30,7 +30,7 @@ Cloud DNS.
 | project\_id | ID of the project being used |
 | region | Region being used |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 To provision this example, run the following from within this directory:
 - `terraform init` to get the plugins

examples/dns_forward_example/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }

examples/global_external_address/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     null = {
       source  = "hashicorp/null"

examples/internal_with_dynamic_ip/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      source = "hashicorp/google"
     }
     null = {
       source  = "hashicorp/null"

examples/internal_with_specific_ip/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      source = "hashicorp/google"
     }
     null = {
       source  = "hashicorp/null"

examples/ip_address_only/README.md

@@ -4,7 +4,7 @@ This example illustrates how to simply reserve an IP address that is
 dynamically assigned by GCP. Outputs have been provided to list the address
 itself as well as the resource name that corresponds.
 
-[^]: (autogen_docs_start)
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -23,7 +23,7 @@ itself as well as the resource name that corresponds.
 | project\_id | ID of the project being used |
 | region | Region being used |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 To provision this example, run the following from within this directory:
 - `terraform init` to get the plugins

examples/ip_address_only/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }

examples/ip_address_with_specific_ip/README.md

@@ -3,7 +3,7 @@
 This example illustrates how to reserve a specific IP address (instead of
 allowing GCP to dynamically assign it from the subnet provided).
 
-[^]: (autogen_docs_start)
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -23,7 +23,7 @@ allowing GCP to dynamically assign it from the subnet provided).
 | project\_id | ID of the project being used |
 | region | Region being used |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 To provision this example, run the following from within this directory:
 - `terraform init` to get the plugins

examples/ip_address_with_specific_ip/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
   }
 }

examples/regional_external_address/versions.tf

@@ -18,8 +18,7 @@ terraform {
   required_version = ">= 0.13"
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      source = "hashicorp/google"
     }
     null = {
       source  = "hashicorp/null"

main.tf

@@ -24,16 +24,16 @@ locals {
   dns_forward_record_count = var.enable_cloud_dns ? length(local.dns_fqdns) : 0
   dns_reverse_record_count = var.enable_reverse_dns ? length(local.dns_fqdns) : 0
   ip_addresses = concat(
-    google_compute_address.ip.*.address,
-    google_compute_global_address.global_ip.*.address,
+    google_compute_address.ip[*].address,
+    google_compute_global_address.global_ip[*].address,
   )
   ip_names = concat(
-    google_compute_address.ip.*.name,
-    google_compute_global_address.global_ip.*.name,
+    google_compute_address.ip[*].name,
+    google_compute_global_address.global_ip[*].name,
   )
   self_links = concat(
-    google_compute_address.ip.*.self_link,
-    google_compute_global_address.global_ip.*.self_link,
+    google_compute_address.ip[*].self_link,
+    google_compute_global_address.global_ip[*].self_link,
   )
   prefix_length = var.address_type == "EXTERNAL" || (var.address_type == "INTERNAL" && var.purpose == "PRIVATE_SERVICE_CONNECT") ? null : var.prefix_length
 

test/setup/versions.tf

@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.50, < 5.0"
+      version = ">= 3.50, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.50, < 5.0"
+      version = ">= 3.50, < 6"
     }
     random = {
       source = "hashicorp/random"

versions.tf

@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
   }