Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add template-e2e-rest check #78

Merged
merged 50 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
233166a
Add Fablo-rest tool
dzikowski Feb 29, 2024
603d4e0
Add sample script with REST API calls
dzikowski Feb 29, 2024
bfe8614
Add Fablo REST client and rework RestApiClientBuilder
dzikowski Mar 1, 2024
75415a0
Add missing copyright
dzikowski Mar 1, 2024
5a4807a
Run template e2e tests in CI using Fablo REST
dzikowski Mar 1, 2024
8107ff0
Fix linter errors
dzikowski Mar 1, 2024
f0a5c0a
Run e2e tests in band
dzikowski Mar 1, 2024
5f82c6a
Add network:up command in template
dzikowski Mar 1, 2024
618a0e5
Add missing api config file
dzikowski Mar 1, 2024
36d68d4
Update Fablo REST host
dzikowski Mar 1, 2024
0163338
Add debug information
dzikowski Mar 1, 2024
34858cc
Disable Fablo REST for dev mode
dzikowski Mar 4, 2024
b30a74f
Unify userId/secret names
dzikowski Mar 4, 2024
c953afd
Add information about Fablo REST, unify userId/secret params
dzikowski Mar 4, 2024
ca8715e
Rework current GH Actions and add REST API tests
dzikowski Mar 4, 2024
2333b93
Merge branch 'main' into add-simple-rest-api
dzikowski Mar 4, 2024
21b4443
Remove non-required CI file (also removed in a different PR)
dzikowski Mar 4, 2024
7cde24d
Change file permissions
dzikowski Mar 4, 2024
601743f
Make dependencies between tasks more strict
dzikowski Mar 4, 2024
d1dedf2
Fix script
dzikowski Mar 4, 2024
70a38f6
Merge branch 'main' into add-simple-rest-api
dzikowski Mar 4, 2024
2fe1110
Don't use prefix for network:up
dzikowski Mar 4, 2024
978a57b
Unset npm_config_prefix
dzikowski Mar 4, 2024
cd71c88
Merge branch 'main' into add-simple-rest-api
dzikowski Mar 4, 2024
0ba78b7
Add missing setup node step
dzikowski Mar 4, 2024
2372413
Merge remote-tracking branch 'origin/add-simple-rest-api' into add-si…
dzikowski Mar 4, 2024
d4fdb86
Add missing prefix
dzikowski Mar 4, 2024
0f92f3d
Remove template-e2e-rest check
dzikowski Mar 5, 2024
b97f1e2
Add template-e2e-rest check
dzikowski Mar 5, 2024
912b33a
Merge remote-tracking branch 'origin/main' into add-rest-api-ci-tests
dzikowski May 14, 2024
14b378c
Add template-e2e-rest CI job
dzikowski May 14, 2024
5ea9e6b
Update Fabric libs to 2.5.4
dzikowski May 14, 2024
3d74a9b
Merge branch 'update-fabric-libs-to-2.5' into add-rest-api-ci-tests
dzikowski May 14, 2024
5c6279e
Update Fablo to 1.2.0
dzikowski May 14, 2024
78ef8eb
Update Fablo to 1.2.0
dzikowski May 14, 2024
fced564
Set proper schema in Fablo config files
dzikowski May 14, 2024
6845ebc
Resolve version conflicts of @grpc/grpc-js library
dzikowski May 14, 2024
f146b4f
Merge branch 'update-fabric-libs-to-2.5' into add-rest-api-ci-tests
dzikowski May 14, 2024
261ce62
Remove Node.js setup from REST API tests
dzikowski May 14, 2024
a90cfb1
Remove nvm file to avoid Fablo calling it and raising nvm issue with …
dzikowski May 14, 2024
817da17
Fix api-config.json
dzikowski May 14, 2024
6cf13d5
Support undefined status
dzikowski May 14, 2024
d0c70d4
Support Fablo REST calls with no DTO
dzikowski May 14, 2024
d78a174
Merge branch 'rest-api-client-fixes' into add-rest-api-ci-tests
dzikowski May 14, 2024
ad52ed4
Minor fixes in api-config handling
dzikowski May 14, 2024
6276c17
Fix ESLint issues
dzikowski May 14, 2024
69e7bbd
Fix ESLint issues
dzikowski May 14, 2024
4fb47a1
Merge branch 'rest-api-client-fixes' into add-rest-api-ci-tests
dzikowski May 14, 2024
7a8d234
Change default location of api-config.json
dzikowski May 14, 2024
6037eee
Merge branch 'main' into add-rest-api-ci-tests
dzikowski May 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/test-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,49 @@ jobs:
fi
npm run network:prune --prefix ./project-test

template-e2e-rest:
name: Chaincode template E2E (REST API)
runs-on: ubuntu-22.04
needs: [ci]
env:
GALA_CLIENT_DEV_MODE: "false"
CURATORORG_OPS_API_URL: "http://localhost:8801"
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install tools
run: |
sudo apt-get update
sudo apt-get install -y jq
sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
sudo chmod a+x /usr/local/bin/yq
git --version
node --version
npm --version
jq --version
yq --version
bash --version
docker version
docker-compose version
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install local CLI
run: .github/scripts/install-local-cli.sh
- name: Create test project
run: galachain init ./project-test
- name: Install dependencies
run: |
(cd ./project-test && ../npm-pack-and-replace.sh --skipConfirmation)
npm i --prefix ./project-test
- name: Remove nvm file to avoid Fablo calling it and raising nvm issue with npm_config_prefix env
run: rm ~/.nvm/nvm.sh
- name: Run network in non-watch mode
run: npm run network:up --prefix ./project-test
- name: Run E2E tests
run: npm run test:e2e --prefix ./project-test

template-image-check:
name: Chaincode template image check
needs: [ci]
Expand Down
12 changes: 6 additions & 6 deletions chain-cli/chaincode-template/api-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
"asLocalHost": true,
"contracts": [
{
"pathFragment": "apple",
"pathFragment": "apple-contract",
"chaincodeName": "basic-product",
"contractName": "AppleContract"
},
{
"pathFragment": "public-key-contract",
"pathFragment": "gala-chain-token",
"chaincodeName": "basic-product",
"contractName": "PublicKeyContract"
"contractName": "GalaChainToken"
},
{
"pathFragment": "token-contract",
"pathFragment": "public-key-contract",
"chaincodeName": "basic-product",
"contractName": "GalaChainToken"
"contractName": "PublicKeyContract"
}
]
}
]
}
}
Loading