Skip to content

Commit

Permalink
[BACK-2679] Resolve dependabot issues
Browse files Browse the repository at this point in the history
- Update to Golang v1.21.3
- Update all backwards-compatible dependencies
- Update go.mod and go.sum
- Update vendor directory
- https://tidepool.atlassian.net/browse/BACK-2679
  • Loading branch information
darinkrauss committed Nov 3, 2023
1 parent d373193 commit 5101c5c
Show file tree
Hide file tree
Showing 3,266 changed files with 997,194 additions and 104,394 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 15 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
sudo: false

dist: jammy

language: go

go:
- 1.20
- 1.21.3

go_import_path: github.com/tidepool-org/platform
services:
- docker

env:
global:
- MONGODB=6.0.8
- MONGOSH=1.10.4
- DIST=jammy
- MONGODB=mongodb-linux-x86_64-ubuntu2204-6.0.10
- MONGOSH=mongosh-2.0.2-linux-x64

cache:
directories:
- $HOME/.cache/go-build

before_install:
- sudo apt-get remove -y mongodb-org mongodb-org-mongos mongodb-org-server mongodb-org-shell mongodb-org-tools
- wget -nv https://repo.mongodb.org/apt/ubuntu/dists/${DIST}/mongodb-org/6.0/multiverse/binary-amd64/mongodb-org-server_${MONGODB}_amd64.deb -O /tmp/mongodb.deb
- wget -nv https://downloads.mongodb.com/compass/mongodb-mongosh_${MONGOSH}_amd64.deb -O /tmp/mongosh.deb
- sudo apt install /tmp/mongodb.deb /tmp/mongosh.deb
- wget https://fastdl.mongodb.org/linux/${MONGODB}.tgz -O /tmp/mongodb.tgz
- tar -xf /tmp/mongodb.tgz
- wget https://downloads.mongodb.com/compass/${MONGOSH}.tgz -O /tmp/mongosh.tgz
- tar -xf /tmp/mongosh.tgz
- mkdir /tmp/data
- /usr/bin/mongod --replSet rs0 --dbpath /tmp/data --bind_ip 127.0.0.1 --logpath ${PWD}/mongod.log &> /dev/null &
- ${PWD}/${MONGODB}/bin/mongod --dbpath /tmp/data --bind_ip 127.0.0.1 --replSet rs0 --logpath ${PWD}/mongod.log &> /dev/null &
- until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done
- /usr/bin/mongosh --host 127.0.0.1 --port 27017 --eval 'rs.initiate(); while (rs.status().startupStatus || (rs.status().hasOwnProperty("myState") && rs.status().myState != 1)) { printjson( rs.status() ); sleep(1000); }; printjson( rs.status() );'
- ${PWD}/${MONGOSH}/bin/mongosh --eval 'rs.initiate(); while (rs.status().startupStatus || (rs.status().hasOwnProperty("myState") && rs.status().myState != 1)) { printjson( rs.status() ); sleep(1000); }; printjson( rs.status() );'

addons:
artifacts:
Expand All @@ -35,12 +38,5 @@ addons:
code_climate:
repo_token: 91ded9b66924acbe830541ab3593daf535f05f7c6db91b5cbd2d26dcf37da0b8

services:
- docker

script:
- make ci-generate ci-build ci-test ci-deploy ci-docker

cache:
directories:
- $HOME/.cache/go-build
2 changes: 1 addition & 1 deletion Dockerfile.auth
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.blob
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.data
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.migrations
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.prescription
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.task
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN apk --no-cache update && \
apk --no-cache upgrade && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tools
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Development
FROM golang:1.21-alpine AS development
FROM golang:1.21.3-alpine AS development
WORKDIR /go/src/github.com/tidepool-org/platform
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repositories && \
echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/main' >> /etc/apk/repositories && \
Expand Down
182 changes: 117 additions & 65 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,107 +3,159 @@ module github.com/tidepool-org/platform
go 1.21

require (
github.com/Shopify/sarama v1.27.0
github.com/Shopify/sarama v1.38.1
github.com/ant0ine/go-json-rest v3.3.2+incompatible
github.com/aws/aws-sdk-go v1.35.3
github.com/aws/aws-sdk-go v1.46.5
github.com/blang/semver v3.5.1+incompatible
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/githubnemo/CompileDaemon v1.4.0
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang/mock v1.6.0
github.com/google/uuid v1.3.0
github.com/google/uuid v1.4.0
github.com/gowebpki/jcs v0.0.0-20210215032300-680d9436c864
github.com/kelseyhightower/envconfig v1.4.0
github.com/mitchellh/go-homedir v1.1.0
github.com/mjibson/esc v0.2.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.10
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/client_golang v1.17.0
github.com/rinchsan/device-check-go v1.2.3
github.com/tidepool-org/clinic/client v0.0.0-20230815132146-bd6c2982ff6d
github.com/tidepool-org/devices/api v0.0.0-20220914225528-c7373eb1babc
github.com/tidepool-org/devices/api v0.0.0-20231103203727-ce2b4cdb630c
github.com/tidepool-org/go-common v0.9.0
github.com/tidepool-org/hydrophone/client v0.0.0-20221219223301-92bd47a8a11c
github.com/urfave/cli v1.22.4
go.mongodb.org/mongo-driver v1.11.1
github.com/tidepool-org/hydrophone/client v0.0.0-20231103204633-7d52c137f9ce
github.com/urfave/cli v1.22.12
go.mongodb.org/mongo-driver v1.12.1
go.uber.org/fx v1.13.1
golang.org/x/crypto v0.12.0
golang.org/x/crypto v0.14.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/oauth2 v0.4.0
golang.org/x/sync v0.2.0
golang.org/x/tools v0.9.3
google.golang.org/grpc v1.53.0
golang.org/x/oauth2 v0.13.0
golang.org/x/sync v0.4.0
golang.org/x/tools v0.14.0
google.golang.org/grpc v1.59.0
gopkg.in/yaml.v2 v2.4.0
syreclabs.com/go/faker v1.2.2
)

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
github.com/CloudyKit/jet/v6 v6.2.0 // indirect
github.com/Joker/jade v1.1.3 // indirect
github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.10.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.2.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.14.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.14.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deepmap/oapi-codegen v1.10.0 // indirect
github.com/deepmap/oapi-codegen v1.16.2 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/go-resiliency v1.4.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/flosch/pongo2/v4 v4.0.2 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.9.1 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.15.5 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.14.0 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/iris-contrib/schema v0.0.6 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kataras/blocks v0.0.8 // indirect
github.com/kataras/golog v0.1.9 // indirect
github.com/kataras/iris/v12 v12.2.7 // indirect
github.com/kataras/pio v0.0.12 // indirect
github.com/kataras/sitemap v0.0.6 // indirect
github.com/kataras/tunnel v0.0.4 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/labstack/echo/v4 v4.11.2 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/mailgun/raymond/v2 v2.0.48 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/radovskyb/watcher v1.0.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/schollz/closestmatch v2.1.0+incompatible // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tdewolff/minify/v2 v2.20.0 // indirect
github.com/tdewolff/parse/v2 v2.7.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
github.com/xdg/stringprep v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/xdg/scram v1.0.5 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
github.com/yosssi/ace v0.0.5 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.opencensus.io v0.22.4 // indirect
go.uber.org/atomic v1.5.0 // indirect
go.uber.org/dig v1.10.0 // indirect
go.uber.org/multierr v1.4.0 // indirect
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
go.uber.org/zap v1.13.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect
gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/arch v0.5.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
)

replace gopkg.in/fsnotify.v1 v1.4.7 => gopkg.in/fsnotify/fsnotify.v1 v1.4.7
Loading

0 comments on commit 5101c5c

Please sign in to comment.