From 163943335b88717c1b09d87aaf08a56e5adc8ed3 Mon Sep 17 00:00:00 2001 From: Rolson Quadras Date: Thu, 14 Sep 2023 11:24:07 -0400 Subject: [PATCH] chore: remove unused orb/sidetree docker container (#1426) Signed-off-by: Rolson Quadras --- .github/workflows/build.yml | 1 - docs/build.md | 1 - scripts/check_integration.sh | 5 -- test/bdd/fixtures/.env | 3 -- test/bdd/fixtures/docker-compose.yml | 32 ------------- test/bdd/fixtures/profile/profiles.json | 64 +++++++------------------ 6 files changed, 16 insertions(+), 90 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b0ee946d..7163893ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,6 @@ jobs: go-version: '${{ env.GO_VERSION }}' - name: Run BDD tests run: | - echo '127.0.0.1 testnet.orb.local' | sudo tee -a /etc/hosts echo '127.0.0.1 file-server.trustbloc.local' | sudo tee -a /etc/hosts echo '127.0.0.1 did-resolver.trustbloc.local' | sudo tee -a /etc/hosts echo '127.0.0.1 oidc-provider.example.com' | sudo tee -a /etc/hosts diff --git a/docs/build.md b/docs/build.md index 8c6bf0252..c48a9eda9 100644 --- a/docs/build.md +++ b/docs/build.md @@ -33,7 +33,6 @@ make bdd-test To run BDD tests (`make bdd-test`) you need to modify your hosts file (`/etc/hosts` on \*NIX) to add the following lines, to allow a few of the bdd test containers to be connected to externally. - 127.0.0.1 testnet.orb.local 127.0.0.1 vault.kms.example.com 127.0.0.1 metrics.example.com 127.0.0.1 vc-rest-echo.trustbloc.local diff --git a/scripts/check_integration.sh b/scripts/check_integration.sh index 1769f7254..3aec3fce0 100755 --- a/scripts/check_integration.sh +++ b/scripts/check_integration.sh @@ -12,11 +12,6 @@ TAGS=${TAGS:-all} PWD=`pwd` cd test/bdd -echo "--- -Important: for these test to run correctly, you must ensure that your hosts file has the following entries: -127.0.0.1 testnet.orb.local ---- -" echo "Running vcs integration tests with tag=$TAGS" diff --git a/test/bdd/fixtures/.env b/test/bdd/fixtures/.env index 205d89d5c..76ea79c10 100644 --- a/test/bdd/fixtures/.env +++ b/test/bdd/fixtures/.env @@ -45,9 +45,6 @@ MONGODB_IMAGE=mongo MONGODB_IMAGE_TAG=4.0.0 MONGODB_PORT=27017 -# sidetree -SIDETREE_MOCK_IMAGE=ghcr.io/trustbloc-cicd/sidetree-mock -SIDETREE_MOCK_IMAGE_TAG=0.7.0-snapshot-1a17931 # API gateway and OAuth provider KRAKEND_IMAGE_TAG=2.1.3 diff --git a/test/bdd/fixtures/docker-compose.yml b/test/bdd/fixtures/docker-compose.yml index 1c08f925a..a0a29edca 100644 --- a/test/bdd/fixtures/docker-compose.yml +++ b/test/bdd/fixtures/docker-compose.yml @@ -17,7 +17,6 @@ services: - VC_REST_API_GATEWAY_URL=https://api-gateway.trustbloc.local:5566 - VC_REST_HOST_URL_EXTERNAL=http://vc-rest-echo.trustbloc.local:8075 - VC_REST_PROFILES_FILE_PATH=/profile/profiles.json - - VC_REST_ORB_DOMAIN=testnet.orb.local - DATABASE_TYPE=mongodb - DATABASE_URL=mongodb://mongodb.example.com:27017 - DATABASE_PREFIX=vc_rest_echo_ @@ -52,7 +51,6 @@ services: - "48127:48127" depends_on: - did-resolver.trustbloc.local - - sidetree entrypoint: "" command: /bin/sh -c "sleep 5;vc-rest start" volumes: @@ -125,36 +123,6 @@ services: networks: - bdd_net - sidetree: - container_name: testnet.orb.local - image: ghcr.io/trustbloc-cicd/orb:v1.0.0-rc4-snapshot-780ce20 - restart: always - environment: - - ORB_HOST_URL=0.0.0.0:443 - - ORB_EXTERNAL_ENDPOINT=https://testnet.orb.local - - DID_NAMESPACE=did:orb - - ALLOWED_ORIGINS=https://testnet.orb.local - - CAS_TYPE=local - - ANCHOR_CREDENTIAL_SIGNATURE_SUITE=Ed25519Signature2018 - - DATABASE_TYPE=mem - - ORB_KMS_TYPE=local - - KMSSECRETS_DATABASE_TYPE=mem - - INCLUDE_PUBLISHED_OPERATIONS_IN_METADATA=true - - INCLUDE_UNPUBLISHED_OPERATIONS_IN_METADATA=true - - UNPUBLISHED_OPERATION_STORE_ENABLED=true - - BATCH_WRITER_TIMEOUT=1 - - ORB_TLS_CERTIFICATE=/etc/keys/tls/ec-pubCert.pem - - ORB_TLS_KEY=/etc/keys/tls/ec-key.pem - - ORB_TLS_CACERTS=/etc/keys/tls/ec-cacert.pem - - ORB_TLS_SYSTEMCERTPOOL=true - ports: - - 443:443 - command: start - volumes: - - ./keys/tls:/etc/keys/tls - networks: - - bdd_net - file-server.trustbloc.local: # file server for hosting static resources (e.g. JSON-LD contexts) container_name: file-server.trustbloc.local image: halverneus/static-file-server:latest diff --git a/test/bdd/fixtures/profile/profiles.json b/test/bdd/fixtures/profile/profiles.json index 250928a5d..69c25c8b2 100644 --- a/test/bdd/fixtures/profile/profiles.json +++ b/test/bdd/fixtures/profile/profiles.json @@ -20,9 +20,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -188,9 +186,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -216,9 +212,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -240,9 +234,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -268,9 +260,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -446,9 +436,7 @@ ] } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -474,9 +462,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -498,9 +484,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -522,9 +506,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -546,9 +528,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -570,9 +550,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -594,9 +572,7 @@ } } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -977,9 +953,7 @@ ] } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -1160,9 +1134,7 @@ ] } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -1279,9 +1251,7 @@ ] } }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "issuer": { @@ -1634,9 +1604,7 @@ } ] }, - "createDID": true, - "didDomain": "https://testnet.orb.local", - "didServiceAuthToken": "tk1" + "createDID": true }, { "verifier": {