Merge branch 'master' into add_topic_kms_key_name_variable

terraform-google-modules · Nov 1, 2023 · 0bbbef3 · 0bbbef3
2 parents 4d111a7 + 99ca563
commit 0bbbef3
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 86 deletions.
diff --git a/.github/renovate.json b/.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"]
 }
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.13
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Then perform the following commands on the root folder:
 | topic\_kms\_key\_name | The resource name of the Cloud KMS CryptoKey to be used to protect access to messages published on this topic. | `string` | `null` | no |
 | topic\_labels | A set of key/value label pairs to assign to the pubsub topic. | `map(string)` | `{}` | no |
 | topic\_name | Name of pubsub topic connecting the scheduled job and the function | `string` | `"test-topic"` | no |
-| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/\*. | `string` | `null` | no |
+| vpc\_connector | The VPC Network Connector that this cloud function can connect to. It should be set up as fully-qualified URI. The format of this field is projects//locations//connectors/*. | `string` | `null` | no |
 | vpc\_connector\_egress\_settings | The egress settings for the connector, controlling what traffic is diverted through it. Allowed values are ALL\_TRAFFIC and PRIVATE\_RANGES\_ONLY. If unset, this field preserves the previously set value. | `string` | `null` | no |
 
 ## Outputs

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.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
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.13'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
diff --git a/examples/logs-slack-alerts/README.md b/examples/logs-slack-alerts/README.md
@@ -27,6 +27,6 @@ If not using the default App Engine default service account (PROJECT_ID@appspot.
 
 ## Outputs
 
-No output.
+No outputs.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/logs-slack-alerts/versions.tf b/examples/logs-slack-alerts/versions.tf
@@ -17,12 +17,10 @@
 terraform {
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = "~> 4.0"
+      source = "hashicorp/google-beta"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/pubsub_scheduled/versions.tf b/examples/pubsub_scheduled/versions.tf
@@ -17,12 +17,10 @@
 terraform {
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = "~> 4.0"
+      source = "hashicorp/google-beta"
     }
   }
   required_version = ">= 0.13"

diff --git a/examples/pubsub_scheduled_multiple/versions.tf b/examples/pubsub_scheduled_multiple/versions.tf
@@ -17,12 +17,10 @@
 terraform {
   required_providers {
     google = {
-      source  = "hashicorp/google"
-      version = "~> 4.0"
+      source = "hashicorp/google"
     }
     google-beta = {
-      source  = "hashicorp/google-beta"
-      version = "~> 4.0"
+      source = "hashicorp/google-beta"
     }
   }
   required_version = ">= 0.13"

diff --git a/modules/project_cleanup/versions.tf b/modules/project_cleanup/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
   }
 

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.35, < 5.0"
+      version = ">= 3.35, < 6"
     }
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -19,7 +19,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 6"
     }
     random = {
       source  = "hashicorp/random"