Merge branch 'master' into apeabody-patch-11

GoogleCloudPlatform · Jul 18, 2024 · fa41611 · fa41611
2 parents 628d5a3 + ab386e9
commit fa41611
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -32,13 +32,13 @@
     },
     {
       "matchDepTypes": ["require"],
-      "postUpdateOptions": ["gomodTidy"],
+      "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"],
       "groupName": "GO modules"
     },
     {
       "matchPackageNames": ["go"],
       "allowedVersions": "1.22",
-      "postUpdateOptions": ["gomodTidy"]
+      "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"]
     }
   ],
   "regexManagers": [

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -823,12 +823,11 @@ locals {
       topics      = local.common_topics.da
     },
     {
-      name            = "terraform-google-enterprise-application"
-      org             = "GoogleCloudPlatform"
-      description     = "Deploy an enterprise developer platform on Google Cloud"
-      owners          = ["gtsorbo", "erictune", "yliaog", "sleighton2022", "apeabody"]
-      topics          = join(",", [local.common_topics.e2e, local.common_topics.ops])
-      enable_periodic = true
+      name        = "terraform-google-enterprise-application"
+      org         = "GoogleCloudPlatform"
+      description = "Deploy an enterprise developer platform on Google Cloud"
+      owners      = ["gtsorbo", "erictune", "yliaog", "sleighton2022", "apeabody"]
+      topics      = join(",", [local.common_topics.e2e, local.common_topics.ops])
     },
     {
       name            = "terraform-genai-rag"