Skip to content

Commit c963853

Browse files
authored
Merge pull request #3719 from ActiveState/CP-1079
Address Vulnerabilities (Update to go 1.24)
2 parents 905974f + 33fdf16 commit c963853

File tree

273 files changed

+28438
-22675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+28438
-22675
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
go-version:
39-
- 1.23.8
39+
- 1.24.6
4040
sys:
4141
- { os: ubuntu-latest }
4242
- { os: macos-13, shell: zsh }
@@ -193,6 +193,13 @@ jobs:
193193
if: "!contains(fromJSON('[\"refs/heads/beta\", \"refs/heads/release\", \"refs/heads/LTS\", \"refs/heads/master\"]'), github.ref) && !startsWith(github.event.pull_request.head.ref, 'version/')"
194194
run: parallelize results Check-Format
195195

196+
- # === Raw Unit Tests ===
197+
name: Raw Unit Tests
198+
id: raw_unit_tests
199+
shell: bash
200+
run: parallelize results Unit-Tests
201+
continue-on-error: true
202+
196203
- # === Unit Tests ===
197204
name: Unit Tests
198205
id: unit_tests

activestate.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ scripts:
271271
standalone: true
272272
description: Runs unit tests (not integration tests)
273273
value: |
274-
go test -v `go list ./... | grep -v integration | grep -v automation | grep -v expect | grep -v state-svc | grep -v state-offline` $@
274+
go test -vet=off -v `go list ./... | grep -v integration | grep -v automation | grep -v expect | grep -v state-svc | grep -v state-offline` $@
275275
- name: integration-tests
276276
language: bash
277277
standalone: true
@@ -280,14 +280,14 @@ scripts:
280280
unset ACTIVESTATE_ACTIVATED
281281
export INTEGRATION_TEST_USERNAME=$secrets.project.INTEGRATION_TEST_USERNAME
282282
export INTEGRATION_TEST_PASSWORD=$secrets.project.INTEGRATION_TEST_PASSWORD
283-
go test `go list ./... | grep "${INTEGRATION_TEST_REGEX}"` -v "${@:1}" -timeout 20m
283+
go test -vet=off `go list ./... | grep "${INTEGRATION_TEST_REGEX}"` -v "${@:1}" -timeout 20m
284284
- name: integration-tests-build-check
285285
language: bash
286286
standalone: true
287287
description: Builds integration tests and removes the executable artifact(s).
288288
value: |
289289
out="x.test"
290-
go list ./... | grep "${INTEGRATION_TEST_REGEX}" | xargs -L 1 go test -o $out -c
290+
go list ./... | grep "${INTEGRATION_TEST_REGEX}" | xargs -L 1 go test -vet=off -o $out -c
291291
[ -f $out ] && rm $out
292292
- name: clean
293293
language: bash

go.mod

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ActiveState/cli
22

3-
go 1.23.7
3+
go 1.24.6
44

55
require (
66
github.com/99designs/gqlgen v0.17.54
@@ -34,7 +34,7 @@ require (
3434
github.com/jarcoal/httpmock v1.0.3
3535
github.com/jessevdk/go-flags v1.4.0
3636
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d
37-
github.com/labstack/echo/v4 v4.9.0
37+
github.com/labstack/echo/v4 v4.13.4
3838
github.com/mash/go-tempfile-suffix v0.0.0-20150731093933-48f0f8a3a5ab
3939
github.com/mattn/go-runewidth v0.0.15
4040
github.com/nicksnyder/go-i18n v1.10.0
@@ -51,11 +51,11 @@ require (
5151
github.com/thoas/go-funk v0.8.0
5252
github.com/vbauerster/mpb/v7 v7.1.5
5353
github.com/vektah/gqlparser/v2 v2.5.16
54-
golang.org/x/crypto v0.35.0 // indirect
55-
golang.org/x/net v0.36.0
56-
golang.org/x/sys v0.30.0
57-
golang.org/x/term v0.29.0
58-
golang.org/x/text v0.22.0
54+
golang.org/x/crypto v0.41.0 // indirect
55+
golang.org/x/net v0.43.0
56+
golang.org/x/sys v0.35.0
57+
golang.org/x/term v0.34.0
58+
golang.org/x/text v0.28.0
5959
gopkg.in/AlecAivazis/survey.v1 v1.8.8
6060
gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2
6161
gopkg.in/yaml.v2 v2.4.0
@@ -102,7 +102,7 @@ require (
102102
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1 // indirect
103103
github.com/aws/smithy-go v1.22.4 // indirect
104104
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
105-
github.com/cloudflare/circl v1.3.7 // indirect
105+
github.com/cloudflare/circl v1.6.1 // indirect
106106
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
107107
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
108108
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -125,7 +125,7 @@ require (
125125
github.com/skeema/knownhosts v1.3.0 // indirect
126126
github.com/sosodev/duration v1.3.1 // indirect
127127
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
128-
golang.org/x/sync v0.11.0 // indirect
128+
golang.org/x/sync v0.16.0 // indirect
129129
)
130130

131131
require (
@@ -147,18 +147,17 @@ require (
147147
github.com/go-openapi/loads v0.20.2 // indirect
148148
github.com/go-openapi/spec v0.20.3 // indirect
149149
github.com/go-stack/stack v1.8.0 // indirect
150-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
151150
github.com/golang/snappy v0.0.4 // indirect
152151
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99 // indirect
153152
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
154153
github.com/josharian/intern v1.0.0 // indirect
155154
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
156155
github.com/kevinburke/ssh_config v1.2.0 // indirect
157-
github.com/labstack/gommon v0.3.1
156+
github.com/labstack/gommon v0.4.2
158157
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
159158
github.com/mailru/easyjson v0.7.7 // indirect
160159
github.com/matryer/is v1.4.1
161-
github.com/mattn/go-colorable v0.1.13 // indirect
160+
github.com/mattn/go-colorable v0.1.14 // indirect
162161
github.com/mattn/go-isatty v0.0.20 // indirect
163162
github.com/mattn/go-sqlite3 v1.14.7 // indirect
164163
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
@@ -178,14 +177,14 @@ require (
178177
github.com/tklauser/numcpus v0.6.1 // indirect
179178
github.com/ulikunitz/xz v0.5.11 // indirect
180179
github.com/valyala/bytebufferpool v1.0.0 // indirect
181-
github.com/valyala/fasttemplate v1.2.1 // indirect
180+
github.com/valyala/fasttemplate v1.2.2 // indirect
182181
github.com/xanzy/ssh-agent v0.3.3 // indirect
183182
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
184183
github.com/yusufpapurcu/wmi v1.2.4 // indirect
185184
go.mongodb.org/mongo-driver v1.5.3 // indirect
186-
golang.org/x/mod v0.21.0 // indirect
187-
golang.org/x/time v0.1.0 // indirect
188-
golang.org/x/tools v0.25.0 // indirect
185+
golang.org/x/mod v0.26.0
186+
golang.org/x/time v0.12.0 // indirect
187+
golang.org/x/tools v0.35.0 // indirect
189188
gopkg.in/fsnotify.v1 v1.4.7 // indirect
190189
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
191190
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)