From 14f202bcf65e99946653200895bd6b3b1ab889bb Mon Sep 17 00:00:00 2001 From: ArchitectBot <61872893+architectbot@users.noreply.github.com> Date: Fri, 20 Sep 2024 14:51:49 +0200 Subject: [PATCH] Align files (#1300) * Align files * Update .nancy-ignore --------- Co-authored-by: github-actions Co-authored-by: Marian Steinbach --- .github/workflows/pre_commit_go.yaml | 5 +++-- .github/workflows/zz_generated.create_release.yaml | 8 ++++---- .github/workflows/zz_generated.create_release_pr.yaml | 10 +++++----- .github/workflows/zz_generated.run_ossf_scorecard.yaml | 8 ++++---- .nancy-ignore | 10 +++++----- Makefile.gen.go.mk | 8 ++++---- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pre_commit_go.yaml b/.github/workflows/pre_commit_go.yaml index 243b05176..dac3afdf1 100644 --- a/.github/workflows/pre_commit_go.yaml +++ b/.github/workflows/pre_commit_go.yaml @@ -13,13 +13,14 @@ jobs: - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: - go-version: "1.22" + go-version: "1.23" - name: Install goimports run: | go install golang.org/x/tools/cmd/goimports@latest - name: Install golangci-lint env: - GOLANGCI_LINT_VERSION: "v1.59.0" + GOGC: "20" + GOLANGCI_LINT_VERSION: "v1.60.3" run: | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \ sudo sh -s -- -b $GOPATH/bin ${GOLANGCI_LINT_VERSION} diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index b945e95ac..a1a270fd9 100644 --- a/.github/workflows/zz_generated.create_release.yaml +++ b/.github/workflows/zz_generated.create_release.yaml @@ -2,7 +2,7 @@ # # devctl # -# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/create_release.yaml.template +# https://github.com/giantswarm/devctl/blob/c90dd09846d2e87f1bad62d2089405b78da11a82/pkg/gen/input/workflows/internal/file/create_release.yaml.template # name: Create Release on: @@ -90,12 +90,12 @@ jobs: - gather_facts steps: - name: Install architect - uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0 + uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0 with: binary: "architect" version: "6.14.1" - name: Install semver - uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0 + uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0 with: binary: "semver" version: "3.2.0" @@ -208,7 +208,7 @@ jobs: if: ${{ needs.gather_facts.outputs.version }} steps: - name: Install semver - uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0 + uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0 with: binary: "semver" version: "3.0.0" diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index 4b56ecb1f..b388af52b 100644 --- a/.github/workflows/zz_generated.create_release_pr.yaml +++ b/.github/workflows/zz_generated.create_release_pr.yaml @@ -2,7 +2,7 @@ # # devctl # -# https://github.com/giantswarm/devctl/blob/1a381db95a01773e471818a4ce56ad16ad5d6111/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template +# https://github.com/giantswarm/devctl/blob/7345de0273fb431a392dc15f53961b523dba2b5e/pkg/gen/input/workflows/internal/file/create_release_pr.yaml.template # name: Create Release PR on: @@ -147,12 +147,12 @@ jobs: steps: - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '=1.18.1' + go-version: '=1.23' - name: Install architect - uses: giantswarm/install-binary-action@033b1a657eea23d9c42e77312b370e6125e4e38f # v2.0.0 + uses: giantswarm/install-binary-action@c37eb401e5092993fc76d545030b1d1769e61237 # v3.0.0 with: binary: "architect" - version: "6.11.0" + version: "6.17.0" - name: Checkout code uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: @@ -205,7 +205,7 @@ jobs: - name: Bump go module defined in go.mod if needed run: | if [ "${{ needs.gather_facts.outputs.needs_major_bump }}" = true ] && test -f "go.mod"; then - go install github.com/marwan-at-work/mod/cmd/mod@v0.5.0 + go install github.com/marwan-at-work/mod/cmd/mod@v0.7.1 mod upgrade fi - name: Set up git identity diff --git a/.github/workflows/zz_generated.run_ossf_scorecard.yaml b/.github/workflows/zz_generated.run_ossf_scorecard.yaml index 475ca603e..16e2e272c 100644 --- a/.github/workflows/zz_generated.run_ossf_scorecard.yaml +++ b/.github/workflows/zz_generated.run_ossf_scorecard.yaml @@ -2,7 +2,7 @@ # # devctl # -# https://github.com/giantswarm/devctl/blob/0773061f94d5eac8a0e5b8f253bc15cc35a34066/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template +# https://github.com/giantswarm/devctl/blob/de4a791c8f4841d87ea06643ed4767707b7f2ea3/pkg/gen/input/workflows/internal/file/run_ossf_scorecard.yaml.template # # This workflow uses actions that are not certified by GitHub. They are provided @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -67,7 +67,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: SARIF file path: results.sarif @@ -75,6 +75,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3.25.9 + uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8 with: sarif_file: results.sarif diff --git a/.nancy-ignore b/.nancy-ignore index c7c20411f..650ff2f30 100644 --- a/.nancy-ignore +++ b/.nancy-ignore @@ -1,5 +1,5 @@ -CVE-2024-26147 until=2024-06-22 # helm.sh/helm/v3@v3.10.3 -CVE-2024-25620 until=2024-06-22 # helm.sh/helm/v3@v3.10.3 -CVE-2019-25210 until=2024-06-22 # helm.sh/helm/v3@v3.10.3 -CVE-2023-25165 until=2024-06-22 # helm.sh/helm/v3@v3.10.3 -CVE-2020-8561 until=2024-06-22 # k8s.io/apiserver@v0.26.15 +CVE-2024-26147 until=2024-09-30 # helm.sh/helm/v3@v3.10.3 +CVE-2024-25620 until=2024-09-30 # helm.sh/helm/v3@v3.10.3 +CVE-2019-25210 until=2024-09-30 # helm.sh/helm/v3@v3.10.3 +CVE-2023-25165 until=2024-09-30 # helm.sh/helm/v3@v3.10.3 +CVE-2020-8561 until=2024-09-30 # k8s.io/apiserver@v0.26.15 diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index 476bb00e5..ef166d23d 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -2,7 +2,7 @@ # # devctl # -# https://github.com/giantswarm/devctl/blob/d1e2552bd9e4ea8a8a87f8122b7dcfd1d82c707f/pkg/gen/input/makefile/internal/file/Makefile.gen.go.mk.template +# https://github.com/giantswarm/devctl/blob/fb22684ec4540f6b602968f01b4845bfb7713ee2/pkg/gen/input/makefile/internal/file/Makefile.gen.go.mk.template # APPLICATION := $(shell go list -m | cut -d '/' -f 3) @@ -63,15 +63,15 @@ $(APPLICATION)-windows-amd64.exe: $(APPLICATION)-v$(VERSION)-windows-amd64.exe $(APPLICATION)-v$(VERSION)-%-amd64: $(SOURCES) @echo "====> $@" - CGO_ENABLED=0 GOOS=$* GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o $@ . + CGO_ENABLED=0 GOOS=$* GOARCH=amd64 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ . $(APPLICATION)-v$(VERSION)-%-arm64: $(SOURCES) @echo "====> $@" - CGO_ENABLED=0 GOOS=$* GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -o $@ . + CGO_ENABLED=0 GOOS=$* GOARCH=arm64 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ . $(APPLICATION)-v$(VERSION)-windows-amd64.exe: $(SOURCES) @echo "====> $@" - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o $@ . + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ . .PHONY: install install: ## Install the application.