chore: update tests to use 1.0 image and update compat note (#101)

Author: cloud-foundation-bot

.github/release-please.yml

@@ -1,2 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 releaseType: terraform-module
 handleGHRelease: true

.github/workflows/stale.yml

@@ -1,3 +1,17 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 name: "Close stale issues"
 on:
   schedule:

.gitignore

@@ -50,3 +50,6 @@ tmp
 # Ignore cache directory
 cache/*
 !cache/README.md
+
+# tf lock file
+.terraform.lock.hcl

Makefile

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

README.md

@@ -45,15 +45,15 @@ Setting it to `never` will *never* gcloud download and setting it to `always` wi
 | additional\_components | Additional gcloud CLI components to install. Defaults to none. Valid value are components listed in `gcloud components list` | `list` | `[]` | no |
 | create\_cmd\_body | On create, the command body you'd like to run with your entrypoint. | `string` | `"info"` | no |
 | create\_cmd\_entrypoint | On create, the command entrypoint you'd like to use. Can also be set to a custom script. Module's bin directory will be prepended to path. | `string` | `"gcloud"` | no |
-| create\_cmd\_triggers | List of any additional triggers for the create command execution. | `map` | `{}` | no |
+| create\_cmd\_triggers | List of any additional triggers for the create command execution. | `map(any)` | `{}` | no |
 | destroy\_cmd\_body | On destroy, the command body you'd like to run with your entrypoint. | `string` | `"info"` | no |
 | destroy\_cmd\_entrypoint | On destroy, the command entrypoint you'd like to use.  Can also be set to a custom script. Module's bin directory will be prepended to path. | `string` | `"gcloud"` | no |
 | enabled | Flag to optionally disable usage of this module. | `bool` | `true` | no |
 | gcloud\_download\_url | Custom gcloud download url. Optional. | `string` | `""` | no |
 | gcloud\_sdk\_version | The gcloud sdk version to download. | `string` | `"281.0.0"` | no |
 | jq\_download\_url | Custom jq download url. Optional. | `string` | `""` | no |
 | jq\_version | The jq version to download. | `string` | `"1.6"` | no |
-| module\_depends\_on | List of modules or resources this module depends on. | `list` | `[]` | no |
+| module\_depends\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |
 | platform | Platform CLI will run on. Defaults to linux. Valid values: linux, darwin | `string` | `"linux"` | no |
 | service\_account\_key\_file | Path to service account key file to run `gcloud auth activate-service-account` with. Optional. | `string` | `""` | no |
 | skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | `bool` | `true` | no |

build/int.cloudbuild.yaml

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

build/lint.cloudbuild.yaml

@@ -23,4 +23,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'

main.tf

@@ -54,7 +54,7 @@ locals {
 }
 
 resource "random_id" "cache" {
-  count = (! local.skip_download) ? 1 : 0
+  count = (!local.skip_download) ? 1 : 0
 
   byte_length = 4
 }
@@ -75,7 +75,7 @@ data "external" "env_override" {
 }
 
 resource "null_resource" "prepare_cache" {
-  count = (var.enabled && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && !local.skip_download) ? 1 : 0
 
   triggers = merge({
     md5                   = md5(var.create_cmd_entrypoint)
@@ -92,7 +92,7 @@ resource "null_resource" "prepare_cache" {
 }
 
 resource "null_resource" "download_gcloud" {
-  count = (var.enabled && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && !local.skip_download) ? 1 : 0
 
   triggers = merge({
     md5                     = md5(var.create_cmd_entrypoint)
@@ -109,7 +109,7 @@ resource "null_resource" "download_gcloud" {
 }
 
 resource "null_resource" "download_jq" {
-  count = (var.enabled && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && !local.skip_download) ? 1 : 0
 
   triggers = merge({
     md5                 = md5(var.create_cmd_entrypoint)
@@ -126,7 +126,7 @@ resource "null_resource" "download_jq" {
 }
 
 resource "null_resource" "decompress" {
-  count = (var.enabled && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && !local.skip_download) ? 1 : 0
 
   triggers = merge({
     md5                     = md5(var.create_cmd_entrypoint)
@@ -145,7 +145,7 @@ resource "null_resource" "decompress" {
 }
 
 resource "null_resource" "upgrade" {
-  count = (var.enabled && var.upgrade && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && var.upgrade && !local.skip_download) ? 1 : 0
 
   depends_on = [null_resource.decompress]
 
@@ -308,7 +308,7 @@ resource "null_resource" "additional_components_destroy" {
 }
 
 resource "null_resource" "upgrade_destroy" {
-  count = (var.enabled && var.upgrade && ! local.skip_download) ? 1 : 0
+  count = (var.enabled && var.upgrade && !local.skip_download) ? 1 : 0
 
   depends_on = [
     null_resource.additional_components_destroy,
@@ -327,7 +327,7 @@ resource "null_resource" "upgrade_destroy" {
 }
 
 resource "null_resource" "decompress_destroy" {
-  count      = (var.enabled && ! local.skip_download) ? 1 : 0
+  count      = (var.enabled && !local.skip_download) ? 1 : 0
   depends_on = [null_resource.upgrade_destroy]
 
   triggers = {

modules/kubectl-wrapper/README.md

@@ -28,14 +28,14 @@ module "kubectl" {
 | additional\_components | Additional gcloud CLI components to install. Defaults to installing kubectl. Valid value are components listed in `gcloud components list` | `list` | <pre>[<br>  "kubectl"<br>]</pre> | no |
 | cluster\_location | Cluster location (Zone/Region). Optional if use\_existing\_context is true. | `string` | `""` | no |
 | cluster\_name | Cluster name. Optional if use\_existing\_context is true. | `string` | `""` | no |
-| create\_cmd\_triggers | List of any additional triggers for the create command execution. | `map` | `{}` | no |
+| create\_cmd\_triggers | List of any additional triggers for the create command execution. | `map(any)` | `{}` | no |
 | enabled | Flag to optionally disable usage of this module. | `bool` | `true` | no |
 | gcloud\_sdk\_version | The gcloud sdk version to download. | `string` | `"281.0.0"` | no |
 | impersonate\_service\_account | An optional service account to impersonate for gcloud commands. If this service account is not specified, the module will use Application Default Credentials. | `string` | `""` | no |
 | internal\_ip | Use internal ip for the cluster endpoint. | `bool` | `false` | no |
 | kubectl\_create\_command | The kubectl command to create resources. | `string` | n/a | yes |
 | kubectl\_destroy\_command | The kubectl command to destroy resources. | `string` | n/a | yes |
-| module\_depends\_on | List of modules or resources this module depends on. | `list` | `[]` | no |
+| module\_depends\_on | List of modules or resources this module depends on. | `list(any)` | `[]` | no |
 | project\_id | The project ID hosting the cluster. Optional if use\_existing\_context is true. | `string` | `""` | no |
 | service\_account\_key\_file | Path to service account key file to auth as for running `gcloud container clusters get-credentials`. | `string` | `""` | no |
 | skip\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl is already available outside the module) | `bool` | `true` | no |

modules/kubectl-wrapper/variables.tf

@@ -50,13 +50,13 @@ variable "enabled" {
 
 variable "module_depends_on" {
   description = "List of modules or resources this module depends on."
-  type        = list
+  type        = list(any)
   default     = []
 }
 
 variable "create_cmd_triggers" {
   description = "List of any additional triggers for the create command execution."
-  type        = map
+  type        = map(any)
   default     = {}
 }