diff --git a/.github/workflows/build-push-cft-devtools.yml b/.github/workflows/build-push-cft-devtools.yml index e14fffa679e..d29b7460ded 100644 --- a/.github/workflows/build-push-cft-devtools.yml +++ b/.github/workflows/build-push-cft-devtools.yml @@ -2,7 +2,7 @@ name: Build and push new dev tools image on: push: branches: - - "master" + - "main" paths: - "infra/build/**" - ".github/workflows/build-push-cft-devtools.yml" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c73e0bdf592..2a466a65264 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: - branches: [ "master" ] + branches: [ "main" ] paths: - '**/*.go' - '**/*.js' diff --git a/.github/workflows/go-fbf-test.yml b/.github/workflows/go-fbf-test.yml index 78dd80da666..743bbad7058 100644 --- a/.github/workflows/go-fbf-test.yml +++ b/.github/workflows/go-fbf-test.yml @@ -3,7 +3,7 @@ name: Flaky Build Finder Tests on: pull_request: branches: - - 'master' + - 'main' paths: - 'infra/utils/fbf/**' - '.github/workflows/go-fbf-test.yml' diff --git a/.github/workflows/go-lint.yaml b/.github/workflows/go-lint.yaml index 194cca3bf06..866653eb6ad 100644 --- a/.github/workflows/go-lint.yaml +++ b/.github/workflows/go-lint.yaml @@ -2,7 +2,7 @@ name: lint on: pull_request: branches: - - master + - main paths: - ".github/workflows/go-lint.yaml" - "cli/**" diff --git a/.github/workflows/go-module-swapper.yml b/.github/workflows/go-module-swapper.yml index ab635c56ba2..ec173b3ca51 100644 --- a/.github/workflows/go-module-swapper.yml +++ b/.github/workflows/go-module-swapper.yml @@ -3,7 +3,7 @@ name: Module Swapper Tests on: pull_request: branches: - - 'master' + - 'main' paths: - 'infra/module-swapper/**' - '.github/workflows/go-module-swapper.yml' diff --git a/.github/workflows/go-tflint-plugin.yml b/.github/workflows/go-tflint-plugin.yml index ec27edbcd75..a837cdaf7bf 100644 --- a/.github/workflows/go-tflint-plugin.yml +++ b/.github/workflows/go-tflint-plugin.yml @@ -3,13 +3,13 @@ name: TFLint blueprint ruleset on: push: branches: - - 'master' + - 'main' paths: - 'tflint-ruleset-blueprint/**' - '.github/workflows/go-tflint-plugin.yml' pull_request: branches: - - 'master' + - 'main' paths: - 'tflint-ruleset-blueprint/**' - '.github/workflows/go-tflint-plugin.yml' diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4276f0b0d7f..321b910e3fb 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ name: 'lint' on: pull_request: branches: - - 'master' + - 'main' paths: - "infra/terraform/**" - ".github/workflows/lint.yaml" diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index e044bd20af0..b5deb704d47 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -2,7 +2,7 @@ name: Release new CLI versions on: push: branches: - - "master" + - "main" paths: - "cli/Makefile" - ".github/workflows/release-cli.yml" diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index f38f82e9262..b122b2e8a62 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -12,7 +12,7 @@ on: schedule: - cron: '18 1 * * 1' push: - branches: [ "master" ] + branches: [ "main" ] # Declare default permissions as read only. permissions: read-all diff --git a/.github/workflows/test-cft-devtools.yml b/.github/workflows/test-cft-devtools.yml index 33f676ba9b4..737786cbd5a 100644 --- a/.github/workflows/test-cft-devtools.yml +++ b/.github/workflows/test-cft-devtools.yml @@ -2,7 +2,7 @@ name: Test devtools image build on: pull_request: branches: - - "master" + - "main" paths: - "infra/build/**" - ".github/workflows/test-cft-devtools.yml" diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml index 88723d2ba5f..03b8318b9da 100644 --- a/.github/workflows/test-cli.yml +++ b/.github/workflows/test-cli.yml @@ -3,13 +3,13 @@ name: CFT CLI Tests on: push: branches: - - 'master' + - 'main' paths: - 'cli/**' - '.github/workflows/test-cli.yml' pull_request: branches: - - 'master' + - 'main' paths: - 'cli/**' - '.github/workflows/test-cli.yml' diff --git a/.github/workflows/update-tooling.yml b/.github/workflows/update-tooling.yml index f4f7f303b85..e9165b4f60a 100644 --- a/.github/workflows/update-tooling.yml +++ b/.github/workflows/update-tooling.yml @@ -7,7 +7,7 @@ on: types: [released] push: branches: - - "master" + - "main" env: TERRAFORM_URL: "https://api.github.com/repos/hashicorp/terraform/releases/latest" @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - ref: master + ref: main - name: Update Tools run: | PR_UPDATE_BODY="" @@ -118,4 +118,4 @@ jobs: labels: automated pr reviewers: bharathkkb, apeabody branch: create-pull-request/patch-tools-version - base: master + base: main diff --git a/cli/bpbuild/build.go b/cli/bpbuild/build.go index 1e6b7ae22d5..318acecc806 100644 --- a/cli/bpbuild/build.go +++ b/cli/bpbuild/build.go @@ -17,7 +17,7 @@ const ( // getCBBuildsWithFilter returns a list of cloudbuild builds in projectID with a given filter. // Additional client side filters can be specified via cFilters. -// TODO(bharathkkb): move https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/tree/master/infra/utils/fbf into CLI +// TODO(bharathkkb): move https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/tree/main/infra/utils/fbf into CLI func getCBBuildsWithFilter(projectID string, filter string, cFilters []clientBuildFilter) ([]*cloudbuild.Build, error) { ctx := context.Background() cloudbuildService, err := cloudbuild.NewService(ctx) diff --git a/infra/README.md b/infra/README.md index e018e64eab4..56229beb1ab 100644 --- a/infra/README.md +++ b/infra/README.md @@ -192,7 +192,7 @@ From the UI, download the [Fly CLI](https://concourse-ci.org/fly.html). [cicd-folder]: https://console.cloud.google.com/iam-admin/iam?organizationId=826592752744&orgonly=true&project=&folder=853002531658 [phoogle-org]: https://console.cloud.google.com/iam-admin/iam?organizationId=826592752744&orgonly=true&project= -[billing-user]: https://github.com/terraform-google-modules/terraform-google-project-factory/blob/master/docs/TROUBLESHOOTING.md#missing-rolesbillinguser-role +[billing-user]: https://github.com/terraform-google-modules/terraform-google-project-factory/blob/main/docs/TROUBLESHOOTING.md#missing-rolesbillinguser-role #### Managing Concourse diff --git a/infra/blueprint-test/README.md b/infra/blueprint-test/README.md index b58ea77573c..bc80bd344ab 100644 --- a/infra/blueprint-test/README.md +++ b/infra/blueprint-test/README.md @@ -192,7 +192,7 @@ func TestMySqlPublicModule(t *testing.T) { The next step in the process is to write the logic for assertions. -1. In most cases, you will be asserting against values retrieved from the GCP environment. This can be done by using the [gcloud](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/blueprint-test/pkg/gcloud/gcloud.go) helper in our test framework, which executes gcloud commands and stores their JSON outputs as. The gcloud helper can be initialized as follows: +1. In most cases, you will be asserting against values retrieved from the GCP environment. This can be done by using the [gcloud](https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/blueprint-test/pkg/gcloud/gcloud.go) helper in our test framework, which executes gcloud commands and stores their JSON outputs as. The gcloud helper can be initialized as follows: ```go // The tft struct can be used to pull output variables of the TF module being invoked by this test diff --git a/infra/build/developer-tools/Dockerfile b/infra/build/developer-tools/Dockerfile index 911bf861015..944ee2cf1f3 100644 --- a/infra/build/developer-tools/Dockerfile +++ b/infra/build/developer-tools/Dockerfile @@ -100,7 +100,7 @@ RUN /build/install_shellcheck.sh && \ /build/install_tinkey.sh ${TINKEY_VERSION} # Optimized to independently cache layers for commonly updated tools: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/.github/workflows/update-tooling.yml +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/.github/workflows/update-tooling.yml ARG TERRAFORM_VERSION RUN /build/install_terraform.sh ${TERRAFORM_VERSION} diff --git a/infra/build/developer-tools/build/scripts/task_helper_functions.sh b/infra/build/developer-tools/build/scripts/task_helper_functions.sh index f4f40dc8745..2c250a3b804 100755 --- a/infra/build/developer-tools/build/scripts/task_helper_functions.sh +++ b/infra/build/developer-tools/build/scripts/task_helper_functions.sh @@ -278,7 +278,7 @@ function replace_doc_generator { if [ -n "${old_script_path}" ]; then rm -rf "${old_script_path}" cd "$(dirname "${old_script_path}")" || exit - wget https://raw.githubusercontent.com/terraform-google-modules/terraform-google-project-factory/master/helpers/terraform_{docs,validate} &>/dev/null + wget https://raw.githubusercontent.com/terraform-google-modules/terraform-google-project-factory/main/helpers/terraform_{docs,validate} &>/dev/null rc=$? if [ $rc -ne 0 ]; then echo "Error: Doc Generator scripts have not been downloaded properly, please check/re-download them manually." @@ -454,7 +454,7 @@ function generate_modules() { # requires a secret with PAT called gh-pat-token and cloud build SA with roles/secretmanager.secretAccessor function post_lint_status_pr_comment() { export GITHUB_PAT_TOKEN=$(gcloud secrets versions access latest --secret="gh-pat-token") - final_message=$(/usr/local/bin/test_lint.sh --markdown --contrib-guide=../blob/master/CONTRIBUTING.md) + final_message=$(/usr/local/bin/test_lint.sh --markdown --contrib-guide=../blob/main/CONTRIBUTING.md) if [ -z "$final_message" ]; then final_message="Thanks for the PR! 🚀
✅ Lint checks have passed." fi diff --git a/infra/terraform/modules/codeowners_file/main.tf b/infra/terraform/modules/codeowners_file/main.tf index 10666aac24d..52b6432f197 100644 --- a/infra/terraform/modules/codeowners_file/main.tf +++ b/infra/terraform/modules/codeowners_file/main.tf @@ -19,7 +19,7 @@ locals { commit_email = "cloud-foundation-bot@google.com" owners = { for value in var.repos_map : value.name => "${join(" ", formatlist("@%s", sort(setunion(lookup(value, "admins", []), lookup(value, "maintainers", [])))))} " if length(setunion(lookup(value, "admins", []), lookup(value, "maintainers", []))) > 0 } groups = { for value in var.repos_map : value.name => "${join(" ", formatlist("@${value.org}/%s", value.groups))} " if length(value.groups) > 0 } - header = "# NOTE: This file is automatically generated from values at:\n# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf\n" + header = "# NOTE: This file is automatically generated from values at:\n# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf\n" footer_prefix = "# NOTE: GitHub CODEOWNERS locations:\n# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-and-branch-protection\n" footer_code = "CODEOWNERS @${var.org}/${var.owner}\n.github/CODEOWNERS @${var.org}/${var.owner}\ndocs/CODEOWNERS @${var.org}/${var.owner}\n" footer = "\n${local.footer_prefix}\n${local.footer_code}\n" diff --git a/infra/terraform/modules/workflow_files/lint.yaml.tftpl b/infra/terraform/modules/workflow_files/lint.yaml.tftpl index 7f2fefb8935..be0872a0dd5 100644 --- a/infra/terraform/modules/workflow_files/lint.yaml.tftpl +++ b/infra/terraform/modules/workflow_files/lint.yaml.tftpl @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2023-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from values at: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf name: 'lint' diff --git a/infra/terraform/modules/workflow_files/periodic-reporter.yaml b/infra/terraform/modules/workflow_files/periodic-reporter.yaml index 82ec8355c7d..cbe82a552d1 100644 --- a/infra/terraform/modules/workflow_files/periodic-reporter.yaml +++ b/infra/terraform/modules/workflow_files/periodic-reporter.yaml @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Google LLC +# Copyright 2023-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/modules/workflow_files/periodic-reporter.yaml +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/modules/workflow_files/periodic-reporter.yaml name: 'reporter' diff --git a/infra/terraform/test-org/ci-project/cleaner.tf b/infra/terraform/test-org/ci-project/cleaner.tf index 9998e19cc55..eb87b83272a 100644 --- a/infra/terraform/test-org/ci-project/cleaner.tf +++ b/infra/terraform/test-org/ci-project/cleaner.tf @@ -64,7 +64,7 @@ resource "google_cloud_scheduler_job" "job" { http_target { http_method = "POST" uri = "https://cloudbuild.googleapis.com/v1/projects/${local.project_id}/triggers/${google_cloudbuild_trigger.org_iam_cleaner_trigger.trigger_id}:run" - body = base64encode("{\"branchName\": \"master\"}") + body = base64encode("{\"branchName\": \"main\"}") oauth_token { service_account_email = google_service_account.service_account.email } diff --git a/infra/terraform/test-org/ci-project/foundation.tf b/infra/terraform/test-org/ci-project/foundation.tf index 5eac2df6cb3..6902540f595 100644 --- a/infra/terraform/test-org/ci-project/foundation.tf +++ b/infra/terraform/test-org/ci-project/foundation.tf @@ -43,7 +43,7 @@ resource "google_cloud_scheduler_job" "reconcile_job" { http_target { http_method = "POST" uri = "https://cloudbuild.googleapis.com/v1/projects/${local.project_id}/triggers/${google_cloudbuild_trigger.foundation_reconciler.trigger_id}:run" - body = base64encode("{\"branchName\": \"master\"}") + body = base64encode("{\"branchName\": \"main\"}") oauth_token { service_account_email = google_service_account.service_account.email } diff --git a/infra/terraform/test-org/ci-project/image_purger.tf b/infra/terraform/test-org/ci-project/image_purger.tf index c39e9149833..95e23c37a40 100644 --- a/infra/terraform/test-org/ci-project/image_purger.tf +++ b/infra/terraform/test-org/ci-project/image_purger.tf @@ -38,7 +38,7 @@ resource "google_cloud_scheduler_job" "image_purge_job" { http_target { http_method = "POST" uri = "https://cloudbuild.googleapis.com/v1/projects/${local.project_id}/triggers/${google_cloudbuild_trigger.image_purge_trigger.trigger_id}:run" - body = base64encode("{\"branchName\": \"master\"}") + body = base64encode("{\"branchName\": \"main\"}") oauth_token { service_account_email = google_service_account.service_account.email } diff --git a/infra/terraform/test-org/ci-triggers/triggers.tf b/infra/terraform/test-org/ci-triggers/triggers.tf index 4f84191b53c..b88fd8b3347 100644 --- a/infra/terraform/test-org/ci-triggers/triggers.tf +++ b/infra/terraform/test-org/ci-triggers/triggers.tf @@ -90,7 +90,7 @@ resource "google_cloudbuild_trigger" "tf_validator_main_integration_tests" { tf13 = "0.13.7" } name = "tf-validator-main-integration-tests-${each.key}" - description = "Main/release branch integration tests for terraform-validator with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch integration tests for terraform-validator with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -118,7 +118,7 @@ resource "google_cloudbuild_trigger" "tf_validator_pull_integration_tests" { tf13 = "0.13.7" } name = "tf-validator-pull-integration-tests-${each.key}" - description = "Pull request integration tests for terraform-validator with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request integration tests for terraform-validator with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -143,7 +143,7 @@ resource "google_cloudbuild_trigger" "tf_validator_pull_integration_tests" { resource "google_cloudbuild_trigger" "tf_validator_pull_unit_tests" { name = "tf-validator-pull-unit-tests" - description = "Pull request unit tests for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request unit tests for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -167,7 +167,7 @@ resource "google_cloudbuild_trigger" "tf_validator_pull_unit_tests" { resource "google_cloudbuild_trigger" "tf_validator_main_unit_tests" { name = "tf-validator-main-unit-tests" - description = "Main/release branch unit tests for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch unit tests for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -190,7 +190,7 @@ resource "google_cloudbuild_trigger" "tf_validator_main_unit_tests" { resource "google_cloudbuild_trigger" "tf_validator_pull_license_check" { name = "tf-validator-pull-license-check" - description = "Pull request license check for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request license check for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -208,7 +208,7 @@ resource "google_cloudbuild_trigger" "tf_validator_pull_license_check" { resource "google_cloudbuild_trigger" "tf_validator_main_license_check" { name = "tf-validator-main-license-check" - description = "Main/release branch license check for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch license check for terraform-validator. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -229,7 +229,7 @@ resource "google_cloudbuild_trigger" "tgc_main_integration_tests" { tf13 = "0.13.7" } name = "tgc-main-integration-tests-${each.key}" - description = "Main/release branch integration tests for terraform-google-conversion with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch integration tests for terraform-google-conversion with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -257,7 +257,7 @@ resource "google_cloudbuild_trigger" "tgc_pull_integration_tests" { tf13 = "0.13.7" } name = "tgc-pull-integration-tests-${each.key}" - description = "Pull request integration tests for terraform-google-conversion with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request integration tests for terraform-google-conversion with terraform ${each.value}. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -282,7 +282,7 @@ resource "google_cloudbuild_trigger" "tgc_pull_integration_tests" { resource "google_cloudbuild_trigger" "tgc_pull_unit_tests" { name = "tgc-pull-unit-tests" - description = "Pull request unit tests for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request unit tests for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -306,7 +306,7 @@ resource "google_cloudbuild_trigger" "tgc_pull_unit_tests" { resource "google_cloudbuild_trigger" "tgc_main_unit_tests" { name = "tgc-main-unit-tests" - description = "Main/release branch unit tests for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch unit tests for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -329,7 +329,7 @@ resource "google_cloudbuild_trigger" "tgc_main_unit_tests" { resource "google_cloudbuild_trigger" "tgc_pull_license_check" { name = "tgc-pull-license-check" - description = "Pull request license check for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Pull request license check for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id @@ -347,7 +347,7 @@ resource "google_cloudbuild_trigger" "tgc_pull_license_check" { resource "google_cloudbuild_trigger" "tgc_main_license_check" { name = "tgc-main-license-check" - description = "Main/release branch license check for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/tf-validator/project.tf" + description = "Main/release branch license check for terraform-google-conversion. Managed by Terraform https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/tf-validator/project.tf" provider = google-beta project = local.project_id diff --git a/infra/terraform/test-org/github/resources/conventional-commit-lint.yaml b/infra/terraform/test-org/github/resources/conventional-commit-lint.yaml index ee8e163717f..b1d8d8b80e1 100644 --- a/infra/terraform/test-org/github/resources/conventional-commit-lint.yaml +++ b/infra/terraform/test-org/github/resources/conventional-commit-lint.yaml @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Google LLC +# Copyright 2022-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github enabled: true always_check_pr_title: true diff --git a/infra/terraform/test-org/github/resources/stale.yml b/infra/terraform/test-org/github/resources/stale.yml index 34a5677cdec..d04506e4e5c 100644 --- a/infra/terraform/test-org/github/resources/stale.yml +++ b/infra/terraform/test-org/github/resources/stale.yml @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Google LLC +# Copyright 2022-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github name: "Close stale issues" on: diff --git a/infra/terraform/test-org/github/resources/trusted-contribution.yml b/infra/terraform/test-org/github/resources/trusted-contribution.yml index a3b4ff268ba..ae57820fdb1 100644 --- a/infra/terraform/test-org/github/resources/trusted-contribution.yml +++ b/infra/terraform/test-org/github/resources/trusted-contribution.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2023-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github annotations: - type: comment