Skip to content

Commit fba1002

Browse files
authored
Merge branch 'main' into dependabot/go_modules/github.com/stretchr/testify-1.11.1
Signed-off-by: Etai Lev Ran <elevran@gmail.com>
2 parents 64f670a + d381b09 commit fba1002

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

.github/workflows/pr-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Check License Header
1818
uses: apache/skywalking-eyes/header@main
1919
- name: Setup Go
20-
uses: actions/setup-go@v5
20+
uses: actions/setup-go@v6
2121
with:
2222
go-version-file: ./go.mod
2323
- name: Setup goimports
@@ -44,7 +44,7 @@ jobs:
4444
with:
4545
fetch-tags: true
4646
- name: set up go
47-
uses: actions/setup-go@v5
47+
uses: actions/setup-go@v6
4848
with:
4949
go-version-file: ./go.mod
5050
- name: setup tparse

.github/workflows/pr-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
fetch-tags: true
2020
- name: Set up Go
21-
uses: actions/setup-go@v5
21+
uses: actions/setup-go@v6
2222
with:
2323
go-version-file: ./go.mod
2424
- name: Install kind

.github/workflows/pr-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
fetch-tags: true
1717
- name: Set up Go
18-
uses: actions/setup-go@v5
18+
uses: actions/setup-go@v6
1919
with:
2020
go-version-file: ./go.mod
2121
- name: Install kind

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: checkout
1616
uses: actions/checkout@v5
1717
- name: Set up Go
18-
uses: actions/setup-go@v5
18+
uses: actions/setup-go@v6
1919
with:
2020
go-version-file: ./go.mod
2121
- name: Login to GitHub Container Registry

cmd/cl-dataplane/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM envoyproxy/envoy:v1.35.1
1+
FROM envoyproxy/envoy:v1.35.3
22

33
# Populated during the build process, for example, with 'arm64' or 'amd64'.
44
ARG TARGETARCH

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
github.com/google/uuid v1.6.0
1414
github.com/lestrrat-go/jwx v1.2.31
1515
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/cobra v1.9.1
17-
github.com/spf13/pflag v1.0.7
16+
github.com/spf13/cobra v1.10.1
17+
github.com/spf13/pflag v1.0.9
1818
github.com/stretchr/testify v1.11.1
1919
golang.org/x/net v0.43.0
2020
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7

go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,10 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99
142142
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
143143
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
144144
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
145-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
146-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
147-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
148-
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
149-
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
145+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
146+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
147+
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
148+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
150149
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
151150
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
152151
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

pkg/dataplane/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (d *Dataplane) dataplaneIngressAuthorize(w http.ResponseWriter, r *http.Req
109109
body, err := io.ReadAll(r.Body)
110110
if err != nil {
111111
errorString := fmt.Sprintf("Unable to read response body: %v.", err)
112-
d.logger.Errorf(errorString)
112+
d.logger.Error(errorString)
113113
http.Error(w, errorString, http.StatusInternalServerError)
114114
return
115115
}

0 commit comments

Comments
 (0)