Skip to content

Commit

Permalink
chore: Merge branch 'release/v10.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuthor committed Nov 20, 2024
2 parents 8e7166a + 38ca341 commit 616ac88
Show file tree
Hide file tree
Showing 16 changed files with 3,652 additions and 77 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
subcommands: |
python3 scripts/download_wasm.py
npm install
kms-version: 4.13.0
kms-version: 4.19.3
findex-cloud-version: 0.3.1

lint:
Expand All @@ -34,10 +34,7 @@ jobs:
with:
subcommands: |
npm test
kms-version: 4.13.0
kms-jwe-key:
'{"kty": "OKP","d": "MPEVJwdRqGM_qhJOUb5hR0Xr9EvwMLZGnkf-eDj5fU8","use": "enc","crv": "X25519","kid": "DX3GC+Fx3etxfRJValQNbqaB0gs=","x":
"gdF-1TtAjsFqNWr9nwhGUlFG38qrDUqYgcILgtYrpTY","alg": "ECDH-ES"}'
kms-version: 4.19.3
findex-cloud-version: 0.3.1
regression_files: |
./node_modules/non_regression_vector.json
Expand All @@ -49,7 +46,8 @@ jobs:
uses: Cosmian/reusable_workflows/.github/workflows/cloudproof_kms_js.yml@develop
with:
branch: develop
kms-version: ghcr.io/cosmian/kms:4.13.0
kms-version: ghcr.io/cosmian/kms:4.19.3
fips: false

cloudproof_java:
needs: test
Expand All @@ -60,12 +58,13 @@ jobs:
extension: so
destination: linux-x86-64
os: ubuntu-20.04
kms-version: ghcr.io/cosmian/kms:4.13.0
kms-version: ghcr.io/cosmian/kms:4.19.3
findex-cloud-version: 0.3.1
copy_fresh_build: false
copy_regression_files: |
cp ./cloudproof_js/non_regression_vector.json src/test/resources/cover_crypt/non_regression/js_non_regression_vector.json
cp ./cloudproof_js/sqlite.db src/test/resources/findex/non_regression/js_sqlite.db
fips: false

cloudproof_python:
needs:
Expand All @@ -74,12 +73,13 @@ jobs:
with:
branch: develop
target: x86_64-unknown-linux-gnu
kms-version: ghcr.io/cosmian/kms:4.13.0
kms-version: ghcr.io/cosmian/kms:4.19.3
findex-cloud-version: 0.3.1
copy_fresh_build: false
copy_regression_files: |
cp ./cloudproof_js/non_regression_vector.json tests/data/cover_crypt/non_regression/js_non_regression_vector.json
cp ./cloudproof_js/sqlite.db tests/data/findex/non_regression/js_sqlite.db
fips: false

cloudproof_flutter:
needs:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
sleep 5
cd ../test
node chrome.mjs http://localhost:8090 http://kms:9998
kms-version: 4.13.0
kms-version: 4.19.3
findex-cloud-version: 0.3.1

example_reactjs:
Expand All @@ -123,7 +123,7 @@ jobs:
sleep 5
cd ../test
node chrome.mjs http://localhost:8090 http://kms:9998
kms-version: 4.13.0
kms-version: 4.19.3
findex-cloud-version: 0.3.1

example_browser:
Expand All @@ -137,7 +137,7 @@ jobs:
python3 -m http.server &
sleep 3
node test.mjs
kms-version: 4.13.0
kms-version: 4.19.3
findex-cloud-version: 0.3.1

example_webpack:
Expand All @@ -159,7 +159,7 @@ jobs:
cd examples/nodejs
npm install
node test.mjs 10
kms-version: 4.13.0
kms-version: 4.19.3
findex-cloud-version: 0.3.1
secrets: inherit

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/js_in_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ on:
kms-version:
required: true
type: string
kms-jwe-key:
required: false
type: string
default: ""
findex-cloud-version:
required: true
type: string
Expand All @@ -30,8 +26,6 @@ jobs:
services:
kms:
image: ghcr.io/cosmian/kms:${{ inputs.kms-version }}
env:
JWK_PRIVATE_KEY: ${{ inputs.kms-jwe-key }}

findex_cloud:
image: ghcr.io/cosmian/findex_cloud:${{ inputs.findex-cloud-version }}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/js_in_docker_with_auth0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ on:
kms-version:
required: true
type: string
kms-jwe-key:
required: false
type: string
default: ""
findex-cloud-version:
required: true
type: string
Expand All @@ -31,7 +27,6 @@ jobs:
kms:
image: ghcr.io/cosmian/kms:${{ inputs.kms-version }}
env:
JWK_PRIVATE_KEY: ${{ inputs.kms-jwe-key }}
KMS_JWT_ISSUER_URI: https://kms-cosmian.eu.auth0.com/

findex_cloud:
Expand Down Expand Up @@ -68,7 +63,6 @@ jobs:
KMS_HOST: kms
FINDEX_CLOUD_HOST: findex_cloud
AUTH0_TOKEN_1: ${{ secrets.AUTH0_TOKEN_1 }}
AUTH0_TOKEN_2: ${{ secrets.AUTH0_TOKEN_2 }}

- name: Upload non-regression test vectors
if: inputs.regression_files != ''
Expand Down
7 changes: 1 addition & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,5 @@
"editor.defaultFormatter": "ms-python.autopep8"
},
"python.formatting.provider": "none",
"cSpell.words": ["Findex", "uids", "Uids"],
"workbench.colorCustomizations": {
"activityBar.background": "#02342B",
"titleBar.activeBackground": "#03493C",
"titleBar.activeForeground": "#E9FEFA"
}
"cSpell.words": ["Findex", "uids", "Uids"]
}
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

All notable changes to this project will be documented in this file.

## [10.0.1] - 2024-11-20

### 🐛 Bug Fixes

- Update better-sql3 to 11.5.0, bump package json version

### 📚 Documentation

- Update versions correspondence in README

### ⚙️ Miscellaneous Tasks

- Fix auth0 pb
- Bump KMS version to 4.19.3
- Remove JWE support (since KMS does not support it anymore)

## [10.0.0] - 2024-03-13

### Features
Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The library provides a Typescript-friendly API to the **Cloudproof Encryption**
- [Getting started](#getting-started)
- [Using in Javascript projects](#using-in-javascript-projects)
- [Versions Correspondence](#versions-correspondence)
- [Renew Auth0 access token](#renew-auth0-access-token)

<!-- tocstop -->

Expand Down Expand Up @@ -75,3 +76,9 @@ npm i cloudproof_js
| 9.5.1 | 2.3.0 | 4.9.1 |
| 9.6.0 | 2.4.0 | 4.10.0 |
| 9.7.0 | 2.4.0 | 4.11.3 |
| 10.0.0 | 3.0.0 | 4.13.0 |
| 10.0.1 | 3.0.0 | 4.19.3 |

## Renew Auth0 access token

Refer to repository <https://github.com/Cosmian/kms-ci-token>
14 changes: 4 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
---
# docker-compose.yml

version: "3"
services:
kms:
container_name: kms
image: ghcr.io/cosmian/kms:4.13.0
image: ghcr.io/cosmian/kms:4.19.3
ports:
- 9998:9998
environment:
JWK_PRIVATE_KEY:
'{"kty": "OKP","d": "MPEVJwdRqGM_qhJOUb5hR0Xr9EvwMLZGnkf-eDj5fU8","use": "enc","crv": "X25519","kid": "DX3GC+Fx3etxfRJValQNbqaB0gs=","x":
"gdF-1TtAjsFqNWr9nwhGUlFG38qrDUqYgcILgtYrpTY","alg": "ECDH-ES"}'
# To test in local with Auth0 authentication
# KMS_JWT_ISSUER_URI: https://kms-cosmian.eu.auth0.com/
# To test in local with Auth0 authentication
# environment:
# KMS_JWT_ISSUER_URI: https://kms-cosmian.eu.auth0.com/

findex_cloud:
image: ghcr.io/cosmian/findex_cloud:0.3.1
Expand Down
18 changes: 11 additions & 7 deletions examples/browser/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/full_text_search/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions examples/nodejs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/nodejs_search_imdb/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 616ac88

Please sign in to comment.