fix: fixes for tflint (#110)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody <[email protected]>
terraform-google-modules · Mar 13, 2023 · 098214d · 098214d
1 parent fa54f96
commit 098214d
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 18 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.4
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10
 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
@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
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.4'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
diff --git a/examples/logs-slack-alerts/README.md b/examples/logs-slack-alerts/README.md
@@ -20,7 +20,6 @@ If not using the default App Engine default service account (PROJECT_ID@appspot.
 | audit\_log\_table | BigQuery Table where logs are sent | `string` | n/a | yes |
 | dataset\_name | BigQuery Dataset where logs are sent | `string` | n/a | yes |
 | error\_message\_column | BigQuery Column in audit log table representing logging error | `string` | n/a | yes |
-| job\_schedule | The cron schedule for triggering the cloud function | `string` | `"55 * * * *"` | no |
 | project\_id | The project ID to host the network in | `string` | n/a | yes |
 | region | The region the project is in (App Engine specific) | `string` | `"us-central1"` | no |
 | slack\_webhook | Slack webhook to send alerts | `string` | n/a | yes |

diff --git a/examples/logs-slack-alerts/variables.tf b/examples/logs-slack-alerts/variables.tf
@@ -19,13 +19,6 @@ variable "project_id" {
   type        = string
 }
 
-variable "job_schedule" {
-  description = "The cron schedule for triggering the cloud function"
-  type        = string
-  default     = "55 * * * *"
-
-}
-
 variable "slack_webhook" {
   description = "Slack webhook to send alerts"
   type        = string

diff --git a/examples/pubsub_scheduled/versions.tf b/examples/pubsub_scheduled/versions.tf
@@ -24,9 +24,6 @@ terraform {
       source  = "hashicorp/google-beta"
       version = "~> 4.0"
     }
-    random = {
-      source = "hashicorp/random"
-    }
   }
   required_version = ">= 0.13"
 }
diff --git a/modules/project_cleanup/main.tf b/modules/project_cleanup/main.tf
@@ -15,7 +15,7 @@
  */
 
 locals {
-  target_included_labels = var.target_tag_name != "" && var.target_tag_value != "" ? merge({ "${var.target_tag_name}" = "${var.target_tag_value}" }, var.target_included_labels) : var.target_included_labels
+  target_included_labels = var.target_tag_name != "" && var.target_tag_value != "" ? merge({ var.target_tag_name = var.target_tag_value }, var.target_included_labels) : var.target_included_labels
 }
 
 resource "google_service_account" "project_cleaner_function" {

diff --git a/outputs.tf b/outputs.tf
@@ -15,12 +15,12 @@
  */
 
 output "name" {
-  value       = length(google_cloud_scheduler_job.job) > 0 ? google_cloud_scheduler_job.job.0.name : null
+  value       = length(google_cloud_scheduler_job.job) > 0 ? google_cloud_scheduler_job.job[0].name : null
   description = "The name of the job created"
 }
 
 output "scheduler_job" {
-  value       = length(google_cloud_scheduler_job.job) > 0 ? google_cloud_scheduler_job.job.0 : null
+  value       = length(google_cloud_scheduler_job.job) > 0 ? google_cloud_scheduler_job.job[0] : null
   description = "The Cloud Scheduler job instance"
 }
 

diff --git a/versions.tf b/versions.tf
@@ -17,11 +17,14 @@
 terraform {
   required_version = ">= 0.13"
   required_providers {
-
     google = {
       source  = "hashicorp/google"
       version = ">= 3.53, < 5.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 2.1, < 4.0"
+    }
   }
 
   provider_meta "google" {