Merge branch 'master' into renovate/cft-developer-tools-1.x

terraform-google-modules · Nov 1, 2023 · 23ee36c · 23ee36c
2 parents 254eac7 + 99ca563
commit 23ee36c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Then perform the following commands on the root folder:
 | time\_zone | The timezone to use in scheduler | `string` | `"Etc/UTC"` | 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/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"