Merge branch 'master' into master

.github/workflows/codeql.yml

@@ -60,7 +60,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+      uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -74,7 +74,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+      uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -87,6 +87,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+      uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
         with:
           sarif_file: results.sarif

CODEOWNERS

@@ -1,2 +1,4 @@
 # Main team administering overall repo
 *           @bharathkkb @g-awmalik @apeabody
+# ADC team reviewers
+/cli/ @q2w @GoogleCloudPlatform/blueprint-solutions

infra/terraform/dev-org/dev-project-cleanup/cleanup.tf

@@ -16,14 +16,14 @@
 
 module "app-engine" {
   source      = "terraform-google-modules/project-factory/google//modules/app_engine"
-  version     = "~> 14.0"
+  version     = "~> 17.0"
   location_id = local.app_location
   project_id  = module.project.project_id
 }
 
 module "projects_cleanup" {
   source  = "terraform-google-modules/scheduled-function/google//modules/project_cleanup"
-  version = "~> 4.0"
+  version = "~> 6.0"
 
   job_schedule             = "17 * * * *"
   max_project_age_in_hours = "24"

infra/terraform/dev-org/dev-project-cleanup/project.tf

@@ -21,7 +21,7 @@ resource "google_folder" "cft-dev-management" {
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.0"
+  version = "~> 17.0"
 
   name              = "cft-project-manager"
   random_project_id = true

infra/terraform/dev-org/dev-project-cleanup/versions.tf

@@ -23,11 +23,11 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.35, < 6"
+      version = ">= 3.35, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.35, < 6"
+      version = ">= 3.35, < 7"
     }
     null = {
       source  = "hashicorp/null"