refactor(examples): include sample apps in monorepo build #2030

outSH · 2022-05-17T08:47:40Z

Include discounted-cartrade and electricity trade in monorepo setup,
Update the devcontainer and include new environment setup instructions in BUILD.md,
Fix sample apps build error,
Rename of sample apps to cactus-example-*,
Change any "car" references to "asset" (in code, comments, documentation, etc..),
Rename asset-trade files to match the format of the rest of this repository.
Remove asset-trade eth asset management class and endpoint
(not used right now, and it would confuse with fabric asset).
Renamed some uses of cartrade to asset-trade,
(more complete changes are included in follow-up commit),
Add indy build artifacts to .gitignore,
Add cmake to devcontainer build (fixed warning during npm dependency build stage),
Fix random whitespace and typos errors,

BREAKING CHANGE: building discounted-asset-trade app (or any future app that use indy validator) requires Indy SDK to be installed on the build machine.

Closes: #2029

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com

outSH · 2022-05-17T08:48:17Z

outSH · 2022-05-17T12:32:13Z

@petermetz I wrongly assumed that CI runs inside .devcontainer/Dockerfile cotainer, but it doesn't. Do you have an idea on how to add dependency (Indy SDK) to CI build environment? Install it in ci.sh (it set up npm and yarn already, not sure if OS packages fit here as well), or maybe use .devcontainer for CI build?

outSH · 2022-05-23T15:23:58Z

@petermetz I wrongly assumed that CI runs inside .devcontainer/Dockerfile cotainer, but it doesn't. Do you have an idea on how to add dependency (Indy SDK) to CI build environment? Install it in ci.sh (it set up npm and yarn already, not sure if OS packages fit here as well), or maybe use .devcontainer for CI build?

@jagpreetsinghsasan Do you have any ideas on this? I can add that Indy SDK is already required since initial indy support I suppose, but it did not affect the CI earlier since it had to be built manually.

jagpreetsinghsasan · 2022-05-25T07:34:44Z

@petermetz I wrongly assumed that CI runs inside .devcontainer/Dockerfile cotainer, but it doesn't. Do you have an idea on how to add dependency (Indy SDK) to CI build environment? Install it in ci.sh (it set up npm and yarn already, not sure if OS packages fit here as well), or maybe use .devcontainer for CI build?

@jagpreetsinghsasan Do you have any ideas on this? I can add that Indy SDK is already required since initial indy support I suppose, but it did not affect the CI earlier since it had to be built manually.

@outSH is this what you are looking for? https://github.com/hyperledger/cactus/blob/main/.github/workflows/ci.yml

outSH · 2022-05-25T10:41:54Z

@outSH is this what you are looking for? https://github.com/hyperledger/cactus/blob/main/.github/workflows/ci.yml

@jagpreetsinghsasan My question was: what is your preferred way to install additional dependency in CI environment. Do you mean that I should add additional step in build-node jobs that will install these dependencies?

petermetz

@outSH is this what you are looking for? https://github.com/hyperledger/cactus/blob/main/.github/workflows/ci.yml

@jagpreetsinghsasan My question was: what is your preferred way to install additional dependency in CI environment. Do you mean that I should add additional step in build-node jobs that will install these dependencies?

@outSH Sorry for the slow response. The preferred way is to do it declaratively (same as we do for NodeJS).
I found an GH workflow action that is pre-built to do what you want (AFAICT) here: https://github.com/actions/setup-python

If you find it too troublesome to do it this way I would also be okay with hacking it in ci.sh as long as you open a follow-up issue in the tracker so that later on someone gets it done in the ci.yml file with the action (or some other action) declaratively.
I can also offer to help with implementation of the workflow action, you can find me on the daily pair programming calls every morning that's on the HL Cactus calendar so if you stop by there we can collaborate live too.

outSH · 2022-05-26T13:19:55Z

@petermetz

Sorry for the slow response. The preferred way is to do it declaratively (same as we do for NodeJS).

That was my assumpion as well, that's why I've proposed using .devcontainer image for CI build as well. This'd have an advantage of having environment setup logic in one place (in case we need to add yet another dependency, we have to edit both ci.yml and .devcontainer now), but after all I've followed your advice and edited ci.yml to speed up the process.

I found an GH workflow action that is pre-built to do what you want (AFAICT) here: https://github.com/actions/setup-python

I don't want to setup python, I want to install deb package. I've added plain setup scripts in ci.yml, please review the last commit if it's satisfactory and I'll squash it with the main commit.

izuru0

LGTM

takeutak · 2022-06-23T00:29:30Z

@petermetz @jagpreetsinghsasan (cc: @izuru0)
Could you review this PR?

- Add support for starting Cactus CMD SocketIO server with multiple Bussiness Logic Plugins (BLP). All required TransactionManagement request should be routed to the correct BLP. - Add optional onListening callback when starting the cactus cmd socketio server, to simplify tests. - Fix some bugs and hard-coded BLP Ids in TransactionManagement. - Add new unit tests to check newly added functionalities. Closes hyperledger-cacti#2102 Depends on hyperledger-cacti#2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

petermetz

@outSH LGTM, thank you!

- Enclose starting sawtooth ledger into single container that will fetch and run the entire setup. - Remove reduntant files, update the readme. - Add SawtoothTestLedger class to simplify setting the test ledger in jest tests. - Refactor electricity-trade to generate usage without sawtooth shell patching. - Refactor electricity-trade to use new sawtooth ledger container and wait until it's healthy. Closes: hyperledger-cacti#2108 Depends on: hyperledger-cacti#2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Include discounted-cartrade and electricity trade in monorepo setup, - Update the devcontainer and include new environment setup instructions in BUILD.md, - Fix sample apps build error, - Rename of sample apps to cactus-example-*, - Change any "car" references to "asset" (in code, comments, documentation, etc..), - Rename asset-trade files to match the format of the rest of this repository. - Remove asset-trade eth asset management class and endpoint (not used right now, and it would confuse with fabric asset). - Renamed some uses of cartrade to asset-trade, (more complete changes are included in follow-up commit), - Add indy build artifacts to .gitignore, - Add cmake to devcontainer build (fixed warning during npm dependency build stage), - Fix random whitespace and typos errors, BREAKING CHANGE: building discounted-asset-trade app (or any future app that use indy validator) requires Indy SDK to be installed on the build machine. Closes: 2029 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

outSH · 2022-07-14T13:57:04Z

@izuru0 @takeutak Finally adjusted the new CI to include Indy SDK, PR is ready to be merged now.

petermetz · 2022-07-14T14:12:37Z

@outSH Thank you and sorry for the conflicts you (I guess) had with my PR.

That was my assumpion as well, that's why I've proposed using .devcontainer image for CI build as well. This'd have an advantage of having environment setup logic in one place (in case we need to add yet another dependency, we have to edit both ci.yml and .devcontainer now), but after all I've followed your advice and edited ci.yml to speed up the process.

It would be cool if we migrated the CI to run on the dev container, I agree!

- Add support for starting Cactus CMD SocketIO server with multiple Bussiness Logic Plugins (BLP). All required TransactionManagement request should be routed to the correct BLP. - Add optional onListening callback when starting the cactus cmd socketio server, to simplify tests. - Fix some bugs and hard-coded BLP Ids in TransactionManagement. - Add new unit tests to check newly added functionalities. Closes hyperledger-cacti#2102 Depends on hyperledger-cacti#2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Enclose starting sawtooth ledger into single container that will fetch and run the entire setup. - Remove reduntant files, update the readme. - Add SawtoothTestLedger class to simplify setting the test ledger in jest tests. - Refactor electricity-trade to generate usage without sawtooth shell patching. - Refactor electricity-trade to use new sawtooth ledger container and wait until it's healthy. Closes: hyperledger-cacti#2108 Depends on: hyperledger-cacti#2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Enclose starting sawtooth ledger into single container that will fetch and run the entire setup. - Remove reduntant files, update the readme. - Add SawtoothTestLedger class to simplify setting the test ledger in jest tests. - Refactor electricity-trade to generate usage without sawtooth shell patching. - Refactor electricity-trade to use new sawtooth ledger container and wait until it's healthy. Closes: #2108 Depends on: #2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add support for starting Cactus CMD SocketIO server with multiple Bussiness Logic Plugins (BLP). All required TransactionManagement request should be routed to the correct BLP. - Add optional onListening callback when starting the cactus cmd socketio server, to simplify tests. - Fix some bugs and hard-coded BLP Ids in TransactionManagement. - Add new unit tests to check newly added functionalities. Closes hyperledger-cacti#2102 Depends on hyperledger-cacti#2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

- Add support for starting Cactus CMD SocketIO server with multiple Bussiness Logic Plugins (BLP). All required TransactionManagement request should be routed to the correct BLP. - Add optional onListening callback when starting the cactus cmd socketio server, to simplify tests. - Fix some bugs and hard-coded BLP Ids in TransactionManagement. - Add new unit tests to check newly added functionalities. Closes #2102 Depends on #2030 Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>

outSH requested review from jonathan-m-hamilton and petermetz as code owners May 17, 2022 08:47

outSH force-pushed the examples_in_monorepo_pr branch from bc68370 to e7b4d3c Compare May 17, 2022 08:52

outSH mentioned this pull request May 20, 2022

feat(secret): remove Validator/Verifier secret keys from repository #2033

Merged

petermetz requested review from izuru0, sandeepnRES, takeutak and VRamakrishna and removed request for jonathan-m-hamilton May 25, 2022 22:33

petermetz requested changes May 25, 2022

View reviewed changes

outSH requested a review from jagpreetsinghsasan as a code owner May 26, 2022 13:11

outSH requested a review from petermetz May 26, 2022 13:26

outSH force-pushed the examples_in_monorepo_pr branch from b1f0529 to 54c1e3d Compare May 26, 2022 13:27

izuru0 approved these changes Jun 22, 2022

View reviewed changes

outSH mentioned this pull request Jun 27, 2022

feat(cmd-socketio-server): support multiple BLP in single server #2103

Merged

petermetz approved these changes Jun 29, 2022

View reviewed changes

outSH mentioned this pull request Jul 1, 2022

feat(sawtooth-ledger): add single sawtooth test ledger image #2110

Merged

jagpreetsinghsasan approved these changes Jul 11, 2022

View reviewed changes

outSH force-pushed the examples_in_monorepo_pr branch 2 times, most recently from 514dd7f to 3ffaeb9 Compare July 12, 2022 16:54

outSH force-pushed the examples_in_monorepo_pr branch 8 times, most recently from fe96c27 to 214847a Compare July 13, 2022 17:07

petermetz force-pushed the examples_in_monorepo_pr branch from 3a7aef4 to e31a2c4 Compare July 14, 2022 05:04

outSH force-pushed the examples_in_monorepo_pr branch from e31a2c4 to 7ae332e Compare July 14, 2022 08:03

outSH force-pushed the examples_in_monorepo_pr branch from 7ae332e to 00ea603 Compare July 14, 2022 08:06

petermetz merged commit 51ac163 into hyperledger-cacti:main Jul 14, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(examples): include sample apps in monorepo build #2030

refactor(examples): include sample apps in monorepo build #2030

outSH commented May 17, 2022 •

edited by jagpreetsinghsasan

Loading

outSH commented May 17, 2022

outSH commented May 17, 2022

outSH commented May 23, 2022

jagpreetsinghsasan commented May 25, 2022

outSH commented May 25, 2022

petermetz left a comment

outSH commented May 26, 2022 •

edited

Loading

izuru0 left a comment

takeutak commented Jun 23, 2022

petermetz left a comment

outSH commented Jul 14, 2022

petermetz commented Jul 14, 2022

refactor(examples): include sample apps in monorepo build #2030

refactor(examples): include sample apps in monorepo build #2030

Conversation

outSH commented May 17, 2022 • edited by jagpreetsinghsasan Loading

BREAKING CHANGE: building discounted-asset-trade app (or any future app that use indy validator) requires Indy SDK to be installed on the build machine.

outSH commented May 17, 2022

outSH commented May 17, 2022

outSH commented May 23, 2022

jagpreetsinghsasan commented May 25, 2022

outSH commented May 25, 2022

petermetz left a comment

Choose a reason for hiding this comment

outSH commented May 26, 2022 • edited Loading

izuru0 left a comment

Choose a reason for hiding this comment

takeutak commented Jun 23, 2022

petermetz left a comment

Choose a reason for hiding this comment

outSH commented Jul 14, 2022

petermetz commented Jul 14, 2022

outSH commented May 17, 2022 •

edited by jagpreetsinghsasan

Loading

outSH commented May 26, 2022 •

edited

Loading