diff --git a/.npmrc b/.npmrc index 95952809..00bd1e3b 100644 --- a/.npmrc +++ b/.npmrc @@ -6,3 +6,4 @@ @hyperledger:registry=https://npm.pkg.github.com @trustbloc-cicd:registry=https://npm.pkg.github.com +@trustbloc:registry=https://npm.pkg.github.com diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 9b760721..c96eb630 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -24,6 +24,7 @@ jobs: echo '//npm.pkg.github.com/:_authToken=${DOCKER_PASSWORD}' > ~/.npmrc echo '@hyperledger:registry=https://npm.pkg.github.com' >> ~/.npmrc echo '@trustbloc-cicd:registry=https://npm.pkg.github.com' >> ~/.npmrc + echo '@trustbloc:registry=https://npm.pkg.github.com' >> ~/.npmrc make checks env: DOCKER_PASSWORD: $(DOCKER_PASSWORD) @@ -66,6 +67,7 @@ jobs: echo '//npm.pkg.github.com/:_authToken=${DOCKER_PASSWORD}' > ~/.npmrc echo '@hyperledger:registry=https://npm.pkg.github.com' >> ~/.npmrc echo '@trustbloc-cicd:registry=https://npm.pkg.github.com' >> ~/.npmrc + echo '@trustbloc:registry=https://npm.pkg.github.com' >> ~/.npmrc make bdd-test-wallet-web env: DOCKER_USER: $(DOCKER_USER) @@ -96,6 +98,7 @@ jobs: echo '//npm.pkg.github.com/:_authToken=${DOCKER_PASSWORD}' > ~/.npmrc echo '@hyperledger:registry=https://npm.pkg.github.com' >> ~/.npmrc echo '@trustbloc-cicd:registry=https://npm.pkg.github.com' >> ~/.npmrc + echo '@trustbloc:registry=https://npm.pkg.github.com' >> ~/.npmrc make bdd-test-wallet-server env: DOCKER_USER: $(DOCKER_USER) @@ -127,6 +130,7 @@ jobs: echo '//npm.pkg.github.com/:_authToken=${DOCKER_PASSWORD}' > ~/.npmrc echo '@hyperledger:registry=https://npm.pkg.github.com' >> ~/.npmrc echo '@trustbloc-cicd:registry=https://npm.pkg.github.com' >> ~/.npmrc + echo '@trustbloc:registry=https://npm.pkg.github.com' >> ~/.npmrc make wallet-web-docker docker tag docker.pkg.github.com/trustbloc/edge-agent/wallet-web:latest ${WALLET_WEB_PKG}:${WALLET_WEB_TAG} docker push ${WALLET_WEB_PKG}:${WALLET_WEB_TAG} diff --git a/ci/version_var.sh b/ci/version_var.sh index bb768b55..a203f81f 100644 --- a/ci/version_var.sh +++ b/ci/version_var.sh @@ -8,7 +8,7 @@ # Release Parameters BASE_VERSION=0.1.5 -IS_RELEASE=false +IS_RELEASE=true SOURCE_REPO=edge-agent BASE_WALLET_WEB_PKG_NAME=wallet-web diff --git a/cmd/wallet-server/go.mod b/cmd/wallet-server/go.mod index 4fe26367..81754f14 100644 --- a/cmd/wallet-server/go.mod +++ b/cmd/wallet-server/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/cobra v0.0.6 github.com/stretchr/testify v1.6.1 github.com/trustbloc/edge-agent v0.0.0-00010101000000-000000000000 - github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc + github.com/trustbloc/edge-core v0.1.5 ) replace github.com/trustbloc/edge-agent => ../.. @@ -25,6 +25,8 @@ replace github.com/trustbloc/edge-agent => ../.. // Added redirect as a workaround for https://github.com/duo-labs/webauthn/issues/76 replace ( github.com/kilic/bls12-381 => github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 + github.com/trustbloc/edge-core => github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc google.golang.org/grpc => google.golang.org/grpc v1.29.1 google.golang.org/grpc/examples => google.golang.org/grpc/examples v1.29.1 + ) diff --git a/cmd/wallet-server/go.sum b/cmd/wallet-server/go.sum index 1ea7287e..201a843f 100644 --- a/cmd/wallet-server/go.sum +++ b/cmd/wallet-server/go.sum @@ -137,6 +137,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= +github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 h1:yCfXxYaelOyqnia8F/Yng47qhmfC9nKTRIbYRrRueq4= +github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833/go.mod h1:8c4/i2VlovMO2gBnHGQPN5EJw+H0lx1u/5p+cgsXtCk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM= @@ -633,10 +635,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw= github.com/hyperledger/aries-framework-go v0.1.5-0.20201120141223-c70cf578d36b/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130232545-14a7f210c893/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201202081826-f11d5c44d1fb h1:GbE4c+PWz8xZPcZwmKd6jrS8Iwo0j1GJs2UszBbfJTw= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201202081826-f11d5c44d1fb/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201204175718-47143e0eada8/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= +github.com/hyperledger/aries-framework-go v0.1.5 h1:F0QoH+XOTCf5vRR92t1uCSd4hCwXS1cWmc12zyjRqH4= +github.com/hyperledger/aries-framework-go v0.1.5/go.mod h1:oNjiXCfrjQ2souo9eEMxO/+iS2UXl8fk9hQGMMX1K5w= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/igor-pavlenko/httpsignatures-go v0.0.21 h1:qSa8O/Xktnwh3zOdLYL3LFS3ARQ0K4m8JUdC0GJz3bU= github.com/igor-pavlenko/httpsignatures-go v0.0.21/go.mod h1:3LVsCi3evlfQSNDKMTg3uElxEP8SjK3/Q5N9I8GU9W0= @@ -1061,10 +1061,10 @@ github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 h1:VtbBrpzy6rg github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8/go.mod h1:gcwDl9YLyNc3H3wmPXamu+8evD8TYUa6BjTsWnvdn7A= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc h1:sGjZhZKuOB/x4ZUXkrID05RwVYvHDg5fe5BQhhubE0g= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc/go.mod h1:iOoeeW5Jd6/hhEwaK0+lhBstV7yBWzJxckNU21V0+Vg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096 h1:ESB0p3PtPd6zystFIItjAaUSmbuR6vwuY5Vtm7bYdFg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096/go.mod h1:BTLxagWOLIDTqSqZUjdX2kYSBFsiPomf49qkBCVEOvE= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6 h1:fI91UJdL0oJTH6JfRYnojcUKa0OaXvUOfg680st64ts= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6/go.mod h1:tG3K06yehfFMBWPAnr6Xba/PDhlnfH/+b+COCrQUOCs= +github.com/trustbloc/edv v0.1.5 h1:0H55CI+3D+zlUi3Y4XJotqAVhf0rT1UURjDgKIr2b+k= +github.com/trustbloc/edv v0.1.5/go.mod h1:ddp0mjkMZc5gfkVDYvzXTcKuxDT19gT7tl+cbt9S3Hs= +github.com/trustbloc/hub-kms v0.1.5 h1:yQEZSWMlRHAQuiQ17tHwtOfg38HdHzVy5rqPwK5xwmg= +github.com/trustbloc/hub-kms v0.1.5/go.mod h1:rSrGCkW7ozj6xTNk2X3PpN780rwtv4bPrbtkKpEKF74= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= diff --git a/cmd/wallet-web/.npmrc b/cmd/wallet-web/.npmrc index 95952809..00bd1e3b 100644 --- a/cmd/wallet-web/.npmrc +++ b/cmd/wallet-web/.npmrc @@ -6,3 +6,4 @@ @hyperledger:registry=https://npm.pkg.github.com @trustbloc-cicd:registry=https://npm.pkg.github.com +@trustbloc:registry=https://npm.pkg.github.com diff --git a/cmd/wallet-web/package-lock.json b/cmd/wallet-web/package-lock.json index 0e0f175c..58287ba0 100644 --- a/cmd/wallet-web/package-lock.json +++ b/cmd/wallet-web/package-lock.json @@ -1045,10 +1045,10 @@ } } }, - "@trustbloc-cicd/agent-sdk": { - "version": "0.1.5-snapshot-4bbcaab", - "resolved": "https://npm.pkg.github.com/download/@trustbloc-cicd/agent-sdk/0.1.5-snapshot-4bbcaab/02d161e60254fe36822e8136642cc090d82eeda052135786cbef65a69a66c534", - "integrity": "sha512-fFO4FRBKfnraZHXM9ogsOYbAUxkjWMAjUzATzdaXgUjTkzKpAogaaR+CHMsHSCQifiuf9BVEvo10ZDiRRCHVsw==", + "@trustbloc/agent-sdk": { + "version": "0.1.5", + "resolved": "https://npm.pkg.github.com/download/@trustbloc/agent-sdk/0.1.5/29faf3f8f00da04ee53854c97246d9c9552a827b5ea52f7d03a0de204ed06cb9", + "integrity": "sha512-U6H4ALERIY8i/wqyamIGDRUziA0+SIbqJByh1IGYm0lElutdKJWHwOsHCg6IZBWZEkmhQudNHh4jsjCdKJU3/Q==", "requires": { "axios": "0.20.0", "generate-export-aliases": "^1.1.0", diff --git a/cmd/wallet-web/package.json b/cmd/wallet-web/package.json index a6da66df..1248a990 100644 --- a/cmd/wallet-web/package.json +++ b/cmd/wallet-web/package.json @@ -9,7 +9,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@trustbloc-cicd/agent-sdk": "0.1.5-snapshot-4bbcaab", + "@trustbloc/agent-sdk": "0.1.5", "ajv": "^6.12.2", "core-js": "^3.4.3", "credential-handler-polyfill": "^2.1.0", diff --git a/go.mod b/go.mod index a6b2edfe..5dc50e83 100644 --- a/go.mod +++ b/go.mod @@ -12,18 +12,19 @@ require ( github.com/duo-labs/webauthn.io v0.0.0-20200929144140-c031a3e0f95d github.com/google/uuid v1.1.2 github.com/gorilla/sessions v1.2.1 - github.com/hyperledger/aries-framework-go v0.1.5-0.20201207085548-50be5de657ef + github.com/hyperledger/aries-framework-go v0.1.5 github.com/igor-pavlenko/httpsignatures-go v0.0.21 github.com/stretchr/testify v1.6.1 - github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc - github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096 - github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6 + github.com/trustbloc/edge-core v0.1.5 + github.com/trustbloc/edv v0.1.5 + github.com/trustbloc/hub-kms v0.1.5 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 ) // Added redirect as a workaround for https://github.com/duo-labs/webauthn/issues/76 replace ( github.com/kilic/bls12-381 => github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 + github.com/trustbloc/edge-core => github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc google.golang.org/grpc => google.golang.org/grpc v1.29.1 google.golang.org/grpc/examples => google.golang.org/grpc/examples v1.29.1 ) diff --git a/go.sum b/go.sum index f45f67d0..8a188ee4 100644 --- a/go.sum +++ b/go.sum @@ -644,9 +644,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw= github.com/hyperledger/aries-framework-go v0.1.5-0.20201120141223-c70cf578d36b h1:MhwszjbbQXBheiqs+yBbPTRCTy2GTOW+Pkc6cYFa6Sg= github.com/hyperledger/aries-framework-go v0.1.5-0.20201120141223-c70cf578d36b/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130232545-14a7f210c893/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201207085548-50be5de657ef h1:d2hjWNYOtgeO9LxVMWvLk9DaFmmfXWXfRPvIVwTz3UU= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201207085548-50be5de657ef/go.mod h1:oNjiXCfrjQ2souo9eEMxO/+iS2UXl8fk9hQGMMX1K5w= +github.com/hyperledger/aries-framework-go v0.1.5 h1:F0QoH+XOTCf5vRR92t1uCSd4hCwXS1cWmc12zyjRqH4= +github.com/hyperledger/aries-framework-go v0.1.5/go.mod h1:oNjiXCfrjQ2souo9eEMxO/+iS2UXl8fk9hQGMMX1K5w= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/igor-pavlenko/httpsignatures-go v0.0.21 h1:qSa8O/Xktnwh3zOdLYL3LFS3ARQ0K4m8JUdC0GJz3bU= github.com/igor-pavlenko/httpsignatures-go v0.0.21/go.mod h1:3LVsCi3evlfQSNDKMTg3uElxEP8SjK3/Q5N9I8GU9W0= @@ -1063,10 +1062,10 @@ github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 h1:VtbBrpzy6rg github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8/go.mod h1:gcwDl9YLyNc3H3wmPXamu+8evD8TYUa6BjTsWnvdn7A= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc h1:sGjZhZKuOB/x4ZUXkrID05RwVYvHDg5fe5BQhhubE0g= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc/go.mod h1:iOoeeW5Jd6/hhEwaK0+lhBstV7yBWzJxckNU21V0+Vg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096 h1:ESB0p3PtPd6zystFIItjAaUSmbuR6vwuY5Vtm7bYdFg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096/go.mod h1:BTLxagWOLIDTqSqZUjdX2kYSBFsiPomf49qkBCVEOvE= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6 h1:fI91UJdL0oJTH6JfRYnojcUKa0OaXvUOfg680st64ts= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6/go.mod h1:tG3K06yehfFMBWPAnr6Xba/PDhlnfH/+b+COCrQUOCs= +github.com/trustbloc/edv v0.1.5 h1:0H55CI+3D+zlUi3Y4XJotqAVhf0rT1UURjDgKIr2b+k= +github.com/trustbloc/edv v0.1.5/go.mod h1:ddp0mjkMZc5gfkVDYvzXTcKuxDT19gT7tl+cbt9S3Hs= +github.com/trustbloc/hub-kms v0.1.5 h1:yQEZSWMlRHAQuiQ17tHwtOfg38HdHzVy5rqPwK5xwmg= +github.com/trustbloc/hub-kms v0.1.5/go.mod h1:rSrGCkW7ozj6xTNk2X3PpN780rwtv4bPrbtkKpEKF74= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= diff --git a/test/bdd/fixtures/wallet-web/.env b/test/bdd/fixtures/wallet-web/.env index bb0aba0e..8d80e2e8 100644 --- a/test/bdd/fixtures/wallet-web/.env +++ b/test/bdd/fixtures/wallet-web/.env @@ -16,8 +16,8 @@ WALLET_ROUTER_URL=https://edge.router.agent.example.com:10093 WALLET_WEB_IMAGE=docker.pkg.github.com/trustbloc/edge-agent/wallet-web # router image -HUB_ROUTER_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/hub-router -HUB_ROUTER_IMAGE_TAG=0.1.5-snapshot-9ae74bb +HUB_ROUTER_IMAGE=docker.pkg.github.com/trustbloc/hub-router/hub-router +HUB_ROUTER_IMAGE_TAG=0.1.5 # edge Router configurations EDGE_ROUTER_HOST=0.0.0.0 @@ -38,12 +38,12 @@ EDGE_ROUTER2_WEBHOOK_PORT=10064 EDGE_ROUTER2_AUTOACCEPT=true # Sidetree mock -SIDETREE_MOCK_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/sidetree-mock -SIDETREE_MOCK_IMAGE_TAG=0.1.5-snapshot-09e7b37 +SIDETREE_MOCK_IMAGE=docker.pkg.github.com/trustbloc/sidetree-mock/sidetree-mock +SIDETREE_MOCK_IMAGE_TAG=0.1.5 # TrustBloc DID Method configurations -BLOC_DID_METHOD_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/driver-did-trustbloc -BLOC_DID_METHOD_IMAGE_TAG=0.1.5-snapshot-c56f43a +BLOC_DID_METHOD_IMAGE=docker.pkg.github.com/trustbloc/trustbloc-did-method/driver-did-trustbloc +BLOC_DID_METHOD_IMAGE_TAG=0.1.5 # CouchDB configurations COUCHDB_IMAGE=couchdb @@ -53,8 +53,8 @@ COUCHDB_USERNAME=admin COUCHDB_PASSWORD=password # EDV configurations -EDV_REST_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/edv-rest -EDV_REST_IMAGE_TAG=0.1.5-snapshot-a55f317 +EDV_REST_IMAGE=docker.pkg.github.com/trustbloc/edv/edv-rest +EDV_REST_IMAGE_TAG=0.1.5 EDV_HOST=0.0.0.0 EDV_PORT=8072 EDV_DATABASE_TYPE=couchdb @@ -62,8 +62,8 @@ EDV_DATABASE_URL=admin:password@couchdb.example.com:5984 EDV_DATABASE_PREFIX=edv # HUB-AUTH -AUTH_REST_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/auth-rest -AUTH_REST_IMAGE_TAG=0.1.4-snapshot-e904628 +AUTH_REST_IMAGE=docker.pkg.github.com/trustbloc/hub-auth/auth-rest +AUTH_REST_IMAGE_TAG=0.1.5 # OIDC configurations HYDRA_IMAGE_TAG=v1.3.2-alpine @@ -72,8 +72,8 @@ MOCK_BDDTEST_LOGIN_CONSENT_IMAGE=edgeagent/mockbddtestloginconsent MOCK_DEMO_LOGIN_CONSENT_IMAGE=edgeagent/demologinconsent # KMS Configuration -HUB_KMS_IMAGE=docker.pkg.github.com/trustbloc-cicd/snapshot/kms-rest -HUB_KMS_IMAGE_TAG=0.1.5-snapshot-bb45a25 +HUB_KMS_IMAGE=docker.pkg.github.com/trustbloc/hub-kms/kms-rest +HUB_KMS_IMAGE_TAG=0.1.5 HUB_KMS_HOST=0.0.0.0 DEMO_AUTHZ_HUB_KMS_PORT=8076 DEMO_OPS_HUB_KMS_PORT=8075 diff --git a/test/bdd/go.mod b/test/bdd/go.mod index 5b03274b..3c3b79a7 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -14,16 +14,18 @@ require ( github.com/pkg/errors v0.9.1 github.com/tidwall/gjson v1.6.3 github.com/trustbloc/edge-agent v0.0.0 - github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc + github.com/trustbloc/edge-core v0.1.5 gotest.tools/v3 v3.0.2 // indirect ) replace ( github.com/kilic/bls12-381 => github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 github.com/trustbloc/edge-agent => ../.. + github.com/trustbloc/edge-core => github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc // https://github.com/ory/dockertest/issues/208#issuecomment-686820414 golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 // Added redirect as a workaround for https://github.com/duo-labs/webauthn/issues/76 google.golang.org/grpc => google.golang.org/grpc v1.29.1 google.golang.org/grpc/examples => google.golang.org/grpc/examples v1.29.1 + ) diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 50ecabef..62a08ad1 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -141,6 +141,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833 h1:yCfXxYaelOyqnia8F/Yng47qhmfC9nKTRIbYRrRueq4= +github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833/go.mod h1:8c4/i2VlovMO2gBnHGQPN5EJw+H0lx1u/5p+cgsXtCk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM= @@ -614,15 +616,8 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw= github.com/hyperledger/aries-framework-go v0.1.5-0.20201120141223-c70cf578d36b/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201124194436-a37f1c10fd4e h1:QluQFRvFRSYExodztwD1RS6bTRcqGZSjTuRpPCrOek0= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201124194436-a37f1c10fd4e/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130183042-7389efefa5d5 h1:/flWCaHNECLXfj7NABNnKSWLxcktQH7hDdv5Fj43PNQ= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130183042-7389efefa5d5/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130232545-14a7f210c893 h1:cK1lAVgtoWhUJ2vE8OqiIRsdqTxpM0/nkUqUxQ4TOUc= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201130232545-14a7f210c893/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201202081826-f11d5c44d1fb h1:GbE4c+PWz8xZPcZwmKd6jrS8Iwo0j1GJs2UszBbfJTw= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201202081826-f11d5c44d1fb/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= -github.com/hyperledger/aries-framework-go v0.1.5-0.20201204175718-47143e0eada8/go.mod h1:QzlBsH2J303U3r8lJ1jq69ackseH+v5/B9hpCFouBqg= +github.com/hyperledger/aries-framework-go v0.1.5 h1:F0QoH+XOTCf5vRR92t1uCSd4hCwXS1cWmc12zyjRqH4= +github.com/hyperledger/aries-framework-go v0.1.5/go.mod h1:oNjiXCfrjQ2souo9eEMxO/+iS2UXl8fk9hQGMMX1K5w= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/igor-pavlenko/httpsignatures-go v0.0.21 h1:qSa8O/Xktnwh3zOdLYL3LFS3ARQ0K4m8JUdC0GJz3bU= github.com/igor-pavlenko/httpsignatures-go v0.0.21/go.mod h1:3LVsCi3evlfQSNDKMTg3uElxEP8SjK3/Q5N9I8GU9W0= @@ -1017,10 +1012,10 @@ github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8 h1:VtbBrpzy6rg github.com/trustbloc/bls12-381 v0.0.0-20201104214312-31de2a204df8/go.mod h1:gcwDl9YLyNc3H3wmPXamu+8evD8TYUa6BjTsWnvdn7A= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc h1:sGjZhZKuOB/x4ZUXkrID05RwVYvHDg5fe5BQhhubE0g= github.com/trustbloc/edge-core v0.1.5-0.20201126210935-53388acb41fc/go.mod h1:iOoeeW5Jd6/hhEwaK0+lhBstV7yBWzJxckNU21V0+Vg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096 h1:ESB0p3PtPd6zystFIItjAaUSmbuR6vwuY5Vtm7bYdFg= -github.com/trustbloc/edv v0.1.5-0.20201129165709-60c7f39d8096/go.mod h1:BTLxagWOLIDTqSqZUjdX2kYSBFsiPomf49qkBCVEOvE= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6 h1:fI91UJdL0oJTH6JfRYnojcUKa0OaXvUOfg680st64ts= -github.com/trustbloc/hub-kms v0.1.5-0.20201202193117-d87fc7d3bef6/go.mod h1:tG3K06yehfFMBWPAnr6Xba/PDhlnfH/+b+COCrQUOCs= +github.com/trustbloc/edv v0.1.5 h1:0H55CI+3D+zlUi3Y4XJotqAVhf0rT1UURjDgKIr2b+k= +github.com/trustbloc/edv v0.1.5/go.mod h1:ddp0mjkMZc5gfkVDYvzXTcKuxDT19gT7tl+cbt9S3Hs= +github.com/trustbloc/hub-kms v0.1.5 h1:yQEZSWMlRHAQuiQ17tHwtOfg38HdHzVy5rqPwK5xwmg= +github.com/trustbloc/hub-kms v0.1.5/go.mod h1:rSrGCkW7ozj6xTNk2X3PpN780rwtv4bPrbtkKpEKF74= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= @@ -1227,6 +1222,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1304,6 +1300,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.2.0/go.mod h1:IfRCZScioGtypHNTlz3gFk67J8uePVW7uDTBzXuIkhU= @@ -1336,6 +1333,7 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= @@ -1398,6 +1396,7 @@ gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUy gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= @@ -1428,7 +1427,9 @@ gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20180920025451-e3ad64cb4ed3/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/test/wallet-web/.npmrc b/test/wallet-web/.npmrc index 95952809..00bd1e3b 100644 --- a/test/wallet-web/.npmrc +++ b/test/wallet-web/.npmrc @@ -6,3 +6,4 @@ @hyperledger:registry=https://npm.pkg.github.com @trustbloc-cicd:registry=https://npm.pkg.github.com +@trustbloc:registry=https://npm.pkg.github.com diff --git a/test/wallet-web/package-lock.json b/test/wallet-web/package-lock.json index f0179ee2..e55bd4e0 100644 --- a/test/wallet-web/package-lock.json +++ b/test/wallet-web/package-lock.json @@ -1086,10 +1086,10 @@ "fastq": "^1.6.0" } }, - "@trustbloc-cicd/agent-sdk": { - "version": "0.1.5-snapshot-4bbcaab", - "resolved": "https://npm.pkg.github.com/download/@trustbloc-cicd/agent-sdk/0.1.5-snapshot-4bbcaab/02d161e60254fe36822e8136642cc090d82eeda052135786cbef65a69a66c534", - "integrity": "sha512-fFO4FRBKfnraZHXM9ogsOYbAUxkjWMAjUzATzdaXgUjTkzKpAogaaR+CHMsHSCQifiuf9BVEvo10ZDiRRCHVsw==", + "@trustbloc/agent-sdk": { + "version": "0.1.5", + "resolved": "https://npm.pkg.github.com/download/@trustbloc/agent-sdk/0.1.5/29faf3f8f00da04ee53854c97246d9c9552a827b5ea52f7d03a0de204ed06cb9", + "integrity": "sha512-U6H4ALERIY8i/wqyamIGDRUziA0+SIbqJByh1IGYm0lElutdKJWHwOsHCg6IZBWZEkmhQudNHh4jsjCdKJU3/Q==", "requires": { "axios": "0.20.0", "generate-export-aliases": "^1.1.0", @@ -1109,7 +1109,7 @@ "@trustbloc/wallet-web": { "version": "file:../../cmd/wallet-web", "requires": { - "@trustbloc-cicd/agent-sdk": "0.1.5-snapshot-4bbcaab", + "@trustbloc/agent-sdk": "0.1.5", "ajv": "^6.12.2", "core-js": "^3.4.3", "credential-handler-polyfill": "^2.1.0", @@ -2095,6 +2095,31 @@ } } }, + "@trustbloc/agent-sdk": { + "version": "0.1.5", + "resolved": "https://npm.pkg.github.com/download/@trustbloc/agent-sdk/0.1.5/29faf3f8f00da04ee53854c97246d9c9552a827b5ea52f7d03a0de204ed06cb9", + "integrity": "sha512-U6H4ALERIY8i/wqyamIGDRUziA0+SIbqJByh1IGYm0lElutdKJWHwOsHCg6IZBWZEkmhQudNHh4jsjCdKJU3/Q==", + "requires": { + "axios": "0.20.0", + "generate-export-aliases": "^1.1.0", + "minimist": "^1.2.5" + }, + "dependencies": { + "axios": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz", + "integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==", + "requires": { + "follow-redirects": "^1.10.0" + } + }, + "follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", + "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==" + } + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", diff --git a/test/wallet-web/package.json b/test/wallet-web/package.json index d051177c..5ddd6b90 100644 --- a/test/wallet-web/package.json +++ b/test/wallet-web/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "tests for wallet-web vue components", "dependencies": { - "@trustbloc-cicd/agent-sdk": "0.1.5-snapshot-4bbcaab", + "@trustbloc/agent-sdk": "0.1.5", "@trustbloc/wallet-web": "file:../../cmd/wallet-web", "jsonpath": "^1.0.2", "vue": "^2.6.11",