chore: fix tests, update tools image (#216)

* fix: broken tests

* cleanup deprecated syntax

* test flaky

Author: bharathkkb

.kitchen.yml

@@ -75,7 +75,6 @@ suites:
             customized_inspec_attribute: output_subnets_private_access
             customized_inspec_attribute: output_subnets_regions
             customized_inspec_attribute: output_subnets_secondary_ranges
-            customized_inspec_attribute: output_project_id
           backend: local
           controls:
             - gcloud
@@ -130,7 +129,6 @@ suites:
             customized_inspec_attribute: output_subnets_private_access
             customized_inspec_attribute: output_subnets_regions
             customized_inspec_attribute: output_subnets_secondary_ranges
-            customized_inspec_attribute: output_project_id
           backend: local
           controls:
             - gcloud

Makefile

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

README.md

@@ -93,17 +93,17 @@ Then perform the following commands on the root folder:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| auto\_create\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | bool | `"false"` | no |
-| delete\_default\_internet\_gateway\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | bool | `"false"` | no |
-| description | An optional description of this resource. The resource must be recreated to modify this field. | string | `""` | no |
-| network\_name | The name of the network being created | string | n/a | yes |
-| project\_id | The ID of the project where this VPC will be created | string | n/a | yes |
-| routes | List of routes being created in this VPC | list(map(string)) | `<list>` | no |
-| routing\_mode | The network routing mode (default 'GLOBAL') | string | `"GLOBAL"` | no |
-| secondary\_ranges | Secondary ranges that will be used in some of the subnets | object | `<map>` | no |
-| shared\_vpc\_host | Makes this project a Shared VPC host if 'true' (default 'false') | bool | `"false"` | no |
-| subnets | The list of subnets being created | list(map(string)) | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| auto\_create\_subnetworks | When set to true, the network is created in 'auto subnet mode' and it will create a subnet for each region automatically across the 10.128.0.0/9 address range. When set to false, the network is created in 'custom subnet mode' so the user can explicitly connect subnetwork resources. | `bool` | `false` | no |
+| delete\_default\_internet\_gateway\_routes | If set, ensure that all routes within the network specified whose names begin with 'default-route' and with a next hop of 'default-internet-gateway' are deleted | `bool` | `false` | no |
+| description | An optional description of this resource. The resource must be recreated to modify this field. | `string` | `""` | no |
+| network\_name | The name of the network being created | `any` | n/a | yes |
+| project\_id | The ID of the project where this VPC will be created | `any` | n/a | yes |
+| routes | List of routes being created in this VPC | `list(map(string))` | `[]` | no |
+| routing\_mode | The network routing mode (default 'GLOBAL') | `string` | `"GLOBAL"` | no |
+| secondary\_ranges | Secondary ranges that will be used in some of the subnets | `map(list(object({ range_name = string, ip_cidr_range = string })))` | `{}` | no |
+| shared\_vpc\_host | Makes this project a Shared VPC host if 'true' (default 'false') | `bool` | `false` | no |
+| subnets | The list of subnets being created | `list(map(string))` | n/a | yes |
 
 ## Outputs
 
@@ -114,7 +114,7 @@ Then perform the following commands on the root folder:
 | network\_self\_link | The URI of the VPC being created |
 | project\_id | VPC project id |
 | route\_names | The route names associated with this VPC |
-| subnets | A map with keys of form subnet_region/subnet_name and values being the outputs of the google_compute_subnetwork resources used to create corresponding subnets. |
+| subnets | A map with keys of form subnet\_region/subnet\_name and values being the outputs of the google\_compute\_subnetwork resources used to create corresponding subnets. |
 | subnets\_flow\_logs | Whether the subnets will have VPC flow logs enabled |
 | subnets\_ips | The IPs and CIDRs of the subnets being created |
 | subnets\_names | The names of the subnets being created |

build/int.cloudbuild.yaml

@@ -166,4 +166,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.6.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'

codelabs/simple/main.tf

@@ -25,7 +25,7 @@ resource "google_project_service" "compute" {
 # Create the network
 module "vpc" {
   source  = "terraform-google-modules/network/google"
-  version = "~> 0.4.0"
+  version = "~> 2.5.0"
 
   # Give the network a name and project
   project_id   = google_project_service.compute.project

examples/delete_default_gateway_routes/README.md

@@ -8,9 +8,9 @@ This VPC has a single subnet with no secondary ranges, and ensures the default i
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| network\_name | The name of the VPC network being created | string | n/a | yes |
-| project\_id | The project ID to host the network in | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| network\_name | The name of the VPC network being created | `any` | n/a | yes |
+| project\_id | The project ID to host the network in | `any` | n/a | yes |
 
 ## Outputs
 

examples/ilb_routing/README.md

@@ -13,9 +13,9 @@ More information:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| network\_name | The name of the VPC network being created | string | n/a | yes |
-| project\_id | The project ID to host the network in | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| network\_name | The name of the VPC network being created | `any` | n/a | yes |
+| project\_id | The project ID to host the network in | `any` | n/a | yes |
 
 ## Outputs
 

examples/multi_vpc/README.md

@@ -6,10 +6,10 @@ This example configures a host network project with two separate networks.
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| network\_01\_name | The name of the first VPC network being created | string | n/a | yes |
-| network\_02\_name | The name of the second VPC network being created | string | n/a | yes |
-| project\_id | The project ID to host the network in | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| network\_01\_name | The name of the first VPC network being created | `any` | n/a | yes |
+| network\_02\_name | The name of the second VPC network being created | `any` | n/a | yes |
+| project\_id | The project ID to host the network in | `any` | n/a | yes |
 
 ## Outputs
 

examples/multi_vpc/main.tf

@@ -106,7 +106,7 @@ module "test-vpc-module-01" {
     ]
   }
 
-  routes = "${local.network_01_routes}"
+  routes = local.network_01_routes
 }
 
 module "test-vpc-module-02" {