Skip to content

Commit

Permalink
Merge pull request #842 from nodlesh/feature-afj-bc-enhancements
Browse files Browse the repository at this point in the history
Feature afj/credo backchannel enhancements
  • Loading branch information
nodlesh committed Sep 6, 2024
2 parents 38bbcc9 + 4bb7039 commit 9f098ca
Show file tree
Hide file tree
Showing 58 changed files with 3,068 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .devcontainer/AATH-container/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"dockerfile": "../../aries-test-harness/Dockerfile.dev-harness"
},

"initializeCommand": "docker network inspect aath_network >/dev/null 2>&1 || docker network create aath_network",

"workspaceMount": "source=${localWorkspaceFolder}/aries-test-harness,target=/aries-test-harness,type=bind",

"workspaceFolder": "/aries-test-harness",
Expand Down
2 changes: 2 additions & 0 deletions .devcontainer/ACA-Py-container/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"dockerfile": "../../aries-backchannels/acapy/Dockerfile.dev-acapy-main"
},

"initializeCommand": "docker network inspect aath_network >/dev/null 2>&1 || docker network create aath_network",

"workspaceMount": "source=${localWorkspaceFolder}/aries-backchannels/acapy,target=/aries-backchannels/acapy,type=bind",

"mounts": [
Expand Down
33 changes: 27 additions & 6 deletions .devcontainer/AFJ-container/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"image": "node:18.18-bookworm",
"name": "AFJ Backchannel Dev",
// Use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": {
"context": "../../aries-backchannels",
"dockerFile": "../../aries-backchannels/javascript/Dockerfile.javascript"
},
//"build": {
// "context": "../../aries-backchannels",
// "dockerfile": "../../aries-backchannels/javascript/Dockerfile.dev-javascript"
//},

"initializeCommand": "docker network inspect aath_network >/dev/null 2>&1 || docker network create aath_network",

"workspaceMount": "source=${localWorkspaceFolder}/aries-backchannels/javascript,target=/aries-backchannels/javascript,type=bind",

"workspaceFolder": "/aries-backchannels/javascript",

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"docker-from-docker": "latest"
Expand All @@ -20,6 +26,18 @@
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "uname -a",

"postCreateCommand": "npm install -g typescript && \
yarn install && \
cd server && \
npm install && \
apt-get update -y && \
apt-get install -y software-properties-common apt-transport-https curl build-essential && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
add-apt-repository -y \"deb https://repo.sovrin.org/sdk/deb bionic stable\" && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3B4FE6ACC0B21F32 && \
add-apt-repository -y \"deb http://security.ubuntu.com/ubuntu bionic-security main\" && \
apt-get install -y --allow-unauthenticated libindy",

"runArgs": [
"--network=aath_network",
"--name=acme_agent"
Expand All @@ -30,10 +48,13 @@
// Configure properties specific to VS Code.
"vscode": {
"settings": {
"extensions.verifySignature": false
"extensions.verifySignature": false, // Disable signature verification otherwise installtion takes too long or fails
"typescript.tsdk": "server/node_modules/typescript/lib" // Use workspace version of TypeScript
},
"extensions": [
"dzannotti.vscode-babel-coloring"
"dbaeumer.vscode-eslint", // ESLint extension
"esbenp.prettier-vscode", // Prettier extension
"dzannotti.vscode-babel-coloring" // Babel Coloring extension
]
}
},
Expand Down
74 changes: 74 additions & 0 deletions .devcontainer/Credo-ts-container/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"image": "node:18.18-bookworm",
"name": "Credo Backchannel Dev",
// Use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
//"build": {
// "context": "../../aries-backchannels",
// "dockerfile": "../../aries-backchannels/credo-ts/Dockerfile.dev-credo-ts"
//},

"initializeCommand": "docker network inspect aath_network >/dev/null 2>&1 || docker network create aath_network",

"workspaceMount": "source=${localWorkspaceFolder}/aries-backchannels/credo-ts,target=/aries-backchannels/credo-ts,type=bind",

"workspaceFolder": "/aries-backchannels/credo-ts",

"mounts": [
{ "source": "${localWorkspaceFolder}/aries-backchannels/data", "target": "/aries-backchannels/data", "type": "bind" }
],

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"docker-from-docker": "latest"
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [9020],

"runArgs": [
"--network=aath_network",
"--name=acme_agent_dev"
],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "uname -a",
"postCreateCommand": "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash && \
export NVM_DIR=\"$HOME/.nvm\" && \
[ -s \"$NVM_DIR/nvm.sh\" ] && \\. \"$NVM_DIR/nvm.sh\" && \
[ -s \"$NVM_DIR/bash_completion\" ] && \\. \"$NVM_DIR/bash_completion\" && \
nvm install 20 && \
nvm use 20 && \
npm install -g typescript && \
yarn install && \
cd server && \
npm install && \
apt-get update -y && \
apt-get install -y software-properties-common apt-transport-https curl build-essential && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \
add-apt-repository -y \"deb https://repo.sovrin.org/sdk/deb bionic stable\" && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3B4FE6ACC0B21F32 && \
add-apt-repository -y \"deb http://security.ubuntu.com/ubuntu bionic-security main\" && \
apt-get install -y --allow-unauthenticated libindy",

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
"settings": {
"extensions.verifySignature": false, // Disable signature verification otherwise installtion takes too long or fails
"typescript.tsdk": "server/node_modules/typescript/lib" // Use workspace version of TypeScript
},
"extensions": [
"dbaeumer.vscode-eslint", // ESLint extension
"esbenp.prettier-vscode", // Prettier extension
"dzannotti.vscode-babel-coloring" // Babel Coloring extension
]
}
},


// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
"remoteUser": "root"
}
File renamed without changes.
54 changes: 54 additions & 0 deletions .github/workflows/test-harness-acapy-credo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: test-harness-acapy-credo
# RUNSET_NAME: "ACA-PY to Credo"
# Scope: AIP 1.0
# Exceptions: Revocation
#
# Summary
#
# This runset uses the current main branch of ACA-Py for all of the agents except Bob (holder),
# which uses the master branch of Credo TS. The runset covers all of the AIP 1.0 tests
# except those that are known **not** to work with the Credo TS as the holder,
# notably those that involve revocation.
#
# Current
#
# Most of the tests are running. The tests not passing are being investigated.
#
# *Status Note Updated: 2024.09.06*
#
# End
on:
workflow_dispatch:
defaults:
run:
shell: bash
jobs:
test:
runs-on: ubuntu-latest
env:
LEDGER_URL_CONFIG: "http://localhost:9000"
TAILS_SERVER_URL_CONFIG: "http://localhost:6543"
START_TIMEOUT: 120
steps:
- name: checkout-test-harness
uses: actions/checkout@v4
with:
path: test-harness
- name: run-von-network
uses: ./test-harness/actions/run-von-network
- name: run-indy-tails-server
uses: ./test-harness/actions/run-indy-tails-server
- name: run-test-harness-wo-reports
uses: ./test-harness/actions/run-test-harness-wo-reports
with:
BUILD_AGENTS: "-a acapy-main -a credo"
TEST_AGENTS: "-d acapy-main -b credo"
TEST_SCOPE: "-t @AcceptanceTest -t @AIP10,@RFC0441,@RFC0211,@T001-RFC0453 -t ~@wip -t ~@DIDExchangeConnection -t ~@T004-RFC0211 -t ~@QualifiedDIDs"
REPORT_PROJECT: acapy-b-credo
- name: run-send-gen-test-results-secure
if: ${{ always() }}
uses: ./test-harness/actions/run-send-gen-test-results-secure
with:
REPORT_PROJECT: acapy-b-credo
ADMIN_USER: ${{ secrets.AllureAdminUser }}
ADMIN_PW: ${{ secrets.AllureAdminPW }}
51 changes: 51 additions & 0 deletions .github/workflows/test-harness-ariesvcx-credo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: test-harness-ariesvcx-credo
# RUNSET_NAME: "aries-vcx to credo"
# Scope: AIP 1.0
# Exceptions: Public Dids
#
# Passing tests: @RFC0036,@RFC0037,@RFC0160,@revocation
#
# *Status Note Updated: 2024.09.06*
#
# End
on:
workflow_dispatch:
defaults:
run:
shell: bash
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout-test-harness
uses: actions/checkout@v4
with:
path: test-harness
- name: Docker Login
uses: azure/docker-login@v2
with:
login-server: docker.pkg.github.com
username: $GITHUB_ACTOR
password: ${{ secrets.GITHUB_TOKEN }}
- name: run-von-network
uses: ./test-harness/actions/run-von-network
- name: run-indy-tails-server
uses: ./test-harness/actions/run-indy-tails-server
- name: run-test-harness-wo-reports
uses: ./test-harness/actions/run-test-harness-wo-reports
with:
BUILD_AGENTS: "-a aries-vcx -a credo"
TEST_AGENTS: "-d aries-vcx -b credo"
TEST_SCOPE: "-t @RFC0036,@RFC0037,@RFC0160,@revocation -t ~@T005-HIPE0011 -t ~@T006.1-HIPE0011 -t ~@RFC0025 -t ~@RFC0183 -t ~@RFC0211 -t ~@RFC0434 -t ~@RFC0453 -t ~@wip -t ~@DIDExchangeConnection -t ~@QualifiedDIDs"
REPORT_PROJECT: aries-vcx-b-credo
continue-on-error: true
- uses: actions/upload-artifact@v4
with:
name: agent-logs
path: ./test-harness/.logs/
- name: run-send-gen-test-results-secure
uses: ./test-harness/actions/run-send-gen-test-results-secure
with:
REPORT_PROJECT: aries-vcx-b-credo
ADMIN_USER: ${{ secrets.AllureAdminUser }}
ADMIN_PW: ${{ secrets.AllureAdminPW }}
52 changes: 52 additions & 0 deletions .github/workflows/test-harness-credo-acapy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: test-harness-credo-acapy
# RUNSET_NAME: "Credo to ACA-PY"
# Scope: AIP 1.0
# Exceptions: Proof Proposal
#
# Summary
#
# This runset uses the current master branch of Credo TS for all of the agents except Bob (holder),
# which uses the main branch of ACA-Py. The runset covers all of the AIP 1.0 tests
# except those that are known **not** to work with the Credo TS
#
# Current
#
# All AIP10 tests are currently running.
#
# *Status Note Updated: 2024.09.06*
#
# End
on:
workflow_dispatch:
defaults:
run:
shell: bash
jobs:
test:
runs-on: ubuntu-latest
env:
LEDGER_URL_CONFIG: "http://localhost:9000"
TAILS_SERVER_URL_CONFIG: "http://localhost:6543"
steps:
- name: checkout-test-harness
uses: actions/checkout@v4
with:
path: test-harness
- name: run-von-network
uses: ./test-harness/actions/run-von-network
- name: run-indy-tails-server
uses: ./test-harness/actions/run-indy-tails-server
- name: run-test-harness-wo-reports
uses: ./test-harness/actions/run-test-harness-wo-reports
with:
BUILD_AGENTS: "-a credo -a acapy-main"
TEST_AGENTS: "-d credo -b acapy-main"
TEST_SCOPE: "-t @AcceptanceTest -t ~@wip -t @AIP10,@RFC0211,@T001-RFC0453 -t ~@Transport_NoHttpOutbound -t ~@DIDExchangeConnection -t ~@QualifiedDIDs"
REPORT_PROJECT: credo-b-acapy
- name: run-send-gen-test-results-secure
if: ${{ always() }}
uses: ./test-harness/actions/run-send-gen-test-results-secure
with:
REPORT_PROJECT: credo-b-acapy
ADMIN_USER: ${{ secrets.AllureAdminUser }}
ADMIN_PW: ${{ secrets.AllureAdminPW }}
51 changes: 51 additions & 0 deletions .github/workflows/test-harness-credo-ariesvcx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: test-harness-credo-ariesvcx
# RUNSET_NAME: "credo to aries-vcx"
# Scope: AIP 1.0
# Exceptions: Public Dids, Revocations
#
# Passing tests: @RFC0036,@RFC0037,@RFC0160,@revocation
#
# *Status Note Updated: 2024.09.06*
#
# End
on:
workflow_dispatch:
defaults:
run:
shell: bash
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: checkout-test-harness
uses: actions/checkout@v4
with:
path: test-harness
- name: Docker Login
uses: azure/docker-login@v2
with:
login-server: docker.pkg.github.com
username: $GITHUB_ACTOR
password: ${{ secrets.GITHUB_TOKEN }}
- name: run-von-network
uses: ./test-harness/actions/run-von-network
- name: run-indy-tails-server
uses: ./test-harness/actions/run-indy-tails-server
- name: run-test-harness-wo-reports
uses: ./test-harness/actions/run-test-harness-wo-reports
with:
BUILD_AGENTS: "-a aries-vcx -a credo"
TEST_AGENTS: "-d credo -b aries-vcx"
TEST_SCOPE: "-t @RFC0036,@RFC0037,@RFC0160 -t ~@T003-RFC0160 -t ~@T004-RFC0160 -t ~@revocation -t ~@RFC0025 -t ~@RFC0183 -t ~@RFC0211 -t ~@RFC0434 -t ~@RFC0453 -t ~@wip -t ~@DIDExchangeConnection -t ~@QualifiedDIDs"
REPORT_PROJECT: credo-b-aries-vcx
continue-on-error: true
- uses: actions/upload-artifact@v4
with:
name: agent-logs
path: ./test-harness/.logs/
- name: run-send-gen-test-results-secure
uses: ./test-harness/actions/run-send-gen-test-results-secure
with:
REPORT_PROJECT: credo-b-aries-vcx
ADMIN_USER: ${{ secrets.AllureAdminUser }}
ADMIN_PW: ${{ secrets.AllureAdminPW }}
Loading

0 comments on commit 9f098ca

Please sign in to comment.