Skip to content

Commit

Permalink
Merge pull request #125 from scribd/laynax/SERF-3477/go123
Browse files Browse the repository at this point in the history
[SERF-3477] Upgrade to Golang version 1.23.0
  • Loading branch information
laynax authored Aug 22, 2024
2 parents 394cfa3 + 251ae41 commit b634119
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# build stage
# =============================================================================

FROM golang:1.22.2-alpine AS builder
FROM golang:1.23.0-alpine AS builder

WORKDIR /sdk

Expand Down Expand Up @@ -33,15 +33,15 @@ FROM builder AS linter

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

# install goimports
RUN go install golang.org/x/tools/cmd/goimports@v0.17.0
RUN go install golang.org/x/tools/cmd/goimports@v0.24.0

# =============================================================================
# development stage
# =============================================================================

FROM linter AS development

RUN go install github.com/go-delve/delve/cmd/dlv@v1.22.0
RUN go install github.com/go-delve/delve/cmd/dlv@v1.23.0
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ SDK, the Go version.

## Prerequisites

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

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

Refer to the
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/scribd/go-sdk

go 1.22
go 1.23

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/middleware/request_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func NewRequestIDMiddleware() RequestIDMiddleware {
}

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

0 comments on commit b634119

Please sign in to comment.