Merge branch 'main' into dependabot/go_modules/test/integration/golan…

…g.org/x/crypto-0.17.0

.github/workflows/lint.yaml

@@ -18,6 +18,7 @@
 name: 'lint'
 
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - main
@@ -43,4 +44,5 @@ jobs:
             REGISTRY=$(grep "REGISTRY_URL := " $MAKEFILE | cut -d\  -f3)
             echo dev-tools=${REGISTRY}/${IMAGE}:${VERSION} >> "$GITHUB_OUTPUT"
           fi
+      - run: docker run --rm -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper
       - run: docker run --rm -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Google LLC
+# Copyright 2022-2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,9 +25,10 @@ jobs:
     if: github.repository_owner == 'GoogleCloudPlatform' || github.repository_owner == 'terraform-google-modules'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v9
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
         stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days'
-        exempt-issue-labels: triaged,dependencies
+        exempt-issue-labels: 'triaged'
+        exempt-pr-labels: 'dependencies,autorelease: pending'

CODEOWNERS

@@ -2,3 +2,11 @@
 # https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
 
 * @GoogleCloudPlatform/blueprint-solutions
+
+# NOTE: GitHub CODEOWNERS locations:
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-and-branch-protection
+
+CODEOWNERS @GoogleCloudPlatform/blueprint-solutions
+.github/CODEOWNERS @GoogleCloudPlatform/blueprint-solutions
+docs/CODEOWNERS @GoogleCloudPlatform/blueprint-solutions
+

build/int.cloudbuild.yaml

@@ -14,6 +14,9 @@
 
 timeout: 3600s
 steps:
+- id: swap-module-refs
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['module-swapper']
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']

examples/oidc-simple/main.tf

@@ -91,8 +91,10 @@ resource "tfe_variable" "tfc_gcp_service_account_email" {
 
 # Use the OIDC module to provision the Workload identitly pool
 module "oidc" {
+  source      = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-oidc"
+  version     = "~> 0.1"
+
   project_id  = var.project_id
-  source      = "../../modules/tfc-oidc"
   pool_id     = "pool-${random_string.suffix.result}"
   provider_id = "terraform-provider-${random_string.suffix.result}"
   sa_mapping = {

examples/tfc-agent-gke-custom/main.tf

@@ -85,7 +85,9 @@ resource "google_service_account" "tfc_agent_service_account" {
 
 # Create the infrastructure for the agent to run
 module "tfc_agent_gke" {
-  source                 = "../../modules/tfc-agent-gke"
+  source  = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-agent-gke"
+  version = "~> 0.1"
+
   create_network         = true
   network_name           = local.network_name
   subnet_name            = local.network_name

examples/tfc-agent-gke-simple/main.tf

@@ -71,7 +71,9 @@ resource "google_service_account" "tfc_agent_service_account" {
 
 # Create the infrastructure for the agent to run
 module "tfc_agent_gke" {
-  source                 = "../../modules/tfc-agent-gke"
+  source  = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-agent-gke"
+  version = "~> 0.1"
+
   create_network         = true
   network_name           = local.network_name
   subnet_name            = local.network_name

examples/tfc-agent-mig-container-vm-simple/main.tf

@@ -59,7 +59,9 @@ resource "tfe_agent_token" "tfc_agent_token" {
 }
 
 module "tfc_agent_mig" {
-  source          = "../../modules/tfc-agent-mig-container-vm"
+  source  = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-agent-mig-container-vm"
+  version = "~> 0.1"
+
   create_network  = true
   network_name    = local.network_name
   subnet_name     = local.network_name

examples/tfc-agent-mig-vm-packer/main.tf

@@ -67,7 +67,9 @@ resource "google_service_account" "tfc_agent_service_account" {
 
 # Create the infrastructure for the agent to run
 module "tfc_agent_mig" {
-  source                 = "../../modules/tfc-agent-mig-vm"
+  source  = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-agent-mig-vm"
+  version = "~> 0.1"
+
   create_network         = true
   network_name           = local.network_name
   subnet_name            = local.network_name

examples/tfc-agent-mig-vm-simple/main.tf

@@ -68,7 +68,9 @@ resource "google_service_account" "tfc_agent_service_account" {
 
 # Create the infrastructure for the agent to run
 module "tfc_agent_mig" {
-  source                 = "../../modules/tfc-agent-mig-vm"
+  source  = "GoogleCloudPlatform/tf-cloud-agents/google//modules/tfc-agent-mig-vm"
+  version = "~> 0.1"
+
   project_id             = var.project_id
   create_network         = true
   network_name           = local.network_name