Skip to content

Commit b634119

Browse files
authored
Merge pull request #125 from scribd/laynax/SERF-3477/go123
[SERF-3477] Upgrade to Golang version 1.23.0
2 parents 394cfa3 + 251ae41 commit b634119

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build stage
33
# =============================================================================
44

5-
FROM golang:1.22.2-alpine AS builder
5+
FROM golang:1.23.0-alpine AS builder
66

77
WORKDIR /sdk
88

@@ -33,15 +33,15 @@ FROM builder AS linter
3333

3434
# binary will be $(go env GOPATH)/bin/golangci-lint
3535
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
36-
| sh -s -- -b $(go env GOPATH)/bin v1.57.2
36+
| sh -s -- -b $(go env GOPATH)/bin v1.60.1
3737

3838
# install goimports
39-
RUN go install golang.org/x/tools/cmd/goimports@v0.17.0
39+
RUN go install golang.org/x/tools/cmd/goimports@v0.24.0
4040

4141
# =============================================================================
4242
# development stage
4343
# =============================================================================
4444

4545
FROM linter AS development
4646

47-
RUN go install github.com/go-delve/delve/cmd/dlv@v1.22.0
47+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.23.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ SDK, the Go version.
6666

6767
## Prerequisites
6868

69-
* [Go](https://golang.org) (version `1.22.2`).
69+
* [Go](https://golang.org) (version `1.23.0`).
7070
* [Docker](https://www.docker.com/) (version `19.03.2`).
7171

7272
## SDK functionality
@@ -1699,7 +1699,7 @@ You can enter the docker environment to build, run and debug your service:
16991699
```
17001700
$ docker-compose run --rm sdk /bin/bash
17011701
root@1f31fa8e5c49:/sdk# go version
1702-
go version go1.22.2 linux/amd64
1702+
go version go1.23.0 linux/amd64
17031703
```
17041704

17051705
Refer to the

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/scribd/go-sdk
22

3-
go 1.22
3+
go 1.23
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.0

pkg/middleware/request_id.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func NewRequestIDMiddleware() RequestIDMiddleware {
2323
}
2424

2525
// Handler implements the middlewares.Handlerer interface. Returns an
26-
// http.Hanlder to inject the RequestID.
26+
// http.Handler to inject the RequestID.
2727
func (rm RequestIDMiddleware) Handler(next http.Handler) http.Handler {
2828
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2929
requestID := r.Header.Get(RequestIDHeader)

0 commit comments

Comments
 (0)