Merge pull request #87 from GoogleCloudPlatform/renovate_pr_80

Adding fix for Pr #80 of Renovate
GoogleCloudPlatform · Jan 1, 2025 · 9fb0d38 · 9fb0d38
2 parents 09cfe04 + 1c1f147
commit 9fb0d38
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 63 deletions.
diff --git a/terraform/anomaly_detection/main.tf b/terraform/anomaly_detection/main.tf
@@ -24,7 +24,7 @@ locals {
 
 // Project
 module "google_cloud_project" {
-  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v32.0.1"
+  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v36.0.1"
   billing_account = var.billing_account
   project_create  = var.project_create
   name            = var.project_id
@@ -43,10 +43,11 @@ module "google_cloud_project" {
 }
 
 module "registry_docker" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/artifact-registry?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/artifact-registry?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   location   = var.region
   name       = "dataflow-containers"
+  format     = { docker = { standard = {} } }
   iam = {
     "roles/artifactregistry.admin" = [
       "serviceAccount:${module.google_cloud_project.number}@cloudbuild.gserviceaccount.com"
@@ -68,7 +69,7 @@ module "registry_docker" {
 
 // Buckets for staging data, scripts, etc, in the two regions
 module "buckets" {
-  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v32.0.1"
+  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v36.0.1"
   project_id    = module.google_cloud_project.project_id
   name          = module.google_cloud_project.project_id
   location      = var.region
@@ -77,7 +78,7 @@ module "buckets" {
 }
 
 module "input_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "transactions"
   subscriptions = {
@@ -86,7 +87,7 @@ module "input_topic" {
 }
 
 module "output_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "detections"
   subscriptions = {
@@ -96,7 +97,7 @@ module "output_topic" {
 
 //bigtable table
 module "enrichment_table" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigtable-instance?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigtable-instance?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = local.bigtable_instance
   clusters = {
@@ -112,14 +113,14 @@ module "enrichment_table" {
 
 //bigquery dataset
 module "output_dataset" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   id         = local.bigquery_dataset
 }
 
 // Service account
 module "dataflow_sa" {
-  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v32.0.1"
+  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v36.0.1"
   project_id   = module.google_cloud_project.project_id
   name         = local.dataflow_service_account
   generate_key = false
@@ -136,7 +137,7 @@ module "dataflow_sa" {
 
 // Network
 module "vpc_network" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "${var.network_prefix}-net"
   subnets = [
@@ -155,7 +156,7 @@ module "vpc_network" {
 
 module "firewall_rules" {
   // Default rules for internal traffic + SSH access via IAP
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   network    = module.vpc_network.name
   default_rules_config = {
@@ -181,7 +182,7 @@ module "firewall_rules" {
 }
 module "regional_nat" {
   // So we can get to Internet if necessary (from the Dataflow region)
-  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v32.0.1"
+  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v36.0.1"
   project_id     = module.google_cloud_project.project_id
   region         = var.region
   name           = "${var.network_prefix}-nat"

diff --git a/terraform/cdp/main.tf b/terraform/cdp/main.tf
@@ -22,7 +22,7 @@ locals {
 
 // Project
 module "google_cloud_project" {
-  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v32.0.1"
+  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v36.0.1"
   billing_account = var.billing_account
   project_create  = var.project_create
   name            = var.project_id
@@ -40,10 +40,11 @@ module "google_cloud_project" {
 }
 
 module "registry_docker" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/artifact-registry?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/artifact-registry?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   location   = var.region
   name       = "dataflow-containers"
+  format     = { docker = { standard = {} } }
   iam = {
     "roles/artifactregistry.admin" = [
       "serviceAccount:${module.google_cloud_project.number}@cloudbuild.gserviceaccount.com"
@@ -66,7 +67,7 @@ module "registry_docker" {
 
 // Buckets for staging data, scripts, etc, in the two regions
 module "buckets" {
-  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v32.0.1"
+  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v36.0.1"
   project_id    = module.google_cloud_project.project_id
   name          = module.google_cloud_project.project_id
   location      = var.region
@@ -75,7 +76,7 @@ module "buckets" {
 }
 
 module "transactions_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "transactions"
   subscriptions = {
@@ -84,7 +85,7 @@ module "transactions_topic" {
 }
 
 module "coupon_redemption_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "coupon_redemption"
   subscriptions = {
@@ -94,15 +95,15 @@ module "coupon_redemption_topic" {
 
 //bigquery dataset
 module "output_dataset" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   id         = var.bq_dataset
 }
 
 
 // Service account
 module "dataflow_sa" {
-  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v32.0.1"
+  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v36.0.1"
   project_id   = module.google_cloud_project.project_id
   name         = local.dataflow_service_account
   generate_key = false
@@ -120,7 +121,7 @@ module "dataflow_sa" {
 
 // Network
 module "vpc_network" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "${var.network_prefix}-net"
   subnets = [
@@ -139,7 +140,7 @@ module "vpc_network" {
 
 module "firewall_rules" {
   // Default rules for internal traffic + SSH access via IAP
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   network    = module.vpc_network.name
   default_rules_config = {
@@ -165,7 +166,7 @@ module "firewall_rules" {
 }
 module "regional_nat" {
   // So we can get to Internet if necessary (from the Dataflow region)
-  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v32.0.1"
+  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v36.0.1"
   project_id     = module.google_cloud_project.project_id
   region         = var.region
   name           = "${var.network_prefix}-nat"

diff --git a/terraform/clickstream_analytics/main.tf b/terraform/clickstream_analytics/main.tf
@@ -23,7 +23,7 @@ locals {
 
 // Project
 module "google_cloud_project" {
-  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v32.0.1"
+  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v36.0.1"
   billing_account = var.billing_account
   project_create  = var.project_create
   name            = var.project_id
@@ -92,7 +92,7 @@ resource "google_bigquery_table" "deadletter" {
 
 // Buckets for staging data, scripts, etc, in the two regions
 module "buckets" {
-  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v32.0.1"
+  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v36.0.1"
   project_id    = module.google_cloud_project.project_id
   name          = module.google_cloud_project.project_id
   location      = var.region
@@ -101,7 +101,7 @@ module "buckets" {
 }
 
 module "input_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "input"
   subscriptions = {
@@ -111,7 +111,7 @@ module "input_topic" {
 
 // Service account
 module "dataflow_sa" {
-  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v32.0.1"
+  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v36.0.1"
   project_id   = module.google_cloud_project.project_id
   name         = local.dataflow_service_account
   generate_key = false
@@ -128,7 +128,7 @@ module "dataflow_sa" {
 
 // Network
 module "vpc_network" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "${var.network_prefix}-net"
   subnets = [
@@ -147,7 +147,7 @@ module "vpc_network" {
 
 module "firewall_rules" {
   // Default rules for internal traffic + SSH access via IAP
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   network    = module.vpc_network.name
   default_rules_config = {

diff --git a/terraform/etl_integration/main.tf b/terraform/etl_integration/main.tf
@@ -35,7 +35,7 @@ resource "google_project_service" "crm" {
 // Project
 module "google_cloud_project" {
   depends_on      = [google_project_service.crm]
-  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v32.0.1"
+  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v36.0.1"
   billing_account = var.billing_account
   project_create  = var.project_create
   name            = var.project_id
@@ -57,7 +57,7 @@ module "google_cloud_project" {
 
 // Buckets for staging data, scripts, etc, in the two regions
 module "buckets" {
-  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v32.0.1"
+  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v36.0.1"
   project_id    = module.google_cloud_project.project_id
   name          = module.google_cloud_project.project_id
   location      = var.region
@@ -67,7 +67,7 @@ module "buckets" {
 
 // BigQuery dataset for final destination
 module "dataset" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/bigquery-dataset?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   id         = local.bigquery_dataset
   access = {
@@ -148,7 +148,7 @@ resource "google_spanner_database_iam_binding" "read_write_metadata" {
 
 // Service account
 module "dataflow_sa" {
-  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v32.0.1"
+  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v36.0.1"
   project_id   = module.google_cloud_project.project_id
   name         = local.dataflow_service_account
   generate_key = false
@@ -164,7 +164,7 @@ module "dataflow_sa" {
 
 // Network
 module "vpc_network" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "${var.network_prefix}-net"
   subnets = [
@@ -183,7 +183,7 @@ module "vpc_network" {
 
 module "firewall_rules" {
   // Default rules for internal traffic + SSH access via IAP
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   network    = module.vpc_network.name
   default_rules_config = {
@@ -211,7 +211,7 @@ module "firewall_rules" {
 // So we can get to Internet if necessary (from the Dataflow region)
 module "regional_nat" {
   count          = var.internet_access ? 1 : 0
-  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v32.0.1"
+  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v36.0.1"
   project_id     = module.google_cloud_project.project_id
   region         = var.region
   name           = "${var.network_prefix}-nat"

diff --git a/terraform/log_replication_splunk/main.tf b/terraform/log_replication_splunk/main.tf
@@ -22,7 +22,7 @@ locals {
 
 // Project
 module "google_cloud_project" {
-  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v32.0.1"
+  source          = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/project?ref=v36.0.1"
   billing_account = var.billing_account
   project_create  = var.project_create
   name            = var.project_id
@@ -40,7 +40,7 @@ module "google_cloud_project" {
 
 // Buckets for staging data, scripts, etc, in the two regions
 module "buckets" {
-  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v32.0.1"
+  source        = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/gcs?ref=v36.0.1"
   project_id    = module.google_cloud_project.project_id
   name          = module.google_cloud_project.project_id
   location      = var.region
@@ -51,7 +51,7 @@ module "buckets" {
 
 // Service accounts
 module "dataflow_sa" {
-  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v32.0.1"
+  source       = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/iam-service-account?ref=v36.0.1"
   project_id   = module.google_cloud_project.project_id
   name         = local.dataflow_service_account
   generate_key = false
@@ -67,7 +67,7 @@ module "dataflow_sa" {
 
 // Pubsub topic to receive all logs
 module "logging_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = local.pubsub_logging_topic
   subscriptions = {
@@ -76,7 +76,7 @@ module "logging_topic" {
 }
 
 module "deadletter_topic" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/pubsub?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = local.pubsub_deadletter_topic
   subscriptions = {
@@ -103,7 +103,7 @@ resource "google_project_iam_binding" "pubsub_log_writer" {
 
 // Splunk token in Secret Manager
 module "splunk_token_secret" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/secret-manager?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/secret-manager?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   secrets = {
     splunk-token = {}
@@ -122,7 +122,7 @@ module "splunk_token_secret" {
 
 // Network
 module "vpc_network" {
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   name       = "${var.network_prefix}-net"
   subnets = [
@@ -141,7 +141,7 @@ module "vpc_network" {
 
 module "firewall_rules" {
   // Default rules for internal traffic + SSH access via IAP
-  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v32.0.1"
+  source     = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-vpc-firewall?ref=v36.0.1"
   project_id = module.google_cloud_project.project_id
   network    = module.vpc_network.name
   default_rules_config = {
@@ -169,7 +169,7 @@ module "firewall_rules" {
 // So we can get to Internet if necessary (from the Dataflow region)
 module "regional_nat" {
   count          = var.internet_access ? 1 : 0
-  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v32.0.1"
+  source         = "github.com/GoogleCloudPlatform/cloud-foundation-fabric//modules/net-cloudnat?ref=v36.0.1"
   project_id     = module.google_cloud_project.project_id
   region         = var.region
   name           = "${var.network_prefix}-nat"