fix(deps): lint updates for cft/developer-tools v1.18 (#123)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody <[email protected]>
terraform-google-modules · Jan 8, 2024 · 2d57bef · 2d57bef
1 parent 90fdc5d
commit 2d57bef
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 43 deletions.
diff --git a/Makefile b/Makefile
@@ -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.18
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -41,4 +41,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.18'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -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.18'
diff --git a/examples/instance_with_advanced_options/outputs.tf b/examples/instance_with_advanced_options/outputs.tf
@@ -36,5 +36,5 @@ output "instance_name" {
 
 output "ipv4" {
   description = "The public IP address of the deployed instance"
-  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+  value       = google_compute_instance.vm.network_interface[0].access_config[0].nat_ip
 }
diff --git a/examples/instance_with_attached_disk/main.tf b/examples/instance_with_attached_disk/main.tf
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-}
-
 locals {
   instance_name = format("%s-%s", var.instance_name, substr(md5(module.gce-container.container.image), 0, 8))
 }

diff --git a/examples/instance_with_attached_disk/outputs.tf b/examples/instance_with_attached_disk/outputs.tf
@@ -31,7 +31,7 @@ output "volumes" {
 
 output "http_address" {
   description = "The IP address on which the HTTP service is exposed"
-  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+  value       = google_compute_instance.vm.network_interface[0].access_config[0].nat_ip
 }
 
 output "http_port" {
@@ -46,5 +46,5 @@ output "instance_name" {
 
 output "ipv4" {
   description = "The public IP address of the deployed instance"
-  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+  value       = google_compute_instance.vm.network_interface[0].access_config[0].nat_ip
 }
diff --git a/examples/instance_with_config_file/outputs.tf b/examples/instance_with_config_file/outputs.tf
@@ -36,5 +36,5 @@ output "volumes" {
 
 output "ipv4" {
   description = "The public IP address of the deployed instance"
-  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+  value       = google_compute_instance.vm.network_interface[0].access_config[0].nat_ip
 }
diff --git a/examples/managed_instance_group/README.md b/examples/managed_instance_group/README.md
@@ -21,7 +21,6 @@ This example requires that some python libraries be installed, as outlined in `r
 | region | The GCP region to deploy instances into | `string` | n/a | yes |
 | service\_account | n/a | <pre>object({<br>    email  = string,<br>    scopes = list(string)<br>  })</pre> | <pre>{<br>  "email": "",<br>  "scopes": [<br>    "cloud-platform"<br>  ]<br>}</pre> | no |
 | subnetwork | The name of the subnetwork to deploy instances into | `string` | `"mig-subnet"` | no |
-| zone | The GCP zone to deploy instances into | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/examples/managed_instance_group/variables.tf b/examples/managed_instance_group/variables.tf
@@ -54,11 +54,6 @@ variable "region" {
   type        = string
 }
 
-variable "zone" {
-  description = "The GCP zone to deploy instances into"
-  type        = string
-}
-
 variable "network" {
   description = "The GCP network"
   type        = string

diff --git a/examples/simple_instance/main.tf b/examples/simple_instance/main.tf
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-}
-
 locals {
   instance_name = format("%s-%s", var.instance_name, substr(md5(module.gce-container.container.image), 0, 8))
 }

diff --git a/examples/simple_instance/outputs.tf b/examples/simple_instance/outputs.tf
@@ -36,7 +36,7 @@ output "instance_name" {
 
 output "ipv4" {
   description = "The public IP address of the deployed instance"
-  value       = google_compute_instance.vm.network_interface.0.access_config.0.nat_ip
+  value       = google_compute_instance.vm.network_interface[0].access_config[0].nat_ip
 }
 
 output "cos_image_name" {

diff --git a/modules/cos-coredns/main.tf b/modules/cos-coredns/main.tf
@@ -42,7 +42,7 @@ data "template_file" "cloud-config" {
     image       = var.container_image
     instance_id = count.index + 1
     log_driver  = var.log_driver
-    ip_address  = google_compute_address.addresses.*.address[count.index]
+    ip_address  = google_compute_address.addresses[*].address[count.index]
   }
 }
 
@@ -72,7 +72,7 @@ resource "google_compute_instance" "default" {
 
   network_interface {
     subnetwork = var.subnetwork
-    network_ip = google_compute_address.addresses.*.address[count.index]
+    network_ip = google_compute_address.addresses[*].address[count.index]
     access_config {}
   }
 
@@ -84,7 +84,7 @@ resource "google_compute_instance" "default" {
   metadata = {
     google-logging-enabled    = var.stackdriver_logging
     google-monitoring-enabled = var.stackdriver_monitoring
-    user-data                 = data.template_file.cloud-config.*.rendered[count.index]
+    user-data                 = data.template_file.cloud-config[*].rendered[count.index]
   }
 }
 

diff --git a/modules/cos-coredns/outputs.tf b/modules/cos-coredns/outputs.tf
@@ -16,15 +16,15 @@
 
 output "instances" {
   description = "Instance name => address map."
-  value       = zipmap(google_compute_instance.default.*.name, google_compute_address.addresses.*.address)
+  value       = zipmap(google_compute_instance.default[*].name, google_compute_address.addresses[*].address)
 }
 
 output "names" {
   description = "List of instance names."
-  value       = [google_compute_instance.default.*.name]
+  value       = [google_compute_instance.default[*].name]
 }
 
 output "internal_addresses" {
   description = "List of instance internal addresses."
-  value       = [google_compute_instance.default.*.network_interface.0.network_ip]
+  value       = [google_compute_instance.default[*].network_interface[0].network_ip]
 }
diff --git a/modules/cos-coredns/variables.tf b/modules/cos-coredns/variables.tf
@@ -121,6 +121,7 @@ variable "corefile" {
 
 variable "log_driver" {
   description = "Docker log driver to use for CoreDNS."
+  type        = string
   default     = "gcplogs"
 }
 
@@ -132,6 +133,7 @@ variable "stackdriver_logging" {
 
 variable "stackdriver_monitoring" {
   description = "Enable the Stackdriver monitoring agent."
+  type        = bool
   default     = true
 }
 

diff --git a/modules/cos-coredns/versions.tf b/modules/cos-coredns/versions.tf
@@ -26,6 +26,10 @@ terraform {
       source  = "hashicorp/google-beta"
       version = ">= 3.53, < 5.0"
     }
+    template = {
+      source  = "hashicorp/template"
+      version = ">= 2.1.0"
+    }
   }
 
   provider_meta "google" {

diff --git a/modules/cos-generic/main.tf b/modules/cos-generic/main.tf
@@ -39,7 +39,7 @@ data "template_file" "cloud-config" {
     custom_var    = var.cloud_init_custom_var
     instance_id   = count.index + 1
     instance_name = "${local.prefix}${count.index + 1}"
-    ip_address    = var.reserve_ip ? google_compute_address.addresses.*.address[count.index] : ""
+    ip_address    = var.reserve_ip ? google_compute_address.addresses[*].address[count.index] : ""
   }
 }
 
@@ -69,7 +69,7 @@ resource "google_compute_instance" "default" {
 
   network_interface {
     subnetwork = var.subnetwork
-    network_ip = var.reserve_ip ? google_compute_address.addresses.*.address[count.index] : ""
+    network_ip = var.reserve_ip ? google_compute_address.addresses[*].address[count.index] : ""
     access_config {}
   }
 
@@ -81,7 +81,7 @@ resource "google_compute_instance" "default" {
   metadata = {
     google-logging-enabled    = var.stackdriver_logging
     google-monitoring-enabled = var.stackdriver_monitoring
-    user-data                 = data.template_file.cloud-config.*.rendered[count.index]
+    user-data                 = data.template_file.cloud-config[*].rendered[count.index]
   }
 
   allow_stopping_for_update = var.allow_stopping_for_update

diff --git a/modules/cos-generic/outputs.tf b/modules/cos-generic/outputs.tf
@@ -16,15 +16,15 @@
 
 output "instances" {
   description = "Instance name => address map."
-  value       = zipmap(google_compute_instance.default.*.name, google_compute_address.addresses.*.address)
+  value       = zipmap(google_compute_instance.default[*].name, google_compute_address.addresses[*].address)
 }
 
 output "names" {
   description = "List of instance names."
-  value       = [google_compute_instance.default.*.name]
+  value       = [google_compute_instance.default[*].name]
 }
 
 output "internal_addresses" {
   description = "List of instance internal addresses."
-  value       = [google_compute_instance.default.*.network_interface.0.network_ip]
+  value       = [google_compute_instance.default[*].network_interface[0].network_ip]
 }
diff --git a/modules/cos-generic/versions.tf b/modules/cos-generic/versions.tf
@@ -26,6 +26,10 @@ terraform {
       source  = "hashicorp/google-beta"
       version = ">= 3.53, < 5.0"
     }
+    template = {
+      source  = "hashicorp/template"
+      version = ">= 2.1.0"
+    }
   }
 
   provider_meta "google" {

diff --git a/modules/cos-mysql/main.tf b/modules/cos-mysql/main.tf
@@ -46,7 +46,7 @@ data "template_file" "cloud-config" {
   vars = {
     image       = var.container_image
     instance_id = count.index + 1
-    ip_address  = google_compute_address.addresses.*.address[count.index]
+    ip_address  = google_compute_address.addresses[*].address[count.index]
     key         = lookup(var.kms_data, "key", "")
     keyring     = lookup(var.kms_data, "keyring", "")
     location    = lookup(var.kms_data, "location", "")
@@ -97,12 +97,12 @@ resource "google_compute_instance" "default" {
 
   network_interface {
     subnetwork = var.subnetwork
-    network_ip = google_compute_address.addresses.*.address[count.index]
+    network_ip = google_compute_address.addresses[*].address[count.index]
     access_config {}
   }
 
   attached_disk {
-    source      = google_compute_disk.disk-data.*.name[count.index]
+    source      = google_compute_disk.disk-data[*].name[count.index]
     device_name = "mysql-data"
   }
 
@@ -116,7 +116,7 @@ resource "google_compute_instance" "default" {
   }
 
   metadata = {
-    user-data                 = data.template_file.cloud-config.*.rendered[count.index]
+    user-data                 = data.template_file.cloud-config[*].rendered[count.index]
     google-logging-enabled    = var.stackdriver_logging
     google-monitoring-enabled = var.stackdriver_monitoring
   }

diff --git a/modules/cos-mysql/outputs.tf b/modules/cos-mysql/outputs.tf
@@ -16,7 +16,7 @@
 
 output "instances" {
   description = "Instance name => address map."
-  value       = zipmap(google_compute_instance.default.*.name, google_compute_address.addresses.*.address)
+  value       = zipmap(google_compute_instance.default[*].name, google_compute_address.addresses[*].address)
 }
 
 output "password" {

diff --git a/modules/cos-mysql/versions.tf b/modules/cos-mysql/versions.tf
@@ -26,6 +26,14 @@ terraform {
       source  = "hashicorp/google-beta"
       version = ">= 3.53, < 5.0"
     }
+    template = {
+      source  = "hashicorp/template"
+      version = ">= 2.1.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.3.0"
+    }
   }
 
   provider_meta "google" {

diff --git a/test/fixtures/instance_with_config_file/network.tf b/test/fixtures/instance_with_config_file/network.tf
@@ -18,7 +18,7 @@ resource "random_string" "suffix" {
   length  = 4
   upper   = "false"
   lower   = "true"
-  number  = "false"
+  numeric = "false"
   special = "false"
 }
 

diff --git a/test/fixtures/instance_with_config_file/versions.tf b/test/fixtures/instance_with_config_file/versions.tf
@@ -21,15 +21,15 @@ terraform {
     }
     local = {
       source  = "hashicorp/local"
-      version = "~> 2.0"
+      version = ">= 2.0"
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.0"
+      version = ">= 3.3.0"
     }
     tls = {
       source  = "hashicorp/tls"
-      version = "~> 4.0"
+      version = ">= 4.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/test/fixtures/managed_instance_group/example.tf b/test/fixtures/managed_instance_group/example.tf
@@ -28,7 +28,6 @@ module "example" {
   source     = "../../../examples/managed_instance_group"
   project_id = var.project_id
   region     = var.region
-  zone       = var.zone
   subnetwork = google_compute_subnetwork.main.name
   mig_name   = "cft-test-${local.example_name}-${random_string.suffix.result}"
   image_port = "8080"

diff --git a/test/fixtures/shared/network.tf b/test/fixtures/shared/network.tf
@@ -18,7 +18,7 @@ resource "random_string" "suffix" {
   length  = 4
   upper   = "false"
   lower   = "true"
-  number  = "false"
+  numeric = "false"
   special = "false"
 }