Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update afgo version #73

Merged
merged 1 commit into from
Dec 8, 2021
Merged

chore: update afgo version #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/vct/startcmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ func createKMSAndCrypto(parameters *agentParameters, client *http.Client,
var keystoreURL string

err := getOrInit(cfg, webKeyStoreKey, &keystoreURL, func() (interface{}, error) {
location, _, err := webkms.CreateKeyStore(client, parameters.kmsEndpoint, uuid.New().String(), "")
location, _, err := webkms.CreateKeyStore(client, parameters.kmsEndpoint, uuid.New().String(), "", nil)

return location, err // nolint: wrapcheck
}, syncTimeout)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hyperledger/aries-framework-go v0.1.7
github.com/hyperledger/aries-framework-go v0.1.8-0.20211203093644-b7d189cc06f4
github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20210909220549-ce3a2ee13e22
github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20210909220549-ce3a2ee13e22
github.com/hyperledger/aries-framework-go-ext/component/storage/mysql v0.0.0-20210909220549-ce3a2ee13e22
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,9 @@ github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod h1:WQ
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/hyperledger/aries-framework-go v0.1.7-0.20210421203733-b5dfd703a8fc/go.mod h1:tBgxVOKcNero3QI21iNf3oxxHkgRMDOby937cqHEvW4=
github.com/hyperledger/aries-framework-go v0.1.7-0.20210603210127-e57b8c94e3cf/go.mod h1:h6L+YoXtw90OZrH2IequxukIGwzfSpz8pUueQ9T5KqI=
github.com/hyperledger/aries-framework-go v0.1.7 h1:ZauGEVaBI4GnUDJcmbiCxbG/MHabMXMlAQee1B4nw8E=
github.com/hyperledger/aries-framework-go v0.1.7/go.mod h1:uve8/q23AUnq4EM0vBkEr1lKZRC67q5RcaHXh0ZOt0Y=
github.com/hyperledger/aries-framework-go v0.1.8-0.20211203093644-b7d189cc06f4 h1:UpRmhnvnqMZql8e2bS3HFah7bEUN5h318CLuQiQ7PYs=
github.com/hyperledger/aries-framework-go v0.1.8-0.20211203093644-b7d189cc06f4/go.mod h1:uve8/q23AUnq4EM0vBkEr1lKZRC67q5RcaHXh0ZOt0Y=
github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20210909220549-ce3a2ee13e22 h1:dzRPCOUIU/RKlGSGJsqpBh0uHOjMN4LC/c25fs7nnlE=
github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20210909220549-ce3a2ee13e22/go.mod h1:FtlFhPHMyLORgrPpvWSmEQSNhLiwAQ4V6rqNPfuDj0o=
github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20210909220549-ce3a2ee13e22 h1:bbYkqUivcXWtD+MtHSY9YQC77ezE9kpWlhxNrTG/aUk=
Expand Down
6 changes: 5 additions & 1 deletion scripts/generate_test_keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,8 @@ openssl x509 -req -in ${CERTS_OUTPUT_DIR}/vct.local.csr \
# RFC 4346 Append CA to CERT
cat ${CERTS_OUTPUT_DIR}/trustbloc-dev-ca.crt >> ${CERTS_OUTPUT_DIR}/vct.local.crt

echo "... Done generating test certs"
echo "... Done generating test certs"

#create primary key for kms secret lock
mkdir -p test/bdd/fixtures/vct/keys/kms
openssl rand 32 | base64 | sed 's/+/-/g; s/\//_/g' > test/bdd/fixtures/vct/keys/kms/secret-lock.key
20 changes: 7 additions & 13 deletions test/bdd/fixtures/vct/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,22 @@ services:

vct.kms:
container_name: vct.kms
image: ghcr.io/trustbloc-cicd/kms:0.1.7-snapshot-1221880
image: ghcr.io/trustbloc-cicd/kms:v0.1.8-snapshot-2dff373
restart: always
environment:
- KMS_BASE_URL=http://vct.kms:7878
- KMS_HOST_URL=0.0.0.0:7878
- KMS_HOST=0.0.0.0:7878
- KMS_DATABASE_TYPE=mongodb
- KMS_DATABASE_URL=mongodb://vct.mongodb:27017
- KMS_DATABASE_PREFIX=keystore_
- KMS_PRIMARY_KEY_DATABASE_TYPE=mongodb
- KMS_PRIMARY_KEY_DATABASE_URL=mongodb://vct.mongodb:27017
- KMS_PRIMARY_KEY_DATABASE_PREFIX=kmspk_
- KMS_LOCAL_KMS_DATABASE_TYPE=mongodb
- KMS_LOCAL_KMS_DATABASE_URL=mongodb://vct.mongodb:27017
- KMS_LOCAL_KMS_DATABASE_PREFIX=kmslocal_
- KMS_KEY_MANAGER_STORAGE_TYPE=mongodb
- KMS_KEY_MANAGER_STORAGE_URL=mongodb://vct.mongodb:27017
- KMS_KEY_MANAGER_STORAGE_PREFIX=kmskm_
- KMS_SECRET_LOCK_TYPE=local
- KMS_SECRET_LOCK_KEY_PATH=/etc/kms/secret-lock.key
- KMS_LOG_LEVEL=debug
volumes:
- ./keys/kms:/etc/kms
ports:
- 7878:7878
entrypoint: ""
command: /bin/sh -c "kms-rest start"
command: start
depends_on:
- vct.mongodb
networks:
Expand Down