Skip to content

Commit 3fb7025

Browse files
authored
bump go version 1.25.6 (#1047)
Signed-off-by: Rudrakh Panigrahi <rudrakh97@gmail.com>
1 parent a28b84d commit 3fb7025

8 files changed

Lines changed: 15 additions & 15 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.3@sha256:6ea52a02734dd15e943286b048278da1e04eca196a564578d718c7720433dbbe AS build
1+
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c AS build
22
WORKDIR /ratelimit
33

44
ENV GOPROXY=https://proxy.golang.org

Dockerfile.integration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Running this docker image runs the integration tests.
2-
FROM golang@sha256:6ea52a02734dd15e943286b048278da1e04eca196a564578d718c7720433dbbe
2+
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c
33

44
RUN apt-get update -y && apt-get install sudo stunnel4 redis memcached -y && rm -rf /var/lib/apt/lists/*
55

examples/xds-sotw-config-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25.3@sha256:6ea52a02734dd15e943286b048278da1e04eca196a564578d718c7720433dbbe AS build
1+
FROM golang:1.25.6@sha256:fc24d3881a021e7b968a4610fc024fba749f98fe5c07d4f28e6cfa14dc65a84c AS build
22
WORKDIR /xds-server
33

44
COPY . .

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
module github.com/envoyproxy/ratelimit
22

3-
go 1.23.9
3+
go 1.25.6
44

55
require (
66
github.com/DataDog/datadog-go/v5 v5.5.0
77
github.com/alicebob/miniredis/v2 v2.33.0
88
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
9-
github.com/cespare/xxhash/v2 v2.3.0
109
github.com/coocood/freecache v1.2.4
1110
github.com/envoyproxy/go-control-plane v0.13.4
1211
github.com/envoyproxy/go-control-plane/envoy v1.32.4
@@ -47,6 +46,7 @@ require (
4746
github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
4847
github.com/beorn7/perks v1.0.1 // indirect
4948
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
49+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5050
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
5151
github.com/davecgh/go-spew v1.1.1 // indirect
5252
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect

src/config/config_impl.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,20 @@ func validateYamlKeys(fileName string, config_map map[interface{}]interface{}) {
236236
for k, v := range config_map {
237237
if _, ok := k.(string); !ok {
238238
errorText := fmt.Sprintf("config error, key is not of type string: %v", k)
239-
logger.Debugf(errorText)
239+
logger.Debug(errorText)
240240
panic(newRateLimitConfigError(fileName, errorText))
241241
}
242242
if _, ok := validKeys[k.(string)]; !ok {
243243
errorText := fmt.Sprintf("config error, unknown key '%s'", k)
244-
logger.Debugf(errorText)
244+
logger.Debug(errorText)
245245
panic(newRateLimitConfigError(fileName, errorText))
246246
}
247247
switch v := v.(type) {
248248
case []interface{}:
249249
for _, e := range v {
250250
if _, ok := e.(map[interface{}]interface{}); !ok {
251251
errorText := fmt.Sprintf("config error, yaml file contains list of type other than map: %v", e)
252-
logger.Debugf(errorText)
252+
logger.Debug(errorText)
253253
panic(newRateLimitConfigError(fileName, errorText))
254254
}
255255
element := e.(map[interface{}]interface{})
@@ -268,7 +268,7 @@ func validateYamlKeys(fileName string, config_map map[interface{}]interface{}) {
268268
case nil:
269269
default:
270270
errorText := "error checking config"
271-
logger.Debugf(errorText)
271+
logger.Debug(errorText)
272272
panic(newRateLimitConfigError(fileName, errorText))
273273
}
274274
}
@@ -571,7 +571,7 @@ func ConfigFileContentToYaml(fileName, content string) *YamlRoot {
571571
err := yaml.Unmarshal([]byte(content), &any)
572572
if err != nil {
573573
errorText := fmt.Sprintf("error loading config file: %s", err.Error())
574-
logger.Debugf(errorText)
574+
logger.Debug(errorText)
575575
panic(newRateLimitConfigError(fileName, errorText))
576576
}
577577
validateYamlKeys(fileName, any)
@@ -580,7 +580,7 @@ func ConfigFileContentToYaml(fileName, content string) *YamlRoot {
580580
err = yaml.Unmarshal([]byte(content), &root)
581581
if err != nil {
582582
errorText := fmt.Sprintf("error loading config file: %s", err.Error())
583-
logger.Debugf(errorText)
583+
logger.Debug(errorText)
584584
panic(newRateLimitConfigError(fileName, errorText))
585585
}
586586

src/memcached/cache_impl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func newMemcachedFromSrv(srv string, d time.Duration, resolver srv.SrvResolver)
229229
err := refreshServers(serverList, srv, resolver)
230230
if err != nil {
231231
errorText := "Unable to fetch servers from SRV"
232-
logger.Errorf(errorText)
232+
logger.Error(errorText)
233233
panic(MemcacheError(errorText))
234234
}
235235

src/server/health.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (hc *HealthChecker) Fail(componentName string) error {
9797
hc.grpc.SetServingStatus(hc.name, healthpb.HealthCheckResponse_NOT_SERVING)
9898
} else {
9999
errorText := fmt.Sprintf("Invalid component: %s", componentName)
100-
logger.Errorf(errorText)
100+
logger.Error(errorText)
101101
return errors.New(errorText)
102102
}
103103
return nil
@@ -118,7 +118,7 @@ func (hc *HealthChecker) Ok(componentName string) error {
118118
}
119119
} else {
120120
errorText := fmt.Sprintf("Invalid component: %s", componentName)
121-
logger.Errorf(errorText)
121+
logger.Error(errorText)
122122
return errors.New(errorText)
123123
}
124124

src/srv/srv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func ParseSrv(srv string) (string, string, string, error) {
2424
matches := srvRegex.FindStringSubmatch(srv)
2525
if matches == nil {
2626
errorText := fmt.Sprintf("could not parse %s to SRV parts", srv)
27-
logger.Errorf(errorText)
27+
logger.Error(errorText)
2828
return "", "", "", errors.New(errorText)
2929
}
3030
return matches[1], matches[2], matches[3], nil

0 commit comments

Comments
 (0)