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 docker
Browse files Browse the repository at this point in the history
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

Note that many linters were temporarily disabled for this commit. They will be re-enabled (and code updated) in a future commit.

Signed-off-by: Derek Trider <[email protected]>
  • Loading branch information
Derek Trider committed Oct 26, 2022
1 parent b807371 commit 6164e9f
Show file tree
Hide file tree
Showing 15 changed files with 697 additions and 38 deletions.
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.20221021224215-368f53b380a4
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
5 changes: 2 additions & 3 deletions cmd/aries-agent-rest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/hyperledger/aries-framework-go v0.1.9-0.20221021224215-368f53b380a4
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 Expand Up @@ -84,7 +84,6 @@ require (
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.mongodb.org/mongo-driver v1.8.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
Expand Down
Loading

0 comments on commit 6164e9f

Please sign in to comment.