From 6482c235b5521bcc84e4ebb6beedb24c8ff85183 Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Mon, 19 Aug 2024 16:30:51 -0700 Subject: [PATCH 1/3] remove replace dep Signed-off-by: Kenny Leung --- .github/workflows/style.yaml | 2 +- go.mod | 10 +++------- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml index 467e531f..1415e7f4 100644 --- a/.github/workflows/style.yaml +++ b/.github/workflows/style.yaml @@ -79,7 +79,7 @@ jobs: uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.55 + version: v1.60 args: --timeout=5m lint: diff --git a/go.mod b/go.mod index 8d569b3a..b2941bff 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,13 @@ module github.com/chainguard-dev/terraform-infra-common -go 1.22.5 - -// This is to allow pubsub tracing to happen -// Remove once function in normal release -replace cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.42.0-beta.otel.trace +go 1.23.0 require ( chainguard.dev/sdk v0.1.23 cloud.google.com/go/bigquery v1.62.0 cloud.google.com/go/compute/metadata v0.5.0 cloud.google.com/go/profiler v0.4.1 - cloud.google.com/go/pubsub v1.41.0 + cloud.google.com/go/pubsub v1.42.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 github.com/avvmoto/buf-readerat v0.0.0-20171115124131-a17c8cb89270 github.com/chainguard-dev/clog v1.5.0 @@ -32,7 +28,6 @@ require ( gocloud.dev v0.39.0 golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 golang.org/x/oauth2 v0.22.0 - golang.org/x/time v0.6.0 google.golang.org/api v0.192.0 ) @@ -109,6 +104,7 @@ require ( golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.22.0 // indirect golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect google.golang.org/genproto v0.0.0-20240812133136-8ffd90a71988 // indirect diff --git a/go.sum b/go.sum index 061a3a6f..02f0f318 100644 --- a/go.sum +++ b/go.sum @@ -27,8 +27,8 @@ cloud.google.com/go/monitoring v1.20.4 h1:zwcViK7mT9SV0kzKqLOI3spRadvsmvw/R9z1MH cloud.google.com/go/monitoring v1.20.4/go.mod h1:v7F/UcLRw15EX7xq565N7Ae5tnYEE28+Cl717aTXG4c= cloud.google.com/go/profiler v0.4.1 h1:Q7+lOvikTGMJ/IAWocpYYGit4SIIoILmVZfEEWTORSY= cloud.google.com/go/profiler v0.4.1/go.mod h1:LBrtEX6nbvhv1w/e5CPZmX9ajGG9BGLtGbv56Tg4SHs= -cloud.google.com/go/pubsub v1.42.0-beta.otel.trace h1:7n/CymiBOE5Rpv5RAlWonqYxCn0QazRQKfF4FNc/S1Y= -cloud.google.com/go/pubsub v1.42.0-beta.otel.trace/go.mod h1:L2f61+4yMjo64DIchoLYCiqqCo/WSeTFcYqM65mDWCM= +cloud.google.com/go/pubsub v1.42.0 h1:PVTbzorLryFL5ue8esTS2BfehUs0ahyNOY9qcd+HMOs= +cloud.google.com/go/pubsub v1.42.0/go.mod h1:KADJ6s4MbTwhXmse/50SebEhE4SmUwHi48z3/dHar1Y= cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs= cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0= cloud.google.com/go/trace v1.10.12 h1:GoGZv1iAXEa73HgSGNjRl2vKqp5/f2AeKqErRFXA2kg= From f6f5ecd4a4eac94e195c36d32bc900e14ee2f554 Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Mon, 19 Aug 2024 16:47:23 -0700 Subject: [PATCH 2/3] tweak Signed-off-by: Kenny Leung --- .github/workflows/go-test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml index 5f6b30e0..6af23edf 100644 --- a/.github/workflows/go-test.yaml +++ b/.github/workflows/go-test.yaml @@ -15,7 +15,7 @@ permissions: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-8-core steps: - name: Harden Runner uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1 @@ -44,7 +44,8 @@ jobs: go-version-file: './go.mod' check-latest: true - - run: | + - name: Test + run: | # Exclude running unit tests against third_party repos. go test -race ./... From 2901e1a6be869d44447b32b1a847c503bd8533b4 Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Mon, 19 Aug 2024 16:53:44 -0700 Subject: [PATCH 3/3] try again Signed-off-by: Kenny Leung --- .github/workflows/go-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml index 6af23edf..016f6df5 100644 --- a/.github/workflows/go-test.yaml +++ b/.github/workflows/go-test.yaml @@ -15,7 +15,7 @@ permissions: jobs: test: - runs-on: ubuntu-8-core + runs-on: ubuntu-latest steps: - name: Harden Runner uses: step-security/harden-runner@5c7944e73c4c2a096b17a9cb74d65b6c2bbafbde # v2.9.1