fix: updates for tflint and dev-tools 1.11 (#180)

.kitchen.yml

@@ -15,6 +15,7 @@
 ---
 driver:
   name: terraform
+  verify_version: false
 
 provisioner:
   name: terraform

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.11
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

build/int.cloudbuild.yaml

@@ -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.11'

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.11'

examples/shared_vpc_internal/main.tf

@@ -19,11 +19,6 @@ provider "google" {
   region  = var.region
 }
 
-data "google_compute_network" "vault" {
-  name    = var.network_name
-  project = var.host_project_id
-}
-
 data "google_compute_subnetwork" "vault" {
   name    = var.subnet_name
   project = var.host_project_id

examples/shared_vpc_internal/variables.tf

@@ -22,14 +22,6 @@ variable "kms_keyring" {
   default = "vault-keyring"
 }
 
-variable "service_project_name" {
-  default = "vault-svpc-service"
-}
-
-variable "network_name" {
-  default = "vault-svpc"
-}
-
 variable "subnet_name" {
   default = "vault"
 }

examples/vault-on-gce/README.md

@@ -191,7 +191,6 @@ keys:
 | allow\_public\_egress | Whether to create a NAT for external egress. If false, you must also specify an http\_proxy to download required executables including Vault, Fluentd and Stackdriver | `bool` | `true` | no |
 | kms\_crypto\_key | Name of the GCP KMS crypto key | `string` | `"vault-init"` | no |
 | kms\_keyring | Name of the GCP KMS keyring | `string` | `"vault"` | no |
-| kms\_location | Location for the KMS keyring | `string` | `"us-east4"` | no |
 | load\_balancing\_scheme | e.g. [INTERNAL\|EXTERNAL]. Scheme of the load balancer | `string` | `"EXTERNAL"` | no |
 | project\_id | Project ID in which to deploy | `string` | n/a | yes |
 | region | Region in which to deploy | `string` | `"us-east4"` | no |

examples/vault-on-gce/variables.tf

@@ -26,12 +26,6 @@ variable "region" {
   description = "Region in which to deploy"
 }
 
-variable "kms_location" {
-  type        = string
-  default     = "us-east4"
-  description = "Location for the KMS keyring"
-}
-
 variable "kms_keyring" {
   type        = string
   default     = "vault"

main.tf

@@ -92,4 +92,5 @@ module "cluster" {
   tls_save_ca_to_disk                          = var.tls_save_ca_to_disk
   tls_save_ca_to_disk_filename                 = var.tls_save_ca_to_disk_filename
   tls_ou                                       = var.tls_ou
+  service_account_project_iam_roles            = var.service_account_project_iam_roles
 }

modules/cluster/variables.tf

@@ -360,6 +360,7 @@ variable "tls_ca_subject" {
 
 variable "tls_cn" {
   description = "The TLS Common Name for the TLS certificates"
+  type        = string
   default     = "vault.example.net"
 }
 
@@ -396,5 +397,6 @@ variable "tls_save_ca_to_disk_filename" {
 
 variable "tls_ou" {
   description = "The TLS Organizational Unit for the TLS certificate"
+  type        = string
   default     = "IT Security Operations"
 }

modules/cluster/versions.tf

@@ -32,6 +32,11 @@ terraform {
       source  = "hashicorp/google-beta"
       version = ">= 3.53, < 5.0"
     }
+
+    local = {
+      source  = "hashicorp/local"
+      version = ">= 1.2.0"
+    }
   }
 
   provider_meta "google" {

variables.tf

@@ -301,6 +301,7 @@ variable "tls_ca_subject" {
 
 variable "tls_cn" {
   description = "The TLS Common Name for the TLS certificates"
+  type        = string
   default     = "vault.example.net"
 }
 
@@ -337,6 +338,7 @@ variable "tls_save_ca_to_disk_filename" {
 
 variable "tls_ou" {
   description = "The TLS Organizational Unit for the TLS certificate"
+  type        = string
   default     = "IT Security Operations"
 }