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

Idl 60 fabric console vault integration rebase #6

Open
wants to merge 39 commits into
base: develop-old
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
16f9e74
update release notes (#369)
dshuffma-ibm Feb 16, 2023
5619eed
IDL-60 Allow mannual trigger of Docker workflow
lbandrov Mar 1, 2023
92bcb87
Develop rebase (#5)
lbandrov Jun 18, 2024
b026045
IDL-60 implement example vault endpoint
lbandrov Feb 23, 2023
4df9763
IDL-60 Example integration Apollo, Athena Vault
lbandrov Feb 24, 2023
a9c295a
IDL-60 Implement Vault API in Athena, Vault storage for identities an…
lbandrov Feb 26, 2023
f308f53
IDL-60 Remove not needed console logs and fix error rethrow
lbandrov Feb 26, 2023
1e87a69
IDL-60 removed delete identity endpoint from athena
lbandrov Feb 28, 2023
cdd51d9
IDL-60 Disable remove identity button.
lbandrov Mar 1, 2023
a9d30b2
IDL-60 Change build configs
lbandrov Mar 1, 2023
b51db6d
IDL-60 Fix API docs
lbandrov Mar 1, 2023
3a95563
IDL-60 read vault secrets from file
lbandrov Mar 2, 2023
82b9aa2
IDL-60 Set vault to be default identity storage
lbandrov Mar 2, 2023
f29daf8
IDL-60 Fix timing of loading vault secrets
lbandrov Mar 2, 2023
8ed5d40
IDL-60 handle error if vault config file is missing
lbandrov Mar 2, 2023
ddab1b1
IDL-60 Implement base64 encoding and decoding of identities and chang…
lbandrov Mar 3, 2023
6ef22b3
IDL-60 Fix throwing when peers, orderer, cases, etc, are undefined wh…
lbandrov Mar 4, 2023
228741b
IDL-60 Implement populating root certs in identity
lbandrov Mar 10, 2023
db4f3dd
IDL-60 Fix wrong authentication check middleware
lbandrov Mar 14, 2023
92e4b07
IDL-60 return empty identity object when no identities available in v…
lbandrov Mar 14, 2023
c5e0235
IDL-60 fix vault config path
lbandrov Mar 14, 2023
b2d5697
IDL-81 Change the property format of private key and msp id
lbandrov Mar 16, 2023
45b411a
IDL-60 fix lint warnings
lbandrov Mar 26, 2023
d12e405
IDL-60 updated eslint version to 2018
lbandrov Mar 31, 2023
9c4451f
IDL-60 refactored vault communication to resolve security vulnerabili…
lbandrov Apr 10, 2023
8658f8b
IDL-60 axios installed
lbandrov Apr 10, 2023
af9de75
IDL-60 Fix calling wrong method when retried vault connection
lbandrov Apr 20, 2023
3a27df0
IDL-60 Fix calling retry methods with wrong parameters
lbandrov Apr 20, 2023
0f5c849
IDL-60 Add logs to see when the Vault client reinitializes the token
lbandrov Apr 20, 2023
dd34546
IDL-60 Does not override msp_id in identity if it is already set
lbandrov Apr 21, 2023
cde102f
IDL-60 Remove not neede declaration of variable
lbandrov Apr 21, 2023
8b87dc0
IDL-60 Fix login url
lbandrov Apr 27, 2023
570b3fa
IDL-60 Fixes after rebasing and testing
lbandrov Jul 8, 2024
bf3f99c
IDL-60 Add delete secret from vault endpoint and improve vault config…
lbandrov Jul 22, 2024
29cedb9
IDL-60 Use vault integration if Vault client is initialised successfu…
lbandrov Jul 23, 2024
4746c6f
IDL-60 Remove not needed react env variable
lbandrov Jul 23, 2024
6553fe9
Enable workflows for all branches
yzhivkov Jul 23, 2024
7ba4a4c
Add on-demand workflow
yzhivkov Jul 23, 2024
520b24a
IDL-60 Increase ws version to patched version without vulnerabilities
lbandrov Jul 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
31 changes: 21 additions & 10 deletions .github/workflows/apollo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Apollo CI

on:
pull_request:
branches: [ main ]
branches: [ '**' ]

defaults:
run:
Expand All @@ -14,32 +14,43 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm ci --legacy-peer-deps
- run: npm run lint

audit:
name: NPM Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 18.x
- run: npm audit --production

build-code:
name: Build code
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm ci --legacy-peer-deps
- run: npm run build

unit-tests:
name: Unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm ci --legacy-peer-deps
- run: npm test
50 changes: 27 additions & 23 deletions .github/workflows/athena.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ name: Athena CI

on:
pull_request:
branches: [ main ]
branches: [ '**' ]

defaults:
run:
working-directory: ./packages/athena
shell: bash

env:
DB_CONNECTION_STRING: http://127.0.0.1:5984/
DB_CONNECTION_STRING: http://admin:password@127.0.0.1:5984/

jobs:
test-suite:
name: Test suite
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- name: Setup CouchDB
uses: cobot/couchdb-action@v4
uses: iamssen/couchdb-github-action@master
with:
couchdb version: '2.3.1'
couchdb-version: '3.3'
- run: curl ${{ env.DB_CONNECTION_STRING }}
- run: npm config set registry https://registry.npmjs.org/
- run: npm ci
Expand All @@ -37,15 +37,15 @@ jobs:
name: Start Athena
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- name: Setup CouchDB
uses: cobot/couchdb-action@v4
uses: iamssen/couchdb-github-action@master
with:
couchdb version: '2.3.1'
couchdb-version: '3.3'
- run: curl ${{ env.DB_CONNECTION_STRING }}
- run: npm config set registry https://registry.npmjs.org/
- run: npm ci
Expand All @@ -55,34 +55,38 @@ jobs:
name: NPM Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 16.x
- run: npm audit --prod
node-version: 18.x
- run: npm i -g better-npm-audit && npm run audit

openapi:
name: Validate OpenAPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm config set registry https://registry.npmjs.org/
- run: npm install -g ibm-openapi-validator@0.51.1
- run: npm run validate
- run: npm install js-yaml
- run: npm install -g swagger-cli
- run: npm install -g ibm-openapi-validator@0.56.0
- run: npm run validate:openapi:self
- run: npm run validate:openapi:cloud
- run: npm run validate:openapi

lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm ci
- run: npm run lint
21 changes: 11 additions & 10 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Common CI

on:
pull_request:
branches: [ main ]
branches: [ '**' ]

jobs:
audit:
Expand All @@ -12,10 +12,10 @@ jobs:
matrix:
project: [apollo, athena, stitch]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- name: Audit NPM
run: npm audit --production
working-directory: ./packages/${{ matrix.project }}
Expand All @@ -25,16 +25,17 @@ jobs:
name: Detect Secrets
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.11
- uses: actions/setup-node@v2
python-version: 3.12
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- name: Install detect-secrets
run: pip install --upgrade git+https://github.com/ibm/detect-secrets.git@0.13.1+ibm.52.dss#egg=detect-secrets
run: pip install --upgrade git+https://github.com/ibm/detect-secrets.git@0.13.1+ibm.59.dss#egg=detect-secrets
- name: Install Lerna
run: npm install -g lerna
- name: Run detect-secrets
run: lerna run detect-secrets --stream
continue-on-error: true
7 changes: 4 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ name: Docker

on:
push:
branches:
- main
tags:
- '*'
workflow_dispatch:

jobs:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build
run: ./docker/build_image.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/grpc-web-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
grpc-web:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build
run: docker build -t ghcr.io/hyperledger-labs/grpc-web:latest -f docker/grpc-web/Dockerfile .
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/on-demand.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: On-demand build

on:
workflow_dispatch:

jobs:
apollo:
needs: common
uses: ./.github/workflows/apollo.yml
athena:
needs: common
uses: ./.github/workflows/athena.yml
common:
uses: ./.github/workflows/common.yml
stitch:
needs: common
uses: ./.github/workflows/stitch.yml
grpc-web-docker-build:
needs: stitch
uses: ./.github/workflows/grpc-web-docker.yml
deploy:
needs: grpc-web-build
uses: ./.github/workflows/deploy.yml
14 changes: 7 additions & 7 deletions .github/workflows/stitch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Stitch CI

on:
pull_request:
branches: [ main ]
branches: [ '**' ]

defaults:
run:
Expand All @@ -14,10 +14,10 @@ jobs:
name: Build code and test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm ci
- run: npm run build_all
- run: npm run test
Expand All @@ -26,9 +26,9 @@ jobs:
name: NPM Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
- run: npm audit --prod
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ dist

# TernJS port file
.tern-port
packages/athena/json_docs/json_validation/ibp_openapi_v3.publish.yaml
packages/athena/env/dev.json

# IDEs
.idea
Loading