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

Commit

Permalink
chore: Update EDV provider dependency, fix Go module error
Browse files Browse the repository at this point in the history
Resolves the go module issues from the previous commit by:

* Updated the component/storage/edv dependency
* Updated golintci version

Signed-off-by: Derek Trider <Derek.Trider@securekey.com>
  • Loading branch information
Derek Trider committed Oct 26, 2022
1 parent b807371 commit 69bcab5
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 19 deletions.
37 changes: 37 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,34 @@ 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

issues:
exclude-use-default: false
Expand All @@ -114,6 +146,11 @@ issues:
- dupl
- funlen
- gomnd
- maintidx
- gomnd
- usestdlibvars
- testableexamples
- stylecheck
- path: example_[^\/]*_test\.go
linters:
- dupl
Expand Down
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ require (
github.com/google/tink/go v1.7.0
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.7.3
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.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/ursa-wrapper-go v0.3.1
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
github.com/kawamuray/jsonpath v0.0.0-20201211160320-7483bafabd7e
Expand Down Expand Up @@ -50,7 +50,6 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/klauspost/compress v1.10.0 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
Expand Down
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4ea
github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down Expand Up @@ -65,12 +64,12 @@ 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/component/storageutil v0.0.0-20220322085443-50e8f9bd208b h1:IoD7+sHQRLMouwHjhrOj5vhg+rPt/aKl4P+WiBZVHVk=
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b/go.mod h1:yLgRpVlZ2heeeOpTgvEnG/yHL9q1keUu5ILQ6s2qpLU=
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4 h1:BHrpm0TjGP0oltbQ901VsXF01CH5P2VyHaXTW68eg6I=
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI=
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221025204933-b807371b6f1e h1:SxbXlF39661T9w/L9PhVdtbJfJ51Pm4JYEEW6XfZHEQ=
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221025204933-b807371b6f1e/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI=
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220428211718-66cc046674a1 h1:vxZ0DlFNLjgxMdBESLZu895AsI1JWL2SJerphwIn8Po=
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 All @@ -91,7 +90,6 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
Expand Down
2 changes: 1 addition & 1 deletion pkg/crypto/tinkcrypto/unwrap_support_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func Test_ExtractPrivKey(t *testing.T) {
"google.crypto.tink.AesGcmKey'")

require.PanicsWithValue(t, "keyset.Handle: keyset must be non nil", func() {
_, _ = extractPrivKey(&keyset.Handle{})
_, _ = extractPrivKey(&keyset.Handle{}) //nolint:errcheck // Expected to panic
})

badPrivateKeyProto := generateECDHAEADPrivateKey(t, commonpb.EllipticCurveType_CURVE25519, // <-- invalid EC curve
Expand Down
7 changes: 0 additions & 7 deletions pkg/didcomm/protocol/mediator/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ func TestServiceHandleOutbound(t *testing.T) {
id := <-msgID
require.NoError(t, svc.saveGrant(generateGrantMsgPayload(t, id)))
}()

thing, err := svc.HandleOutbound(service.NewDIDCommMsgMap(&Request{
ID: uuid.New().String(),
Type: RequestMsgType,
}), MYDID, THEIRDID)
require.NoError(t, err)
println(thing)
})

t.Run("rejects invalid msg types", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/store/connection/connection_recorder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
)

func Test_NewConnectionRecorder(t *testing.T) {
t.Run("create create new recorder - success", func(t *testing.T) {
t.Run("create new recorder - success", func(t *testing.T) {
recorder, err := NewRecorder(&mockProvider{})
require.NoError(t, err)
require.NotNil(t, recorder)
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set -e
echo "Running $0"

DOCKER_CMD=${DOCKER_CMD:-docker}
GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.39.0"
GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.50.1"

if [ ! $(command -v ${DOCKER_CMD}) ]; then
exit 0
Expand Down

0 comments on commit 69bcab5

Please sign in to comment.