Skip to content

Commit 804c5d6

Browse files
chore(CR-29827): updated golang.org/x/oauth2 , github.com/argoproj/argo-cd/v2 (#791)
## What <!-- What is changing in this PR? --> CVE-2025-22868 -fixed by updating github.com/argoproj/argo-cd/v2 CVE-2025-22868 - fixed by updating golang.org/x/oauth2 ## Why <!-- Why are these changes being made? --> ## Notes <!-- Add any additional notes here --> --------- Co-authored-by: Noam Gal <noam.gal@octopus.com>
1 parent 49a49fd commit 804c5d6

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.4-alpine3.21 AS base
1+
FROM golang:1.24.4-alpine3.22 AS base
22

33
WORKDIR /go/src/github.com/codefresh-io/cli-v2
44

@@ -27,7 +27,7 @@ RUN go mod verify
2727

2828
############################### CLI ###############################
2929
### Compile
30-
FROM golang:1.23.4-alpine3.21 AS codefresh-build
30+
FROM golang:1.24.4-alpine3.22 AS codefresh-build
3131

3232
WORKDIR /go/src/github.com/codefresh-io/cli-v2
3333

@@ -38,14 +38,14 @@ COPY --from=base /go/pkg/mod /go/pkg/mod
3838

3939
COPY . .
4040

41-
ENV GOPATH /go
42-
ENV GOBIN /go/bin
41+
ENV GOPATH=/go
42+
ENV GOBIN=/go/bin
4343

4444
ARG SEGMENT_WRITE_KEY
4545
RUN make local DEV_MODE=false SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
4646

4747
### Run
48-
FROM alpine:3.21 AS codefresh
48+
FROM alpine:3.22 AS codefresh
4949

5050
WORKDIR /go/src/github.com/codefresh-io/cli-v2
5151

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.2.8
1+
VERSION=v0.2.9
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")
@@ -176,4 +176,4 @@ $(GOBIN)/mockgen:
176176
$(GOBIN)/golangci-lint:
177177
@mkdir dist || true
178178
@echo installing: golangci-lint
179-
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.62.2
179+
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.64.8

go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module github.com/codefresh-io/cli-v2
22

3-
go 1.23.1
4-
5-
toolchain go1.23.4
3+
go 1.24.4
64

75
require (
86
github.com/Masterminds/semver/v3 v3.3.1
9-
github.com/argoproj/argo-cd/v2 v2.13.4
7+
github.com/argoproj/argo-cd/v2 v2.13.8
108
github.com/codefresh-io/go-sdk v1.4.9
119
github.com/fatih/color v1.18.0
1210
github.com/gobuffalo/packr v1.30.1
@@ -201,7 +199,7 @@ require (
201199
golang.org/x/crypto v0.37.0 // indirect
202200
golang.org/x/mod v0.22.0 // indirect
203201
golang.org/x/net v0.37.0 // indirect
204-
golang.org/x/oauth2 v0.24.0 // indirect
202+
golang.org/x/oauth2 v0.27.0 // indirect
205203
golang.org/x/sync v0.13.0 // indirect
206204
golang.org/x/sys v0.32.0 // indirect
207205
golang.org/x/term v0.31.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQ
4545
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
4646
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
4747
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
48-
github.com/argoproj/argo-cd/v2 v2.13.4 h1:YAj2J2RUq+gMaG2vmtQ+qyUxlbrAzk3P6SwYHXlkUPw=
49-
github.com/argoproj/argo-cd/v2 v2.13.4/go.mod h1:1xggXUniuSkUtcBu0EWl45k1BTuYSASd0bn6WOma4vA=
48+
github.com/argoproj/argo-cd/v2 v2.13.8 h1:FX4wajO+DUADwyMq/+y+UlLhcljVY8v/+5DllzxEfwo=
49+
github.com/argoproj/argo-cd/v2 v2.13.8/go.mod h1:VnIEoaw53mwPEGKqixL3ee1qfP3tNUFj+9RHJVhmxws=
5050
github.com/argoproj/gitops-engine v0.7.1-0.20250328191959-6d3cf122b03f h1:T18BJdtZF/HWdkyCqcNI6kQ3SbIomn6g+AZtZtvQUjE=
5151
github.com/argoproj/gitops-engine v0.7.1-0.20250328191959-6d3cf122b03f/go.mod h1:WsnykM8idYRUnneeT31cM/Fq/ZsjkefCbjiD8ioCJkU=
5252
github.com/argoproj/pkg v0.13.7-0.20230901113346-235a5432ec98 h1:Y1wJVJePMad3LwH+OIX4cl9ND3251XUNxjgpxFRWmZs=
@@ -813,8 +813,8 @@ golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
813813
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
814814
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
815815
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
816-
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
817-
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
816+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
817+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
818818
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
819819
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
820820
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)