Skip to content

Commit eede406

Browse files
PeterSchaferPeterSchafer
committed
chore(dependency): Upgrade to golang 1.24.4
1 parent 010f44b commit eede406

File tree

6 files changed

+29
-26
lines changed

6 files changed

+29
-26
lines changed

‎.circleci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# When upgrading golang, make sure to update the docker executors that use snyklabs/cli-build in .circleci/config.yml
2-
FROM --platform=$TARGETPLATFORM golang:1.23-bullseye
2+
FROM golang:1.24-bullseye
33

44
# install "normal" stuff
55

‎.circleci/config.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ parameters:
1616
go_version:
1717
type: string
1818
# https://go.dev/doc/devel/release
19-
default: '1.23.10'
19+
default: '1.24.5'
2020
aws_version:
2121
type: string
2222
# https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst
@@ -47,22 +47,22 @@ executors:
4747
resource_class: small
4848
docker-amd64:
4949
docker:
50-
- image: snyklabs/cli-build:20241015-082358
50+
- image: snyklabs/cli-build:20250429-091242
5151
working_directory: /mnt/ramdisk/snyk
5252
resource_class: large
5353
docker-amd64-xl:
5454
docker:
55-
- image: snyklabs/cli-build:20241015-082358
55+
- image: snyklabs/cli-build:20250429-091242
5656
working_directory: /mnt/ramdisk/snyk
5757
resource_class: xlarge
5858
docker-arm64:
5959
docker:
60-
- image: snyklabs/cli-build-arm64:20241015-082358
60+
- image: snyklabs/cli-build-arm64:20250429-091242
6161
working_directory: /mnt/ramdisk/snyk
6262
resource_class: arm.large
6363
docker-arm64-xl:
6464
docker:
65-
- image: snyklabs/cli-build-arm64:20241015-082358
65+
- image: snyklabs/cli-build-arm64:20250429-091242
6666
working_directory: /mnt/ramdisk/snyk
6767
resource_class: arm.xlarge
6868
linux-ubuntu-jammy-amd64:
@@ -119,6 +119,10 @@ executors:
119119
docker:
120120
- image: mcr.microsoft.com/cbl-mariner/base/python:3.9.14-8-cm2.0.20240301-arm64
121121
resource_class: arm.medium
122+
suse-linux-fips:
123+
docker:
124+
- image: registry.suse.com/bci/bci-base-fips:15.6
125+
resource_class: arm.medium
122126

123127
commands:
124128
install-go:
@@ -863,12 +867,12 @@ workflows:
863867
- '/.*e2e.*/'
864868

865869
- test-release:
866-
name: e2e fips tests (cbl-mariner)
870+
name: e2e fips tests (suse-linux-fips)
867871
context: team_hammerhead-cli
868872
cli_download_base_url: << pipeline.parameters.fips_cli_download_base_url >>
869873
setup_steps:
870-
- run: tdnf install -y tar ca-certificates
871-
executor: 'cbl-mariner'
874+
- run: zypper --non-interactive install python3-pip
875+
executor: 'suse-linux-fips'
872876
requires:
873877
- upload version
874878
filters:
@@ -912,7 +916,7 @@ workflows:
912916
- e2e tests (linux-ubuntu-jammy-arm64)
913917
- e2e tests (linux-ubuntu-focal-arm64)
914918
- e2e tests (alpine)
915-
- e2e fips tests (cbl-mariner)
919+
- e2e fips tests (suse-linux-fips)
916920
- e2e fips tests (win-server2022-amd64)
917921
filters:
918922
branches:

‎.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.bin/
22
.circleci/
3+
!.circleci/awscli-publickey.pub
34
.github/
45
!/.github/CODEOWNERS
56
.git

‎cliv2/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GOARCH = $(shell go env GOARCH)
66
GOHOSTOS = $(shell go env GOHOSTOS)
77
GOHOSTARCH = $(shell go env GOHOSTARCH)
88
LS_COMMIT_HASH = $(shell cat go.mod | grep snyk-ls | cut -d "-" -f 4)
9-
FIPS_CRYPTO_BACKEND_DEFAULT = opensslcrypto
9+
FIPS_CRYPTO_BACKEND_DEFAULT = systemcrypto
1010
FIPS_CRYPTO_BACKEND =
1111
HASH = sha
1212
HASH_ALGORITHM = 256
@@ -19,7 +19,7 @@ export LS_PROTOCOL_VERSION=
1919

2020
# Build tools
2121
GO_BIN := $(shell pwd)/.bin
22-
OVERRIDE_GOCI_LINT_V := v1.61.0
22+
OVERRIDE_GOCI_LINT_V := v1.64.8
2323
SHELL := env PATH=$(GO_BIN):$(PATH) $(SHELL)
2424

2525
# Make directories per convention
@@ -97,10 +97,6 @@ ifeq ($(GOHOSTOS), windows)
9797
ISSIGNED_SCRIPT = $(SPECIAL_SHELL) $(WORKING_DIR)/scripts/issigned_$(GOHOSTOS).ps1
9898
endif
9999

100-
ifeq ($(_GO_OS), windows)
101-
FIPS_CRYPTO_BACKEND_DEFAULT = cngcrypto
102-
endif
103-
104100
# some make file variables
105101
LOG_PREFIX = --
106102

‎cliv2/go.mod

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

3-
go 1.23.10
3+
go 1.24.4
44

55
require (
66
github.com/elazarl/goproxy v1.7.2
@@ -18,7 +18,7 @@ require (
1818
github.com/snyk/cli-extension-sbom v0.0.0-20250422133603-a5ae6fdf0934
1919
github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7
2020
github.com/snyk/error-catalog-golang-public v0.0.0-20250625135845-2d6f9a31f318
21-
github.com/snyk/go-application-framework v0.0.0-20250723170126-556d18b1b13f
21+
github.com/snyk/go-application-framework v0.0.0-20250801093525-08863bf2d6a0
2222
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
2323
github.com/snyk/snyk-iac-capture v0.6.5
2424
github.com/snyk/snyk-ls v0.0.0-20250730084600-fa9910eba8c8

‎cliv2/go.sum

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ github.com/getkin/kin-openapi v0.132.0/go.mod h1:3OlG51PCYNsPByuiMB0t4fjnNlIDnaE
382382
github.com/getsentry/sentry-go v0.31.1 h1:ELVc0h7gwyhnXHDouXkhqTFSO5oslsRDk0++eyE0KJ4=
383383
github.com/getsentry/sentry-go v0.31.1/go.mod h1:CYNcMMz73YigoHljQRG+qPF+eMq8gG72XcGN/p71BAY=
384384
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
385-
github.com/gkampitakis/ciinfo v0.3.0 h1:gWZlOC2+RYYttL0hBqcoQhM7h1qNkVqvRCV1fOvpAv8=
386-
github.com/gkampitakis/ciinfo v0.3.0/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
385+
github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
386+
github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
387387
github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
388388
github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
389-
github.com/gkampitakis/go-snaps v0.5.3 h1:2cJnBgHzJhh0Jk5XBIyDYDe1Ylfncoa9r9bVJ5qvOAE=
390-
github.com/gkampitakis/go-snaps v0.5.3/go.mod h1:ZABkO14uCuVxBHAXAfKG+bqNz+aa1bGPAg8jkI0Nk8Y=
389+
github.com/gkampitakis/go-snaps v0.5.14 h1:3fAqdB6BCPKHDMHAKRwtPUwYexKtGrNuw8HX/T/4neo=
390+
github.com/gkampitakis/go-snaps v0.5.14/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
391391
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
392392
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
393393
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -424,6 +424,8 @@ github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIx
424424
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
425425
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
426426
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
427+
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
428+
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
427429
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
428430
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
429431
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
@@ -800,8 +802,8 @@ github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7 h1:/2+2piwQtB9f
800802
github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM=
801803
github.com/snyk/error-catalog-golang-public v0.0.0-20250625135845-2d6f9a31f318 h1:2bNOlUstBBWHa3doBvdOBlMSu8AC01IHyNexT9MoKiM=
802804
github.com/snyk/error-catalog-golang-public v0.0.0-20250625135845-2d6f9a31f318/go.mod h1:Ytttq7Pw4vOCu9NtRQaOeDU2dhBYUyNBe6kX4+nIIQ4=
803-
github.com/snyk/go-application-framework v0.0.0-20250723170126-556d18b1b13f h1:1kOY4VVXkusmfauEX0AEU5mWgyjkV6M28VtBulpq13s=
804-
github.com/snyk/go-application-framework v0.0.0-20250723170126-556d18b1b13f/go.mod h1:1Er3gtOGkvSQU6hA2RXQXJoximomPaksC6vwHlj/XQI=
805+
github.com/snyk/go-application-framework v0.0.0-20250801093525-08863bf2d6a0 h1:fdyjWwzZlS7WlhzR0bxOpt1GqDItZFEw31D6d8JeS/4=
806+
github.com/snyk/go-application-framework v0.0.0-20250801093525-08863bf2d6a0/go.mod h1:QnT6WoIaMq7tbleWR0cKTmKWGPBPeYF/HcHRLBLq08M=
805807
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65 h1:CEQuYv0Go6MEyRCD3YjLYM2u3Oxkx8GpCpFBd4rUTUk=
806808
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
807809
github.com/snyk/policy-engine v0.33.2 h1:ZxD6/RQ4vqUAXa64V72SsGjZ8vmnBgZNGYQxMIqctYo=
@@ -852,8 +854,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
852854
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
853855
github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes=
854856
github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
855-
github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
856-
github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
857+
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
858+
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
857859
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
858860
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
859861
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=

0 commit comments

Comments
 (0)