Merge branch 'master' into apeabody-patch-2

GoogleCloudPlatform · Sep 11, 2023 · 7f1bfb5 · 7f1bfb5
2 parents 610ad29 + 97bebee
commit 7f1bfb5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/infra/terraform/modules/workflow_files/lint.yaml.tftpl b/infra/terraform/modules/workflow_files/lint.yaml.tftpl
@@ -31,7 +31,7 @@ jobs:
     name: 'lint'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: 'actions/checkout@v4'
       - id: variables
         run: |
           MAKEFILE=$(find . -name Makefile -print -quit)

diff --git a/infra/terraform/test-org/ci-triggers/locals.tf b/infra/terraform/test-org/ci-triggers/locals.tf
@@ -43,6 +43,8 @@ locals {
     "genai-doc-summarization"     = "terraform-genai-doc-summarization"
     "secured-notebook"            = "notebooks-blueprint-security"
     "sdw-onprem-ingest"           = "terraform-google-secured-data-warehouse-onprem-ingest"
+    "pubsub-golang-app"           = "terraform-pubsub-integration-golang"
+    "pubsub-java-app"             = "terraform-pubsub-integration-java"
   }
   # example foundation has custom test modes
   example_foundation                = { "terraform-example-foundation" = data.terraform_remote_state.org.outputs.ci_repos_folders["example-foundation"] }

diff --git a/infra/terraform/test-org/github/resources/renovate.json b/infra/terraform/test-org/github/resources/renovate.json
@@ -7,7 +7,7 @@
     ":rebaseStalePrs"
   ],
   "minimumReleaseAge": "7 days",
-  "ignorePaths": [],
+  "ignorePaths": [".github/workflows/lint.yaml", ".github/workflows/stale.yml"],
   "labels": ["dependencies"],
   "vulnerabilityAlerts": {
     "labels": ["type:security"],
@@ -17,11 +17,11 @@
   "packageRules": [
     {
       "matchFileNames": ["examples/**", "test/**", ".github/**"],
-      "extends": [":semanticCommitTypeAll(chore)"]
+      "commitMessagePrefix": "chore(deps):"
     },
     {
       "matchFileNames": ["*", "modules/**"],
-      "extends": [":semanticCommitTypeAll(fix)"]
+      "commitMessagePrefix": "fix(deps):"
     },
     {
       "matchFileNames": ["*", "modules/**"],
@@ -41,7 +41,7 @@
       "postUpdateOptions": ["gomodTidy"]
     },
     {
-      "matchPackageNames": ["google", "google-beta"],
+      "matchDepNames": ["google", "google-beta"],
       "groupName": "Terraform Google Provider"
     }
   ],

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -752,5 +752,21 @@ locals {
       owners      = ["anaik91", "imrannayer"]
       topics      = local.common_topics.db
     },
+    {
+      name            = "terraform-pubsub-integration-golang"
+      org             = "GoogleCloudPlatform"
+      short_name      = "pubsub-golang-app"
+      owners          = ["shabirmean", "Mukamik"]
+      groups          = ["dee-platform-ops", local.jss_common_group]
+      enable_periodic = true
+    },
+    {
+      name            = "terraform-pubsub-integration-java"
+      org             = "GoogleCloudPlatform"
+      short_name      = "pubsub-java-app"
+      owners          = ["shabirmean", "Mukamik"]
+      groups          = ["dee-platform-ops", local.jss_common_group]
+      enable_periodic = true
+    },
   ]
 }