From c633cc3130d776077ec9ea763d608c933d170e4d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Mar 2023 00:41:47 +0000
Subject: [PATCH 1/2] chore(deps): update cft/developer-tools docker tag to
 v1.10

---
 Makefile                   | 2 +-
 build/int.cloudbuild.yaml  | 2 +-
 build/lint.cloudbuild.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9656ce6..1f3c567 100644
--- 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
index 514dfaa..7e3ae71 100644
--- 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
index 9887ea9..9e1353e 100644
--- 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'

From dec4c631241a580e253023196677020d7c67d599 Mon Sep 17 00:00:00 2001
From: Andrew Peabody <andrewpeabody@google.com>
Date: Mon, 13 Mar 2023 20:39:45 +0000
Subject: [PATCH 2/2] fix for tflint

---
 main.tf     | 2 +-
 versions.tf | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/main.tf b/main.tf
index b06fa7a..9ddc697 100644
--- a/main.tf
+++ b/main.tf
@@ -70,7 +70,7 @@ resource "google_storage_bucket" "main" {
   uniform_bucket_level_access = true
 
   dynamic "logging" {
-    for_each = local.logging == [] ? [] : local.logging
+    for_each = length(local.logging) == 0 ? [] : local.logging
     content {
       log_bucket        = logging.value.log_bucket
       log_object_prefix = logging.value.log_object_prefix
diff --git a/versions.tf b/versions.tf
index 9bce797..656b16b 100644
--- a/versions.tf
+++ b/versions.tf
@@ -22,6 +22,14 @@ terraform {
       source  = "hashicorp/google"
       version = ">= 4.11, < 5.0"
     }
+    null = {
+      source  = "hashicorp/null"
+      version = ">= 2.1, < 4.0"
+    }
+    archive = {
+      source  = "hashicorp/archive"
+      version = ">= 1.2, < 3.0"
+    }
   }
 
   provider_meta "google" {