From a9a750d33d56efe9de32813e2fcbe82c8c14c103 Mon Sep 17 00:00:00 2001 From: Austin Mitchell Date: Thu, 28 May 2026 10:18:53 -0700 Subject: [PATCH 01/10] fix(versions): rm last main pins; fix examples --- google_bigquery_syndicated_dataset/.terraform-docs.yml | 2 +- google_bigquery_syndicated_dataset/main.tf | 2 +- google_datastream/examples/postgres_to_bq.tf | 2 +- google_gar/examples/example.tf | 2 +- google_gke/examples/complex1.tf | 2 +- google_gke/examples/complex2.tf | 2 +- google_gke/examples/simple.tf | 2 +- google_gke_namespace_logging/examples/example1.tf | 2 +- google_memcache/examples/example1.tf | 2 +- google_permissions/examples/basic/main.tf | 4 ++-- google_permissions/workgroups.tf | 6 +++--- google_redis/examples/example1.tf | 2 +- .../examples/cloudfunction/main.tf | 2 +- mozilla_access_event_consumer/examples/gke/main.tf | 2 +- mozilla_workgroup/examples/example1.tf | 2 +- pagerduty_team/examples/example.tf | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/google_bigquery_syndicated_dataset/.terraform-docs.yml b/google_bigquery_syndicated_dataset/.terraform-docs.yml index dddc4f16..5119f3f6 100644 --- a/google_bigquery_syndicated_dataset/.terraform-docs.yml +++ b/google_bigquery_syndicated_dataset/.terraform-docs.yml @@ -5,7 +5,7 @@ content: |- ```hcl module "treeherder" { - source = "github.com/mozilla/terraform-modules//google_bigquery_syndicated_dataset?ref=main" + source = "github.com/mozilla/terraform-modules//google_bigquery_syndicated_dataset?ref=google_bigquery_syndicated_dataset-1.3.1" dataset_id = "for_treeherder_1" syndicated_dataset_id = "treeherder_db" diff --git a/google_bigquery_syndicated_dataset/main.tf b/google_bigquery_syndicated_dataset/main.tf index 4f565dad..7bff001b 100644 --- a/google_bigquery_syndicated_dataset/main.tf +++ b/google_bigquery_syndicated_dataset/main.tf @@ -98,7 +98,7 @@ data "terraform_remote_state" "org" { # Service accounts that perform syndication # Currently Jenkins with plans to move to Airflow, see https://mozilla-hub.atlassian.net/browse/SVCSE-3005 module "syndication_workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = var.syndication_workgroup_ids } diff --git a/google_datastream/examples/postgres_to_bq.tf b/google_datastream/examples/postgres_to_bq.tf index cc6b17fd..0820b1c8 100644 --- a/google_datastream/examples/postgres_to_bq.tf +++ b/google_datastream/examples/postgres_to_bq.tf @@ -1,5 +1,5 @@ module "datastream" { - source = "github.com/mozilla/terraform-modules//google_datastream?ref=main" + source = "github.com/mozilla/terraform-modules//google_datastream?ref=google_datastream-0.3.0" application = var.application environment = var.environment diff --git a/google_gar/examples/example.tf b/google_gar/examples/example.tf index 06dc642e..20318b13 100644 --- a/google_gar/examples/example.tf +++ b/google_gar/examples/example.tf @@ -1,5 +1,5 @@ module "gar" { - source = "github.com/mozilla/terraform-modules//google_gar?ref=main" + source = "github.com/mozilla/terraform-modules//google_gar?ref=google_gar-0.4.0" description = "Default repository for test project" application = "glonk" diff --git a/google_gke/examples/complex1.tf b/google_gke/examples/complex1.tf index 1bfd0915..a7603a12 100644 --- a/google_gke/examples/complex1.tf +++ b/google_gke/examples/complex1.tf @@ -8,7 +8,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" diff --git a/google_gke/examples/complex2.tf b/google_gke/examples/complex2.tf index 88fef44f..8e4a86b7 100644 --- a/google_gke/examples/complex2.tf +++ b/google_gke/examples/complex2.tf @@ -8,7 +8,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" diff --git a/google_gke/examples/simple.tf b/google_gke/examples/simple.tf index 05341da0..f3d20bcd 100644 --- a/google_gke/examples/simple.tf +++ b/google_gke/examples/simple.tf @@ -8,7 +8,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" diff --git a/google_gke_namespace_logging/examples/example1.tf b/google_gke_namespace_logging/examples/example1.tf index 684982f1..bf89d514 100644 --- a/google_gke_namespace_logging/examples/example1.tf +++ b/google_gke_namespace_logging/examples/example1.tf @@ -1,5 +1,5 @@ module "gke_logging" { - source = "github.com/mozilla/terraform-modules//google_gke_namespace_logging?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke_namespace_logging?ref=google_gke_namespace_logging-1.3.0" application = "glonk" realm = "dev" diff --git a/google_memcache/examples/example1.tf b/google_memcache/examples/example1.tf index 0fe4ed3b..9e8f7475 100644 --- a/google_memcache/examples/example1.tf +++ b/google_memcache/examples/example1.tf @@ -5,7 +5,7 @@ locals { } module "memcache" { - source = "github.com/mozilla/terraform-modules//google_memcache?ref=main" + source = "github.com/mozilla/terraform-modules//google_memcache?ref=google_memcache-0.3.0" application = local.name environment = "dev" diff --git a/google_permissions/examples/basic/main.tf b/google_permissions/examples/basic/main.tf index c8adc495..fff27515 100644 --- a/google_permissions/examples/basic/main.tf +++ b/google_permissions/examples/basic/main.tf @@ -1,5 +1,5 @@ module "permissions" { - source = "github.com/mozilla/terraform-modules//google_permissions?ref=main" + source = "github.com/mozilla/terraform-modules//google_permissions?ref=google_permissions-0.9.0" // it is assumed that you loaded and have available a local.project google_folder_id = local.project.folder.id google_prod_project_id = local.project["prod"].id @@ -7,4 +7,4 @@ module "permissions" { admin_ids = ["workgroup:my-project/workgroup_subgroup"] developer_ids = ["workgroup:my-project/developers"] viewer_ids = ["workgroup:my-project/viewers"] -} \ No newline at end of file +} diff --git a/google_permissions/workgroups.tf b/google_permissions/workgroups.tf index 20716f4b..87506592 100644 --- a/google_permissions/workgroups.tf +++ b/google_permissions/workgroups.tf @@ -1,14 +1,14 @@ module "admins_workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = var.admin_ids } module "developers_workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = var.developer_ids } module "viewers_workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = var.viewer_ids } diff --git a/google_redis/examples/example1.tf b/google_redis/examples/example1.tf index 19b4796e..fcb4cb7d 100644 --- a/google_redis/examples/example1.tf +++ b/google_redis/examples/example1.tf @@ -5,7 +5,7 @@ locals { } module "redis" { - source = "github.com/mozilla/terraform-modules//google_redis?ref=main" + source = "github.com/mozilla/terraform-modules//google_redis?ref=google_redis-0.4.0" application = local.name environment = "dev" diff --git a/mozilla_access_event_consumer/examples/cloudfunction/main.tf b/mozilla_access_event_consumer/examples/cloudfunction/main.tf index 365eb39b..2cb2d03a 100644 --- a/mozilla_access_event_consumer/examples/cloudfunction/main.tf +++ b/mozilla_access_event_consumer/examples/cloudfunction/main.tf @@ -9,7 +9,7 @@ locals { module "access_consumer" { # Use the latest version of this module from https://github.com/mozilla/terraform-modules/tags - source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=mozilla_access_event_consumer-1.3.0" project_id = local.project_id application = local.application diff --git a/mozilla_access_event_consumer/examples/gke/main.tf b/mozilla_access_event_consumer/examples/gke/main.tf index ec850e2f..114fe418 100644 --- a/mozilla_access_event_consumer/examples/gke/main.tf +++ b/mozilla_access_event_consumer/examples/gke/main.tf @@ -5,7 +5,7 @@ module "access_consumer" { # Use the latest version of this module from https://github.com/mozilla/terraform-modules/tags - source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=mozilla_access_event_consumer-1.3.0" project_id = local.project_id application = local.application diff --git a/mozilla_workgroup/examples/example1.tf b/mozilla_workgroup/examples/example1.tf index e97d0bba..8fcb5851 100644 --- a/mozilla_workgroup/examples/example1.tf +++ b/mozilla_workgroup/examples/example1.tf @@ -1,5 +1,5 @@ module "workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = ["workgroup:app/admins"] roles = {} diff --git a/pagerduty_team/examples/example.tf b/pagerduty_team/examples/example.tf index 32b07ea5..21756051 100644 --- a/pagerduty_team/examples/example.tf +++ b/pagerduty_team/examples/example.tf @@ -9,7 +9,7 @@ data "pagerduty_user" "team_users" { } module "pagerduty_team" { - source = "github.com/mozilla/terraform-modules//pagerduty_team?ref=main" + source = "github.com/mozilla/terraform-modules//pagerduty_team?ref=pagerduy_team-0.2.0" team_name = "foo" From ad7e8b30206d0fa520235a2516e2ac55adacfb7e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:21:44 +0000 Subject: [PATCH 02/10] chore(docs): google_bigquery_syndicated_dataset/README.md --- google_bigquery_syndicated_dataset/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google_bigquery_syndicated_dataset/README.md b/google_bigquery_syndicated_dataset/README.md index 755fc685..a198d1a8 100644 --- a/google_bigquery_syndicated_dataset/README.md +++ b/google_bigquery_syndicated_dataset/README.md @@ -30,7 +30,7 @@ detection automation will make these manual steps unnecessary. ```hcl module "treeherder" { - source = "github.com/mozilla/terraform-modules//google_bigquery_syndicated_dataset?ref=main" + source = "github.com/mozilla/terraform-modules//google_bigquery_syndicated_dataset?ref=google_bigquery_syndicated_dataset-1.3.1" dataset_id = "for_treeherder_1" syndicated_dataset_id = "treeherder_db" @@ -62,7 +62,7 @@ module "treeherder" { | Name | Source | Version | |------|--------|---------| -| [syndication\_workgroup](#module\_syndication\_workgroup) | github.com/mozilla/terraform-modules//mozilla_workgroup | main | +| [syndication\_workgroup](#module\_syndication\_workgroup) | github.com/mozilla/terraform-modules//mozilla_workgroup | mozilla_workgroup-1.3.0 | ## Resources From 7cda216b5584bcb744b2f6876f538ffa86e94245 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:22:31 +0000 Subject: [PATCH 03/10] chore(docs): google_gar/README.md --- google_gar/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_gar/README.md b/google_gar/README.md index b22c4c44..d99ce3a2 100644 --- a/google_gar/README.md +++ b/google_gar/README.md @@ -6,7 +6,7 @@ Creates a GAR repository and a service account to access it. ```hcl module "gar" { - source = "github.com/mozilla/terraform-modules//google_gar?ref=main" + source = "github.com/mozilla/terraform-modules//google_gar?ref=google_gar-0.4.0" description = "Default repository for test project" application = "glonk" From c8a7c165532eb1fbb161c66c123c2ec621d29ae4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:22:51 +0000 Subject: [PATCH 04/10] chore(docs): google_gke/README.md --- google_gke/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google_gke/README.md b/google_gke/README.md index 1eb2e75c..18f8680b 100644 --- a/google_gke/README.md +++ b/google_gke/README.md @@ -242,7 +242,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" @@ -284,7 +284,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" @@ -328,7 +328,7 @@ data "terraform_remote_state" "vpc" { } module "gke" { - source = "github.com/mozilla/terraform-modules//google_gke?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke?ref=google_gke-0.11.0" name = "my-cluster" project_id = "shared-clusters" From f65210511f43c1c68f49de31f1c64e14d9e12396 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:23:08 +0000 Subject: [PATCH 05/10] chore(docs): google_gke_namespace_logging/README.md --- google_gke_namespace_logging/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_gke_namespace_logging/README.md b/google_gke_namespace_logging/README.md index 3de8760b..e44e5c6b 100644 --- a/google_gke_namespace_logging/README.md +++ b/google_gke_namespace_logging/README.md @@ -7,7 +7,7 @@ The log routing configuration happens as part of the GKE tenant bootstrapping. ## Example ```hcl module "gke_logging" { - source = "github.com/mozilla/terraform-modules//google_gke_namespace_logging?ref=main" + source = "github.com/mozilla/terraform-modules//google_gke_namespace_logging?ref=google_gke_namespace_logging-1.3.0" application = "glonk" realm = "dev" From 890f4ab139b1e3438f45ada3fc8afd7ed98c9e49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:23:27 +0000 Subject: [PATCH 06/10] chore(docs): google_memcache/README.md --- google_memcache/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_memcache/README.md b/google_memcache/README.md index 4678b29a..5a6fde58 100644 --- a/google_memcache/README.md +++ b/google_memcache/README.md @@ -12,7 +12,7 @@ locals { } module "memcache" { - source = "github.com/mozilla/terraform-modules//google_memcache?ref=main" + source = "github.com/mozilla/terraform-modules//google_memcache?ref=google_memcache-0.3.0" application = local.name environment = "dev" From a027619ae4c3b5562466f2d55332765836b2e898 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:23:47 +0000 Subject: [PATCH 07/10] chore(docs): google_permissions/README.md --- google_permissions/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_permissions/README.md b/google_permissions/README.md index 8aa3b614..bc6745c2 100644 --- a/google_permissions/README.md +++ b/google_permissions/README.md @@ -9,7 +9,7 @@ For information on how to add new roles to the modules, please see [this documen ```hcl module "permissions" { - source = "github.com/mozilla/terraform-modules//google_permissions?ref=main" + source = "github.com/mozilla/terraform-modules//google_permissions?ref=google_permissions-0.9.0" // it is assumed that you loaded and have available a local.project google_folder_id = local.project.folder.id google_prod_project_id = local.project["prod"].id From e6008993d307cf30b7d58448df8ced812791b320 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:24:07 +0000 Subject: [PATCH 08/10] chore(docs): google_redis/README.md --- google_redis/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google_redis/README.md b/google_redis/README.md index 3ee7fec7..e040f9a3 100644 --- a/google_redis/README.md +++ b/google_redis/README.md @@ -12,7 +12,7 @@ locals { } module "redis" { - source = "github.com/mozilla/terraform-modules//google_redis?ref=main" + source = "github.com/mozilla/terraform-modules//google_redis?ref=google_redis-0.4.0" application = local.name environment = "dev" From 644b0db21a2f5a0c9de90146d31e2937acd5e3f1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:24:22 +0000 Subject: [PATCH 09/10] chore(docs): mozilla_access_event_consumer/README.md --- mozilla_access_event_consumer/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla_access_event_consumer/README.md b/mozilla_access_event_consumer/README.md index 7ee83aa9..ddc9cc2a 100644 --- a/mozilla_access_event_consumer/README.md +++ b/mozilla_access_event_consumer/README.md @@ -82,7 +82,7 @@ locals { module "access_consumer" { # Use the latest version of this module from https://github.com/mozilla/terraform-modules/tags - source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=mozilla_access_event_consumer-1.3.0" project_id = local.project_id application = local.application @@ -163,7 +163,7 @@ Create a Pub/Sub subscription for pull-based processing from GKE: module "access_consumer" { # Use the latest version of this module from https://github.com/mozilla/terraform-modules/tags - source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_access_event_consumer?ref=mozilla_access_event_consumer-1.3.0" project_id = local.project_id application = local.application From b40510d647fbaa85a51dc0bd49f53b02d4499830 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 May 2026 17:24:38 +0000 Subject: [PATCH 10/10] chore(docs): mozilla_workgroup/README.md --- mozilla_workgroup/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla_workgroup/README.md b/mozilla_workgroup/README.md index 51f98d22..a38d9be8 100644 --- a/mozilla_workgroup/README.md +++ b/mozilla_workgroup/README.md @@ -23,7 +23,7 @@ This module is cloned from https://github.com/mozilla-services/cloudops-infra-te ## Example ```hcl module "workgroup" { - source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=main" + source = "github.com/mozilla/terraform-modules//mozilla_workgroup?ref=mozilla_workgroup-1.3.0" ids = ["workgroup:app/admins"] roles = {}