Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
feat: Update EDV provider dependency, update golintci, update go dock…
Browse files Browse the repository at this point in the history
…er (#3418)

Resolves some go module issues that appeared from the previous commit.

Changes include:

* Updated the component/storage/edv dependency
* Updated golintci version
* Updated Golang docker version for building images
* Fix for BBS interop tests

Note that many linters were disabled for this commit. Some (most?) of them should be re-enabled (and code updated) in a future commit.

Signed-off-by: Derek Trider <[email protected]>

Signed-off-by: Derek Trider <[email protected]>
  • Loading branch information
Derek Trider authored Oct 28, 2022
1 parent b807371 commit a755fd8
Show file tree
Hide file tree
Showing 27 changed files with 852 additions and 564 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bbs-interop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
timeout-minutes: 10
steps:

- name: Setup Go 1.16
- name: Setup Go 1.19
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.19
id: go

- name: Setup Node.js
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*.so
*.dylib
*.wasm
wasm_exec.js
cmd/aries-js-worker/src/wasm_exec.js
cmd/aries-agent-rest/aries-agent-rest

# Editor and go temporary files & folders
Expand Down
42 changes: 42 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ linters-settings:
linters:
enable-all: true
disable:
- nolintlint
- varnamelen
- tenv
- tagliatelle
- testpackage
- maligned
- prealloc
Expand All @@ -105,6 +109,37 @@ linters:
- makezero # TODO enable
- wrapcheck # TODO enable
- thelper # TODO enable
- usestdlibvars
- testableexamples
- stylecheck
- nosnakecase
- gci
- staticcheck
- nonamedreturns
- nilnil
- ireturn
- gomnd
- gosimple
- errchkjson
- errname
- dupword
- interfacebloat
- forcetypeassert
- exhaustruct
- contextcheck
- containedctx
- bodyclose
- revive
- gosec
- gofumpt
- gofmt
- gocritic
- goimports
- gocognit
- forbidigo
- nosprintfhostport
- typecheck
- maintidx

issues:
exclude-use-default: false
Expand All @@ -114,6 +149,13 @@ issues:
- dupl
- funlen
- gomnd
- maintidx
- gomnd
- usestdlibvars
- testableexamples
- stylecheck
- typecheck
- maintidx
- path: example_[^\/]*_test\.go
linters:
- dupl
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ WEBHOOK_IMAGE_NAME ?= sample-webhook
# Tool commands (overridable)
DOCKER_CMD ?= docker
GO_CMD ?= go
ALPINE_VER ?= 3.12
ALPINE_VER ?= 3.16
GO_TAGS ?=
GO_VER ?= 1.16
GO_VER ?= 1.19.2
PROJECT_ROOT = github.com/hyperledger/aries-framework-go
GOBIN_PATH=$(abspath .)/build/bin
MOCKGEN=$(GOBIN_PATH)/mockgen
Expand Down
6 changes: 3 additions & 3 deletions cmd/aries-agent-mobile/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ go 1.19

require (
github.com/google/uuid v1.3.0
github.com/hyperledger/aries-framework-go v0.1.8-0.20220322085443-50e8f9bd208b
github.com/hyperledger/aries-framework-go v0.1.9-0.20221025204933-b807371b6f1e
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221025204933-b807371b6f1e
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220428211718-66cc046674a1
github.com/piprate/json-gold v0.4.2
github.com/stretchr/testify v1.8.1
Expand All @@ -31,7 +31,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/tink/go v1.7.0 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect
github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
github.com/kawamuray/jsonpath v0.0.0-20201211160320-7483bafabd7e // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/aries-agent-mobile/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 h1:0eViCGmXbpvaAKeKT2qB6cL32OrylpITbMqkU8hYtt0=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4/go.mod h1:a3TmS+PiGf2QahOGjWJHxBaMc1AUYqtl1PiUhM2ie7I=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8=
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220428211718-66cc046674a1 h1:vxZ0DlFNLjgxMdBESLZu895AsI1JWL2SJerphwIn8Po=
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220428211718-66cc046674a1/go.mod h1:lykx3N+GX+sAWSxO2Ycc4Dz+ynV9b0Fv4NdP+ms4Alc=
github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA=
Expand Down
6 changes: 3 additions & 3 deletions cmd/aries-agent-rest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ go 1.19
require (
github.com/cenkalti/backoff/v4 v4.1.2
github.com/gorilla/mux v1.7.3
github.com/hyperledger/aries-framework-go v0.1.9-0.20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go v0.1.9-0.20221025204933-b807371b6f1e
github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20220322085443-50e8f9bd208b
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221025204933-b807371b6f1e
github.com/rs/cors v1.7.0
github.com/spf13/cobra v1.0.0
github.com/stretchr/testify v1.8.1
Expand All @@ -35,7 +35,7 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/tink/go v1.7.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect
github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions cmd/aries-agent-rest/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ github.com/hyperledger/aries-framework-go-ext/component/storage/mysql v0.0.0-202
github.com/hyperledger/aries-framework-go-ext/component/storage/mysql v0.0.0-20220629202442-ce8776c10037/go.mod h1:0VNWYQ937z51P4usiHUPz0MImh8tsKEVsHVmAx2z5zA=
github.com/hyperledger/aries-framework-go-ext/component/storage/postgresql v0.0.0-20220629202442-ce8776c10037 h1:fQJPZ8kXsCSfCUHyK6zsR1RYwYP2Xz+jSaOlj+Lm1MY=
github.com/hyperledger/aries-framework-go-ext/component/storage/postgresql v0.0.0-20220629202442-ce8776c10037/go.mod h1:35iXtsPH1PImVDq8xFHETtrcvyHhJXKcvf82YJ6/z4k=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 h1:0eViCGmXbpvaAKeKT2qB6cL32OrylpITbMqkU8hYtt0=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4/go.mod h1:a3TmS+PiGf2QahOGjWJHxBaMc1AUYqtl1PiUhM2ie7I=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU=
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8=
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k=
github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA=
github.com/hyperledger/ursa-wrapper-go v0.3.1/go.mod h1:nPSAuMasIzSVciQo22PedBk4Opph6bJ6ia3ms7BH/mk=
Expand Down
28 changes: 15 additions & 13 deletions cmd/aries-js-worker/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,43 @@ go 1.19

require (
github.com/google/uuid v1.3.0
github.com/hyperledger/aries-framework-go v0.1.9-0.20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go/component/storage/indexeddb v0.1.8-0.20220322085443-50e8f9bd208b
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go v0.1.9-0.20221025204933-b807371b6f1e
github.com/hyperledger/aries-framework-go/component/storage/indexeddb v0.0.0-20221025204933-b807371b6f1e
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221025204933-b807371b6f1e
github.com/mitchellh/mapstructure v1.5.0
github.com/stretchr/testify v1.8.1
)

require (
github.com/PaesslerAG/gval v1.1.0 // indirect
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
github.com/VictoriaMetrics/fastcache v1.5.7 // indirect
github.com/VictoriaMetrics/fastcache v1.12.0 // indirect
github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 // indirect
github.com/btcsuite/btcd v0.22.0-beta // indirect
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
github.com/cenkalti/backoff/v4 v4.0.2 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/tink/go v1.7.0 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 // indirect
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b // indirect
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20221025204933-b807371b6f1e // indirect
github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/kawamuray/jsonpath v0.0.0-20201211160320-7483bafabd7e // indirect
github.com/kilic/bls12-381 v0.1.1-0.20210503002446-7b7597926c69 // indirect
github.com/klauspost/compress v1.10.0 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/klauspost/cpuid/v2 v2.1.2 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.1.0 // indirect
github.com/multiformats/go-multibase v0.1.1 // indirect
github.com/multiformats/go-multihash v0.0.13 // indirect
github.com/multiformats/go-varint v0.0.5 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-varint v0.0.6 // indirect
github.com/piprate/json-gold v0.4.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -63,6 +64,7 @@ require (
golang.org/x/sys v0.1.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
nhooyr.io/websocket v1.8.3 // indirect
)

Expand Down
Loading

0 comments on commit a755fd8

Please sign in to comment.