Merge branch 'main' into UpdateYamlTag

GoogleCloudPlatform · Jan 7, 2025 · d55442a · d55442a
2 parents 09c782d + eb30274
commit d55442a
Show file tree

Hide file tree

Showing 53 changed files with 339 additions and 329 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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=""
@@ -106,7 +106,7 @@ jobs:
           git diff-index --quiet HEAD || git commit -m "chore: Update Tools to ${{env.NEW_IMG_VERSION}}"
       - name: Create Pull Request
         if: env.BUMP_IMG == 'true'
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
           token: ${{ secrets.CFT_ROBOT_PAT }}
           commit-message: Update tools to ${{env.NEW_IMG_VERSION}}
@@ -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/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,11 +7,11 @@ exclude: |
   )$
 repos:
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 38.21.2
+    rev: 39.83.1
     hooks:
       - id: renovate-config-validator
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
-  "infra/blueprint-test": "0.17.3",
-  "infra/module-swapper": "0.4.10",
-  "tflint-ruleset-blueprint": "0.2.6"
+  "infra/blueprint-test": "0.17.4",
+  "infra/module-swapper": "0.4.12",
+  "tflint-ruleset-blueprint": "0.2.7"
 }
diff --git a/cli/Makefile b/cli/Makefile
@@ -15,7 +15,7 @@ PROTOC_DIR=./bpmetadata
 DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
-GOLANGCI_VERSION := 1.62.2
+GOLANGCI_VERSION := 1.63.3
 
 # Setup the -ldflags option for go build here, interpolate the variable values
 LDFLAGS=-ldflags "-X $(GITHUB_REPO)/cli/cmd.Version=$(VERSION)"

diff --git 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/cli/go.mod b/cli/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/briandowns/spinner v1.23.1
 	github.com/fatih/color v1.18.0
 	github.com/gammazero/workerpool v1.1.3
-	github.com/go-git/go-git/v5 v5.12.0
+	github.com/go-git/go-git/v5 v5.13.0
 	github.com/gomarkdown/markdown v0.0.0-20241205020045-f7e15b2f3e62
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-github/v68 v68.0.0
@@ -64,7 +64,7 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
-	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/agnivade/levenshtein v1.2.0 // indirect
 	github.com/alexflint/go-filemutex v1.3.0 // indirect
@@ -82,7 +82,7 @@ require (
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
@@ -94,7 +94,7 @@ require (
 	github.com/gammazero/deque v0.2.0 // indirect
 	github.com/go-errors/errors v1.5.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -168,7 +168,7 @@ require (
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect