Skip to content

Commit

Permalink
Merge pull request #66 from scribd/laynax/SERF-2293/go-119
Browse files Browse the repository at this point in the history
[SERF-2293] Update Go to v1.19.5
  • Loading branch information
laynax authored Feb 6, 2023
2 parents e2e983c + ad8930a commit a2be732
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 741 deletions.
3 changes: 0 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ run:
linters:
enable:
- bodyclose
- deadcode
- errcheck
- goconst
- gofmt
Expand All @@ -33,12 +32,10 @@ linters:
- lll
- misspell
- staticcheck
- structcheck
- typecheck
- unconvert
- unparam
- unused
- varcheck

linters-settings:
errcheck:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# build stage
# =============================================================================

FROM golang:1.18.5 AS builder
FROM golang:1.19.5 AS builder

WORKDIR /sdk

Expand All @@ -25,7 +25,7 @@ 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.47.3
| sh -s -- -b $(go env GOPATH)/bin v1.51.1

# install goimports
RUN go install golang.org/x/tools/cmd/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ SDK, the Go version.

## Prerequisites

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

## SDK functionality
Expand Down Expand Up @@ -1407,7 +1407,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.18.5 linux/amd64
go version go1.19.5 linux/amd64
```

Refer to the
Expand Down
30 changes: 17 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/scribd/go-sdk

go 1.18
go 1.19

require (
github.com/DATA-DOG/go-txdb v0.1.3
Expand All @@ -16,17 +16,19 @@ require (
github.com/rs/cors v1.7.0
github.com/sirupsen/logrus v1.7.0
github.com/spf13/viper v1.10.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.1
github.com/twmb/franz-go v1.5.2
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
gopkg.in/DataDog/dd-trace-go.v1 v1.39.0
google.golang.org/protobuf v1.28.0
gopkg.in/DataDog/dd-trace-go.v1 v1.47.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

require (
github.com/DataDog/datadog-agent/pkg/obfuscate v0.0.0-20211129110424-6491aa3bf583 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.42.0-rc.1 // indirect
github.com/DataDog/datadog-go/v5 v5.0.2 // indirect
github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect
github.com/DataDog/gostackparse v0.5.0 // indirect
github.com/DataDog/sketches-go v1.2.1 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
Expand All @@ -39,8 +41,7 @@ require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/mux v1.6.2 // indirect
github.com/gorilla/mux v1.7.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
Expand All @@ -54,24 +55,27 @@ require (
github.com/pierrec/lz4/v4 v4.1.14 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tinylib/msgp v1.1.2 // indirect
github.com/tinylib/msgp v1.1.6 // indirect
github.com/twmb/franz-go/pkg/kmsg v1.0.0 // indirect
github.com/twmb/go-rbtree v1.0.0 // indirect
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
golang.org/x/text v0.3.7 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
golang.org/x/net v0.3.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
inet.af/netaddr v0.0.0-20220617031823-097006376321 // indirect
)
Loading

0 comments on commit a2be732

Please sign in to comment.