Merge branch 'master' into hashicorp/google-Version-Dependancies-failing

.github/renovate.json

@@ -1,68 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended",
-    ":semanticCommits",
-    ":preserveSemverRanges",
-    ":rebaseStalePrs"
-  ],
-  "minimumReleaseAge": "7 days",
-  "ignorePaths": [".github/workflows/lint.yaml", ".github/workflows/stale.yml"],
-  "labels": ["dependencies"],
-  "vulnerabilityAlerts": {
-    "labels": ["type:security"],
-    "minimumReleaseAge": null
-  },
-  "constraints": {"go": "1.20"},
-  "packageRules": [
-    {
-      "matchFileNames": ["examples/**", "test/**", ".github/**"],
-      "commitMessagePrefix": "chore(deps):"
-    },
-    {
-      "matchFileNames": ["*", "modules/**"],
-      "commitMessagePrefix": "fix(deps):"
-    },
-    {
-      "matchFileNames": ["*", "modules/**"],
-      "matchUpdateTypes": "major",
-      "commitMessagePrefix": "fix(deps)!:"
-    },
-    {"matchDepTypes": ["module"], "groupName": "TF modules"},
-    {
-      "matchDepTypes": ["require"],
-      "groupName": "GO modules",
-      "postUpdateOptions": ["gomodTidy"]
-    },
-    {
-      "matchDatasources": ["golang-version"],
-      "rangeStrategy": "bump",
-      "allowedVersions": "<1.21.0",
-      "postUpdateOptions": ["gomodTidy"]
-    },
-    {
-      "matchDepNames": ["google", "google-beta"],
-      "groupName": "Terraform Google Provider"
-    }
-  ],
-  "regexManagers": [
-    {
-      "fileMatch": ["(^|/)Makefile$"],
-      "matchStrings": [
-        "DOCKER_TAG_VERSION_DEVELOPER_TOOLS := (?<currentValue>.*?)\\n"
-      ],
-      "datasourceTemplate": "docker",
-      "registryUrlTemplate": "https://gcr.io/cloud-foundation-cicd",
-      "depNameTemplate": "cft/developer-tools"
-    },
-    {
-      "fileMatch": ["(^|/)build/(int|lint)\\.cloudbuild\\.yaml$"],
-      "matchStrings": [
-        "  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '(?<currentValue>.*?)'\\n"
-      ],
-      "datasourceTemplate": "docker",
-      "registryUrlTemplate": "https://gcr.io/cloud-foundation-cicd",
-      "depNameTemplate": "cft/developer-tools"
-    }
-  ]
+  "extends": ["github>GoogleCloudPlatform/cloud-foundation-toolkit//infra/terraform/test-org/github/resources/renovate"]
 }

Makefile

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

build/int.cloudbuild.yaml

@@ -53,4 +53,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.16'