Resolving conflicts.

cloudspannerecosystem · Jul 25, 2023 · c28fe92 · c28fe92
1 parent 357bed7
commit c28fe92
Show file tree

Hide file tree

Showing 2 changed files with 189 additions and 1,149 deletions.
diff --git a/backend_services/item/go.mod b/backend_services/item/go.mod
@@ -3,96 +3,102 @@ module github.com/cloudspannerecosystem/spanner-gaming-sample/gaming-item-servic
 go 1.19
 
 require (
- cloud.google.com/go/spanner v1.41.0
+ cloud.google.com/go/spanner v1.47.0
  github.com/gin-gonic/gin v1.9.1
  github.com/google/uuid v1.3.0
- github.com/spf13/viper v1.13.0
- github.com/stretchr/testify v1.8.3
- github.com/testcontainers/testcontainers-go v0.14.0
- google.golang.org/api v0.103.0
- google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f
+ github.com/spf13/viper v1.16.0
+ github.com/stretchr/testify v1.8.4
+ github.com/testcontainers/testcontainers-go v0.21.0
+ google.golang.org/api v0.133.0
+ google.golang.org/genproto v0.0.0-20230724170836-66ad5b6ff146
 )
 
 require (
- cloud.google.com/go v0.107.0 // indirect
- cloud.google.com/go/compute v1.15.1 // indirect
+ cloud.google.com/go v0.110.6 // indirect
+ cloud.google.com/go/compute v1.22.0 // indirect
  cloud.google.com/go/compute/metadata v0.2.3 // indirect
- cloud.google.com/go/iam v0.8.0 // indirect
- cloud.google.com/go/longrunning v0.3.0 // indirect
- github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/Microsoft/go-winio v0.6.0 // indirect
- github.com/Microsoft/hcsshim v0.9.6 // indirect
- github.com/bytedance/sonic v1.9.1 // indirect
- github.com/cenkalti/backoff/v4 v4.1.3 // indirect
+ cloud.google.com/go/iam v1.1.1 // indirect
+ cloud.google.com/go/longrunning v0.5.1 // indirect
+ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+ github.com/Microsoft/go-winio v0.6.1 // indirect
+ github.com/Microsoft/hcsshim v0.10.0 // indirect
+ github.com/bytedance/sonic v1.10.0-rc2 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
- github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+ github.com/chenzhuoyu/iasm v0.9.0 // indirect
  github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
- github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b // indirect
- github.com/containerd/cgroups v1.0.4 // indirect
- github.com/containerd/containerd v1.6.18 // indirect
+ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
+ github.com/containerd/containerd v1.7.2 // indirect
+ github.com/cpuguy83/dockercfg v0.3.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/docker/distribution v2.8.2+incompatible // indirect
- github.com/docker/docker v20.10.24+incompatible // indirect
+ github.com/docker/docker v24.0.5+incompatible // indirect
  github.com/docker/go-connections v0.4.0 // indirect
  github.com/docker/go-units v0.5.0 // indirect
- github.com/envoyproxy/go-control-plane v0.10.3 // indirect
- github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
+ github.com/envoyproxy/go-control-plane v0.11.1 // indirect
+ github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/gabriel-vasile/mimetype v1.4.2 // indirect
  github.com/gin-contrib/sse v0.1.0 // 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.14.0 // indirect
+ github.com/go-playground/validator/v10 v10.14.1 // indirect
  github.com/goccy/go-json v0.10.2 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
  github.com/google/go-cmp v0.5.9 // indirect
- github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
- github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+ github.com/google/s2a-go v0.1.4 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.0 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/imdario/mergo v0.3.16 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+ github.com/klauspost/compress v1.16.7 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.5 // indirect
  github.com/leodido/go-urn v1.2.4 // indirect
- github.com/magiconair/properties v1.8.6 // indirect
+ github.com/magiconair/properties v1.8.7 // indirect
  github.com/mattn/go-isatty v0.0.19 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
- github.com/moby/sys/mount v0.3.3 // indirect
- github.com/moby/sys/mountinfo v0.6.2 // indirect
- github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
+ github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/sys/sequential v0.5.0 // indirect
+ github.com/moby/term v0.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/morikuni/aec v1.0.0 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
- github.com/opencontainers/runc v1.1.5 // indirect
- github.com/pelletier/go-toml v1.9.5 // indirect
- github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+ github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
+ github.com/opencontainers/runc v1.1.8 // indirect
+ github.com/pelletier/go-toml/v2 v2.0.9 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/sirupsen/logrus v1.9.0 // indirect
- github.com/spf13/afero v1.9.2 // indirect
- github.com/spf13/cast v1.5.0 // indirect
+ github.com/sirupsen/logrus v1.9.3 // indirect
+ github.com/spf13/afero v1.9.5 // indirect
+ github.com/spf13/cast v1.5.1 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- github.com/subosito/gotenv v1.4.1 // indirect
+ github.com/subosito/gotenv v1.4.2 // indirect
  github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
  github.com/ugorji/go/codec v1.2.11 // indirect
- go.opencensus.io v0.23.0 // indirect
- golang.org/x/arch v0.3.0 // indirect
- golang.org/x/crypto v0.9.0 // indirect
- golang.org/x/mod v0.8.0 // indirect
- golang.org/x/net v0.10.0 // indirect
- golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
- golang.org/x/sys v0.8.0 // indirect
- golang.org/x/text v0.9.0 // indirect
- golang.org/x/tools v0.6.0 // indirect
+ go.opencensus.io v0.24.0 // indirect
+ golang.org/x/arch v0.4.0 // indirect
+ golang.org/x/crypto v0.11.0 // indirect
+ golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
+ golang.org/x/mod v0.12.0 // indirect
+ golang.org/x/net v0.12.0 // indirect
+ golang.org/x/oauth2 v0.10.0 // indirect
+ golang.org/x/sys v0.10.0 // indirect
+ golang.org/x/text v0.11.0 // indirect
+ golang.org/x/tools v0.11.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/grpc v1.53.0 // indirect
- google.golang.org/protobuf v1.30.0 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20230724170836-66ad5b6ff146 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230724170836-66ad5b6ff146 // indirect
+ google.golang.org/grpc v1.56.2 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
- gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
+ gotest.tools/v3 v3.5.0 // indirect
 )