Skip to content

Commit d861f88

Browse files
fsul7ofsul7o
authored
upgrade go1.25 from go1.23 (#58)
* fix Signed-off-by: fsul7o <[email protected]> * fix: test Signed-off-by: fsul7o <[email protected]> * fix Signed-off-by: fsul7o <[email protected]> * fix Signed-off-by: fsul7o <[email protected]> * fix Signed-off-by: fsul7o <[email protected]> * fix Signed-off-by: fsul7o <[email protected]> --------- Signed-off-by: fsul7o <[email protected]>
1 parent 62c60a7 commit d861f88

File tree

6 files changed

+167
-104
lines changed

6 files changed

+167
-104
lines changed

‎Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine AS base
1+
FROM golang:1.25-alpine AS base
22

33
RUN set -eux \
44
&& apk --no-cache add ca-certificates \
@@ -13,7 +13,7 @@ RUN GO111MODULE=on go mod download
1313

1414
FROM base AS builder
1515

16-
ENV APP_NAME authorization-proxy
16+
ENV APP_NAME=authorization-proxy
1717
ARG APP_VERSION='development version'
1818

1919
COPY . .
@@ -29,6 +29,7 @@ RUN BUILD_TIME=$(date -u +%Y%m%d-%H%M%S) \
2929
GOOS=$(go env GOOS) \
3030
GOARCH=$(go env GOARCH) \
3131
GO111MODULE=on \
32+
GOEXPERIMENT=noswissmap \
3233
go build -ldflags "-X 'main.Version=${VERSION} at ${BUILD_TIME} by ${GO_VERSION}' -linkmode=external" -a -o "/usr/bin/${APP_NAME}"
3334

3435
# confirm dependency libraries & cleanup
@@ -39,9 +40,9 @@ RUN ldd "/usr/bin/${APP_NAME}"\
3940
# Start From Scratch For Running Environment
4041
FROM scratch
4142
# FROM alpine:latest
42-
LABEL maintainer "[email protected]"
43+
LABEL maintainer="[email protected]"
4344

44-
ENV APP_NAME authorization-proxy
45+
ENV APP_NAME=authorization-proxy
4546

4647
# Copy certificates for SSL/TLS
4748
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Client request can be authenticated and authorized by:
3434
1. Role token in the HTTP/HTTPS request header
3535
1. Role certificate on mTLS
3636

37-
Requires go 1.23 or later.
37+
Requires go 1.25 or later.
3838

3939
## Use case
4040

‎go.mod‎

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,42 @@
11
module github.com/AthenZ/authorization-proxy/v4
22

3-
go 1.23.4
3+
go 1.25.1
44

55
replace (
6-
cloud.google.com/go => cloud.google.com/go v0.112.2
7-
github.com/golang/mock => github.com/golang/mock v1.6.0
8-
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
9-
github.com/google/go-cmp => github.com/google/go-cmp v0.6.0
10-
github.com/google/pprof => github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd
11-
github.com/prometheus/common => github.com/prometheus/common v0.48.0
12-
golang.org/x/exp => golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
13-
golang.org/x/image => golang.org/x/image v0.15.0
14-
golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
15-
golang.org/x/mobile => golang.org/x/mobile v0.0.0-20240404231514-09dbf07665ed
16-
golang.org/x/mod => golang.org/x/mod v0.17.0
17-
golang.org/x/oauth2 => golang.org/x/oauth2 v0.19.0
18-
golang.org/x/term => golang.org/x/term v0.19.0
19-
golang.org/x/text => golang.org/x/text v0.14.0
20-
golang.org/x/time => golang.org/x/time v0.5.0
21-
golang.org/x/tools => golang.org/x/tools v0.20.0
22-
golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
23-
google.golang.org/api => google.golang.org/api v0.172.0
24-
google.golang.org/appengine => google.golang.org/appengine v1.6.8
25-
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240412170617-26222e5d3d56
26-
google.golang.org/grpc => google.golang.org/grpc v1.63.2
27-
google.golang.org/protobuf => google.golang.org/protobuf v1.33.0
6+
cloud.google.com/go => cloud.google.com/go v0.123.0
7+
github.com/kpango/gache/v2 => github.com/kpango/gache/v2 v2.1.1
8+
github.com/kpango/glg => github.com/kpango/glg v1.6.15
9+
github.com/pkg/errors => github.com/pkg/errors v0.9.1
10+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.23.2
11+
github.com/prometheus/client_model => github.com/prometheus/client_model v0.6.2
12+
golang.org/x/sync => golang.org/x/sync v0.17.0
13+
google.golang.org/grpc => google.golang.org/grpc v1.75.1
14+
google.golang.org/protobuf => google.golang.org/protobuf v1.36.9
15+
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0
2816
)
2917

3018
require (
3119
github.com/AthenZ/athenz-authorizer/v5 v5.7.0
3220
github.com/kpango/glg v1.6.15
3321
github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
3422
github.com/pkg/errors v0.9.1
35-
github.com/prometheus/client_golang v1.19.1
36-
github.com/prometheus/client_model v0.5.0
37-
golang.org/x/sync v0.12.0
38-
google.golang.org/grpc v1.71.0
39-
google.golang.org/protobuf v1.36.5
23+
github.com/prometheus/client_golang v1.23.2
24+
github.com/prometheus/client_model v0.6.2
25+
golang.org/x/sync v0.17.0
26+
google.golang.org/grpc v1.75.1
27+
google.golang.org/protobuf v1.36.9
4028
gopkg.in/yaml.v2 v2.4.0
4129
)
4230

4331
require (
4432
github.com/AthenZ/athenz v1.12.13 // indirect
4533
github.com/ardielle/ardielle-go v1.5.2 // indirect
4634
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4836
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
4937
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
50-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
51-
github.com/go-logr/logr v1.4.2 // indirect
38+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
39+
github.com/go-logr/logr v1.4.3 // indirect
5240
github.com/goccy/go-json v0.10.5 // indirect
5341
github.com/gogo/protobuf v1.3.2 // indirect
5442
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
@@ -67,16 +55,18 @@ require (
6755
github.com/lestrrat-go/option v1.0.1 // indirect
6856
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6957
github.com/modern-go/reflect2 v1.0.2 // indirect
70-
github.com/prometheus/common v0.48.0 // indirect
71-
github.com/prometheus/procfs v0.12.0 // indirect
58+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59+
github.com/prometheus/common v0.66.1 // indirect
60+
github.com/prometheus/procfs v0.16.1 // indirect
7261
github.com/segmentio/asm v1.2.0 // indirect
7362
github.com/x448/float16 v0.8.4 // indirect
7463
github.com/zeebo/xxh3 v1.0.2 // indirect
75-
golang.org/x/crypto v0.36.0 // indirect
76-
golang.org/x/net v0.38.0 // indirect
77-
golang.org/x/sys v0.31.0 // indirect
78-
golang.org/x/text v0.23.0 // indirect
79-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
64+
go.yaml.in/yaml/v2 v2.4.2 // indirect
65+
golang.org/x/crypto v0.42.0 // indirect
66+
golang.org/x/net v0.44.0 // indirect
67+
golang.org/x/sys v0.36.0 // indirect
68+
golang.org/x/text v0.29.0 // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
8070
gopkg.in/inf.v0 v0.9.1 // indirect
8171
gopkg.in/yaml.v3 v3.0.1 // indirect
8272
k8s.io/apimachinery v0.32.3 // indirect

0 commit comments

Comments
 (0)