Skip to content

Commit 0b8fbec

Browse files
RTannRTann
authored
chore: go1.21.9 (#1290)
1 parent d2f89d0 commit 0b8fbec

File tree

9 files changed

+89
-65
lines changed

9 files changed

+89
-65
lines changed

‎.github/workflows/PR.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- create-dev-cluster
4646
runs-on: ubuntu-latest
4747
container:
48-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
48+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
4949

5050
steps:
5151
- name: Checkout
@@ -67,7 +67,7 @@ jobs:
6767
- create-dev-cluster
6868
runs-on: ubuntu-latest
6969
container:
70-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
70+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
7171
env:
7272
KUBECONFIG: /github/home/artifacts/kubeconfig
7373
INFRA_TOKEN: ${{ secrets.INFRA_TOKEN }}

‎.github/workflows/build-and-push.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build-and-push-server:
1212
runs-on: ubuntu-latest
1313
container:
14-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
14+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
1515

1616
steps:
1717
- name: Checkout
@@ -58,7 +58,7 @@ jobs:
5858
build-and-push-certifier:
5959
runs-on: ubuntu-latest
6060
container:
61-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
61+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
6262

6363
steps:
6464
- name: Checkout

‎.github/workflows/lint.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/setup-go@v5
1919
with:
20-
go-version: "1.20"
20+
go-version: "1.21"
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323
with:
@@ -26,12 +26,12 @@ jobs:
2626
- name: golangci-lint
2727
uses: golangci/golangci-lint-action@v4
2828
with:
29-
version: v1.53
29+
version: v1.58
3030

3131
shellcheck:
3232
runs-on: ubuntu-latest
3333
container:
34-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
34+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@v4

‎.github/workflows/unit-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
unit-test:
1212
runs-on: ubuntu-latest
1313
container:
14-
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.61
14+
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.3.69
1515

1616
steps:
1717
- name: Checkout

‎cmd/infractl/cluster/get/fancy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func TestGetClusterJSONOutput(t *testing.T) {
143143
testTime, err := ptypes.TimestampProto(time.Date(2022, time.April, 1, 1, 0, 0, 0, time.UTC))
144144
assert.NoError(t, err)
145145
csc := &FakeClusterServiceClient{
146-
infoFn: func(ctx context.Context, clusterID *v1.ResourceByID) (*v1.Cluster, error) {
146+
infoFn: func(_ context.Context, _ *v1.ResourceByID) (*v1.Cluster, error) {
147147
return &v1.Cluster{
148148
ID: "test-123",
149149
Status: v1.Status_FAILED,

‎flavor/workflow_templates.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ func getParametersFromWorkflowTemplate(template *v1alpha1.WorkflowTemplate) map[
146146
Order: int32(idx + 1),
147147
}
148148
parameter.Description = wfParameter.Description.String()
149+
//nolint:gocritic
149150
if wfParameter.Default == nil && wfParameter.Value == nil {
150151
// Required
151152
parameter.Optional = false

‎go.mod‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/stackrox/infra
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.9
46

57
require (
68
cloud.google.com/go/bigquery v1.60.0
@@ -22,6 +24,7 @@ require (
2224
github.com/spf13/cobra v1.8.0
2325
github.com/spf13/pflag v1.0.5
2426
github.com/stretchr/testify v1.8.4
27+
go.uber.org/zap v1.21.0
2528
golang.org/x/net v0.24.0
2629
golang.org/x/oauth2 v0.18.0
2730
google.golang.org/api v0.172.0
@@ -34,48 +37,6 @@ require (
3437
k8s.io/client-go v0.29.2
3538
)
3639

37-
require (
38-
github.com/apache/arrow/go/v14 v14.0.2 // indirect
39-
github.com/colinmarc/hdfs/v2 v2.4.0 // indirect
40-
github.com/evilmonkeyinc/jsonpath v0.8.1 // indirect
41-
github.com/expr-lang/expr v1.16.0 // indirect
42-
github.com/go-logr/stdr v1.2.2 // indirect
43-
github.com/goccy/go-json v0.10.2 // indirect
44-
github.com/google/flatbuffers v23.5.26+incompatible // indirect
45-
github.com/google/gnostic-models v0.6.8 // indirect
46-
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
47-
github.com/jackc/pgconn v1.14.3 // indirect
48-
github.com/jackc/pgio v1.0.0 // indirect
49-
github.com/jackc/pgpassfile v1.0.0 // indirect
50-
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
51-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
52-
github.com/jackc/pgtype v1.14.0 // indirect
53-
github.com/jackc/pgx/v4 v4.18.2 // indirect
54-
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
55-
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
56-
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
57-
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
58-
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
59-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
60-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
61-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
62-
github.com/pierrec/lz4/v4 v4.1.18 // indirect
63-
github.com/segmentio/fasthash v1.0.3 // indirect
64-
github.com/upper/db/v4 v4.7.0 // indirect
65-
github.com/zeebo/xxh3 v1.0.2 // indirect
66-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
67-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
68-
go.opentelemetry.io/otel v1.24.0 // indirect
69-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
70-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
71-
go.uber.org/multierr v1.10.0 // indirect
72-
golang.org/x/mod v0.14.0 // indirect
73-
golang.org/x/sync v0.6.0 // indirect
74-
golang.org/x/tools v0.16.1 // indirect
75-
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
77-
)
78-
7940
require (
8041
cloud.google.com/go v0.112.1 // indirect
8142
cloud.google.com/go/compute v1.24.0 // indirect
@@ -84,21 +45,29 @@ require (
8445
github.com/Masterminds/goutils v1.1.1 // indirect
8546
github.com/Masterminds/semver/v3 v3.2.0 // indirect
8647
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
48+
github.com/apache/arrow/go/v14 v14.0.2 // indirect
8749
github.com/argoproj/argo-events v1.7.3 // indirect
8850
github.com/argoproj/pkg v0.13.7-0.20230901113346-235a5432ec98 // indirect
8951
github.com/beorn7/perks v1.0.1 // indirect
9052
github.com/cespare/xxhash/v2 v2.2.0 // indirect
53+
github.com/colinmarc/hdfs/v2 v2.4.0 // indirect
9154
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9255
github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3 // indirect
9356
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
57+
github.com/evilmonkeyinc/jsonpath v0.8.1 // indirect
58+
github.com/expr-lang/expr v1.16.0 // indirect
9459
github.com/felixge/httpsnoop v1.0.4 // indirect
9560
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9661
github.com/go-logr/logr v1.4.1 // indirect
62+
github.com/go-logr/stdr v1.2.2 // indirect
9763
github.com/go-openapi/jsonpointer v0.19.6 // indirect
9864
github.com/go-openapi/jsonreference v0.20.2 // indirect
9965
github.com/go-openapi/swag v0.22.3 // indirect
10066
github.com/go-sql-driver/mysql v1.7.1 // indirect
67+
github.com/goccy/go-json v0.10.2 // indirect
10168
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
69+
github.com/google/flatbuffers v23.5.26+incompatible // indirect
70+
github.com/google/gnostic-models v0.6.8 // indirect
10271
github.com/google/go-cmp v0.6.0 // indirect
10372
github.com/google/gofuzz v1.2.0 // indirect
10473
github.com/google/s2a-go v0.1.7 // indirect
@@ -110,40 +79,71 @@ require (
11079
github.com/huandu/xstrings v1.3.3 // indirect
11180
github.com/imdario/mergo v0.3.13 // indirect
11281
github.com/inconshreveable/mousetrap v1.1.0 // indirect
82+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
83+
github.com/jackc/pgconn v1.14.1 // indirect
84+
github.com/jackc/pgio v1.0.0 // indirect
85+
github.com/jackc/pgpassfile v1.0.0 // indirect
86+
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
87+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
88+
github.com/jackc/pgtype v1.14.0 // indirect
89+
github.com/jackc/pgx/v4 v4.18.1 // indirect
90+
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
91+
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
11392
github.com/jcmturner/gofork v1.7.6 // indirect
93+
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
94+
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
95+
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
11496
github.com/josharian/intern v1.0.0 // indirect
11597
github.com/json-iterator/go v1.1.12 // indirect
11698
github.com/klauspost/compress v1.17.0 // indirect
99+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
117100
github.com/klauspost/pgzip v1.2.6 // indirect
118101
github.com/lib/pq v1.10.9 // indirect
119102
github.com/mailru/easyjson v0.7.7 // indirect
103+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
120104
github.com/mitchellh/copystructure v1.2.0 // indirect
121105
github.com/mitchellh/reflectwalk v1.0.2 // indirect
122106
github.com/moby/spdystream v0.2.0 // indirect
123107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
124108
github.com/modern-go/reflect2 v1.0.2 // indirect
125109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
110+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
111+
github.com/pierrec/lz4/v4 v4.1.18 // indirect
126112
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
127113
github.com/prometheus/client_model v0.5.0 // indirect
128114
github.com/prometheus/common v0.45.0 // indirect
129115
github.com/prometheus/procfs v0.12.0 // indirect
130116
github.com/robfig/cron/v3 v3.0.1 // indirect
117+
github.com/segmentio/fasthash v1.0.3 // indirect
131118
github.com/sethvargo/go-limiter v0.7.2 // indirect
132119
github.com/shopspring/decimal v1.2.0 // indirect
133120
github.com/sirupsen/logrus v1.9.3 // indirect
134121
github.com/spf13/cast v1.5.1 // indirect
122+
github.com/upper/db/v4 v4.7.0 // indirect
135123
github.com/valyala/bytebufferpool v1.0.0 // indirect
136124
github.com/valyala/fasttemplate v1.2.2 // indirect
125+
github.com/zeebo/xxh3 v1.0.2 // indirect
137126
go.opencensus.io v0.24.0 // indirect
138-
go.uber.org/zap v1.27.0
127+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
128+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
129+
go.opentelemetry.io/otel v1.24.0 // indirect
130+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
131+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
132+
go.uber.org/atomic v1.9.0 // indirect
133+
go.uber.org/multierr v1.9.0 // indirect
139134
golang.org/x/crypto v0.22.0 // indirect
140135
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
136+
golang.org/x/mod v0.14.0 // indirect
137+
golang.org/x/sync v0.6.0 // indirect
141138
golang.org/x/sys v0.19.0 // indirect
142139
golang.org/x/term v0.19.0 // indirect
143140
golang.org/x/text v0.14.0 // indirect
144141
golang.org/x/time v0.5.0 // indirect
142+
golang.org/x/tools v0.16.1 // indirect
145143
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
146144
google.golang.org/appengine v1.6.8 // indirect
145+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
146+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
147147
gopkg.in/inf.v0 v0.9.1 // indirect
148148
gopkg.in/yaml.v2 v2.4.0 // indirect
149149
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)