diff --git a/Earthfile b/Earthfile index 2c61281..afccf8b 100644 --- a/Earthfile +++ b/Earthfile @@ -1,6 +1,6 @@ VERSION 0.7 -ARG --global BASE_IMAGE=golang:1.20-bookworm +ARG --global BASE_IMAGE=golang:1.21-bookworm FROM $BASE_IMAGE WORKDIR /opt/ctrader @@ -22,7 +22,7 @@ go-build: go-test: ARG INTEGRATION_TEST="false" FROM +go-base - RUN go install github.com/mfridman/tparse@v0.12.2 + RUN go install github.com/mfridman/tparse@v0.13.1 IF [ "$INTEGRATION_TEST" = "true" ] RUN --secret CTRADER_CLIENT_ID --secret CTRADER_SECRET --secret CTRADER_ACCOUNT_ID --secret CTRADER_TOKEN \ go test --tags integration -trimpath -race -cover -covermode=atomic -json ./... | tparse -all -smallscreen @@ -32,8 +32,8 @@ go-test: go-linter: FROM +go-base - RUN go install golang.org/x/vuln/cmd/govulncheck@latest \ - && go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2 + RUN go install golang.org/x/vuln/cmd/govulncheck@v1.0.1 \ + && go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.0 COPY .golangci.yaml . RUN govulncheck ./... \ && golangci-lint run ./... @@ -58,7 +58,7 @@ compile-proto: RUN apt-get update \ && apt-get install --yes --no-install-recommends protobuf-compiler=3.* \ && rm -rf /var/lib/apt/lists/* \ - && go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30.0 + && go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 GIT CLONE --branch 86 https://github.com/spotware/openapi-proto-messages.git openapi-proto-messages RUN cd openapi-proto-messages \ && protoc --go_out=. --go_opt=paths=source_relative *.proto \ diff --git a/go.mod b/go.mod index 298caf0..b995135 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/diegobernardes/ctrader -go 1.20 +go 1.21 require ( github.com/samber/lo v1.38.1 github.com/satori/uuid v1.2.0 github.com/stretchr/testify v1.8.4 - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 + golang.org/x/exp v0.0.0-20231006140011-7918f672742d google.golang.org/protobuf v1.31.0 ) diff --git a/go.sum b/go.sum index d727447..2f0d291 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM= @@ -18,8 +19,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/openapi/OpenApiCommonMessages.pb.go b/openapi/OpenApiCommonMessages.pb.go index 0783006..2fdf925 100644 --- a/openapi/OpenApiCommonMessages.pb.go +++ b/openapi/OpenApiCommonMessages.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: OpenApiCommonMessages.proto diff --git a/openapi/OpenApiCommonModelMessages.pb.go b/openapi/OpenApiCommonModelMessages.pb.go index 9c86260..a54437b 100644 --- a/openapi/OpenApiCommonModelMessages.pb.go +++ b/openapi/OpenApiCommonModelMessages.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: OpenApiCommonModelMessages.proto diff --git a/openapi/OpenApiMessages.pb.go b/openapi/OpenApiMessages.pb.go index 9908726..df08cf0 100644 --- a/openapi/OpenApiMessages.pb.go +++ b/openapi/OpenApiMessages.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: OpenApiMessages.proto diff --git a/openapi/OpenApiModelMessages.pb.go b/openapi/OpenApiModelMessages.pb.go index 24818e7..829881a 100644 --- a/openapi/OpenApiModelMessages.pb.go +++ b/openapi/OpenApiModelMessages.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.31.0 // protoc v3.21.12 // source: OpenApiModelMessages.proto