Banking-app defines its own constitution #53

ross-p-smith · 2022-11-24T16:02:08Z

Quite a few changes here for what should have been a simple change.

Why the change

The Banking Sample should define its own constitution rather than copying files over the top of /opt/ccf/bin. We need a change to ccf for this which wont be until v3 microsoft/CCF#4628. This will be updated with #60

The following changes have been made to make the constitution more testable.

Moved the bulk of the scripts to a new folder called scripts
Added make recipes for testing enclave and virtual in docker (see make help)
Ensure test.sh executes irrespective of the hosting model (sandbox/docker)

Todo (in separate PR)

Move config and dockerfile into sample folder
Fix up the path jumping that you have to do for the certs
Find a better way to kill the python process

Test this PR

make test - this should build the app, start the sandbox, run the tests, kill the sandbox
make test-docker-virtual - this will build the app, build a docker image, start the network, setup the governance and then run the tests

…/tree/example_apps (microsoft#7) The repo was originally forked from https://github.com/microsoft/ccf-app-template Co-authored-by: Takuro Sato <takurosato@microsoft.com>

* Remove unused codes * Fix failed CI Co-authored-by: Takuro Sato <takurosato@microsoft.com>

* Update README.md * Fix README.md Co-authored-by: Takuro Sato <takurosato@microsoft.com>

* Add 'why ccf' section * Add application claim for transfer API * Update banking-app/README.md Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Update banking-app/README.md Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Update banking-app/test.sh Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Update banking-app/README.md Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Update banking-app/test.sh Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Add 'Get claim' endpoint * Update /receipt so that the response includes the expanded claim * Update banking-app/src/endpoints/banking.ts Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Update banking-app/src/endpoints/banking.ts Co-authored-by: Amaury Chamayou <amaury@xargs.fr> * Remove /claim Co-authored-by: Takuro Sato <takurosato@microsoft.com> Co-authored-by: Amaury Chamayou <amaury@xargs.fr>

Co-authored-by: Takuro Sato <takurosato@microsoft.com>

* Add features to devcontainer * npm install at container creation

* Run tests in CI * Tidy up Co-authored-by: Takuro Sato <takurosato@microsoft.com>

* Add linting * Fix 'detected dubious ownership in repository' error * See if CI fails as expected * Revert "See if CI fails as expected" This reverts commit 4570982. Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Co-authored-by: Takuro Sato <79583855+takuro-sato@users.noreply.github.com>

* Added guide about board * Typos

* Add simple make commands * Add initial devcontainer build * Adding workflow-dispatch to test * workflow_dispatch * Add Safe Directory * Pass GITHUB_WORKSPACE environment variable * Added image that can use virtual * Makefile per sample * Amended CI * Removed the banking-app clean from the root Co-authored-by: Takuro Sato <79583855+takuro-sato@users.noreply.github.com>

…oft#40) * Split demo.sh into demo_governance.sh and demo_application.sh * add more comments * remove the extra echo line * resolve review comments

docker/ccf_app_js.virtual

banking-app/test_docker.sh

.devcontainer.json

banking-app/test_docker.sh

takuro-sato · 2022-11-28T11:29:25Z

Could you raise an issue to make the same change for auditable-logging-app?

ross-p-smith · 2022-11-29T09:00:38Z

Could you raise an issue to make the same change for auditable-logging-app?

#57

banking-app/Makefile

banking-app/scripts/start_docker.sh

julioalex-rezende

Open to discuss any of the raised comments for a better alignment if necessary.

banking-app/scripts/setup_governance.sh

banking-app/scripts/start_docker.sh

banking-app/scripts/test.sh

config/cchost_config_virtual_js.json

Aymalla

LGTM, Just one comment

banking-app/Makefile

ross-p-smith · 2022-11-30T14:17:02Z

Fixes #48

takuro-sato and others added 23 commits October 5, 2022 22:29

Copy banking-app from https://github.com/takuro-sato/ccf-app-template…

81a84dd

…/tree/example_apps (microsoft#7) The repo was originally forked from https://github.com/microsoft/ccf-app-template Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Remove unused codes (microsoft#9)

5a1dc33

* Remove unused codes * Fix failed CI Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Update README.md (microsoft#10)

60990e6

* Update README.md * Fix README.md Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Clean up (microsoft#13)

d0a38b5

Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Add features to devcontainer (microsoft#16)

514d121

* Add features to devcontainer * npm install at container creation

Run tests in CI with virtual mode (microsoft#19)

3454644

* Run tests in CI * Tidy up Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Added guidelines for running tests (microsoft#21)

1b754b4

Add linting (microsoft#20)

1af9f52

* Add linting * Fix 'detected dubious ownership in repository' error * See if CI fails as expected * Revert "See if CI fails as expected" This reverts commit 4570982. Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Add back 'Open in GitHub Codespaces' button (microsoft#22)

2e3c941

Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Use docker image that can use virtual (microsoft#25)

955b364

Co-authored-by: Takuro Sato <takurosato@microsoft.com>

Create the user certs as part of the demo (microsoft#34)

eeded36

Co-authored-by: Takuro Sato <79583855+takuro-sato@users.noreply.github.com>

GitHub Collaboration (microsoft#36)

28e1964

* Added guide about board * Typos

Created set_js_app.json for governance (microsoft#33)

3c36c9a

Split demo.sh into demo_governance.sh and demo_application.sh (micros…

ba6f72c

…oft#40) * Split demo.sh into demo_governance.sh and demo_application.sh * add more comments * remove the extra echo line * resolve review comments

Initial banking sample constitution

7a144cd

Merge branch 'main' into ross/constitution

0f17495

WIP: governance in docker

14c34bc

Working End to end

f6a5e41

Updated start-host

112ca8a

Add more comments

a3b636a

package.lock.json was deleted

742b944

ross-p-smith requested review from Aymalla, julioalex-rezende and takuro-sato November 24, 2022 16:02

Copy a temp sandbox.sh to /opt/ccf/bin

2d9c839

Aymalla reviewed Nov 24, 2022

View reviewed changes

docker/ccf_app_js.virtual Show resolved Hide resolved

julioalex-rezende reviewed Nov 25, 2022

View reviewed changes

banking-app/test_docker.sh Outdated Show resolved Hide resolved

banking-app/test_docker.sh Outdated Show resolved Hide resolved

Now called Constitution-dir

111ca4a

Add enclave into teh docker makefile

ca8ef43

takuro-sato reviewed Nov 28, 2022

View reviewed changes

.devcontainer.json Show resolved Hide resolved

banking-app/test_docker.sh Outdated Show resolved Hide resolved

ross-p-smith added 2 commits November 28, 2022 12:59

Test the enclave as well as virtual

b7bc0f6

Single Test Script

2d4d4df

ross-p-smith requested review from Aymalla, julioalex-rezende and takuro-sato November 28, 2022 18:29

ross-p-smith and others added 2 commits November 29, 2022 00:36

Merge branch 'main' into ross/constitution

a9a4d3d

Paths for CI

f3cbe42

takuro-sato reviewed Nov 29, 2022

View reviewed changes

banking-app/Makefile Outdated Show resolved Hide resolved

takuro-sato reviewed Nov 29, 2022

View reviewed changes

banking-app/scripts/start_docker.sh Outdated Show resolved Hide resolved

julioalex-rezende requested changes Nov 29, 2022

View reviewed changes

ross-p-smith added 2 commits November 29, 2022 16:03

Use a trap to stop the sandbox/docker image

f93fa27

Fix usage in script files and CI

61be14e

Aymalla approved these changes Nov 29, 2022

View reviewed changes

banking-app/Makefile Show resolved Hide resolved

Each sample has it's own build job

e680047

ross-p-smith requested review from julioalex-rezende and takuro-sato November 29, 2022 23:26

ross-p-smith added 2 commits November 29, 2022 23:48

Error message if sandbox is not running

a274c3f

build the app

5e1aed5

julioalex-rezende approved these changes Nov 30, 2022

View reviewed changes

ross-p-smith merged commit f34ae1f into microsoft:main Nov 30, 2022

ross-p-smith deleted the ross/constitution branch November 30, 2022 13:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Banking-app defines its own constitution #53

Banking-app defines its own constitution #53

ross-p-smith commented Nov 24, 2022 •

edited

Loading

takuro-sato commented Nov 28, 2022

ross-p-smith commented Nov 29, 2022

julioalex-rezende left a comment

Aymalla left a comment

ross-p-smith commented Nov 30, 2022

Banking-app defines its own constitution #53

Banking-app defines its own constitution #53

Conversation

ross-p-smith commented Nov 24, 2022 • edited Loading

Why the change

Todo (in separate PR)

Test this PR

takuro-sato commented Nov 28, 2022

ross-p-smith commented Nov 29, 2022

julioalex-rezende left a comment

Choose a reason for hiding this comment

Aymalla left a comment

Choose a reason for hiding this comment

ross-p-smith commented Nov 30, 2022

ross-p-smith commented Nov 24, 2022 •

edited

Loading