From e23409afe50e2fe5b40757cbf9d82d5a1a2e47e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:56:35 +0200 Subject: [PATCH] Upgrade runtime (#236) * chore: bump runtime * refactor: adapt to runtime changes * chore: add parentId * chore: bump sdk * fix: correct query * ci: add concurrency to test workflow --- .ci/runChecks.sh | 2 +- .github/workflows/test.yml | 4 ++ package-lock.json | 70 +++++++++++-------- package.json | 6 +- packages/sdk/package.json | 2 +- .../types/attributes/ConnectorAttribute.ts | 5 +- .../GetOwnRepositoryAttributesRequest.ts | 3 - .../GetOwnSharedIdentityAttributesRequest.ts | 3 + .../GetPeerSharedIdentityAttributesRequest.ts | 3 + 9 files changed, 61 insertions(+), 37 deletions(-) diff --git a/.ci/runChecks.sh b/.ci/runChecks.sh index 40848795..a10651ce 100755 --- a/.ci/runChecks.sh +++ b/.ci/runChecks.sh @@ -11,4 +11,4 @@ npm run lint:prettier # auditing npx license-check --ignoreRegex @nmshd/connector -npx better-npm-audit audit --exclude 1093639,1096302,1098582 +npx better-npm-audit audit --exclude 1093639,1096302 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ec1b209..bfa52d49 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,10 @@ on: push: branches: [main] +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} + cancel-in-progress: true + jobs: run-checks: runs-on: ubuntu-latest diff --git a/package-lock.json b/package-lock.json index a623f590..2ec17917 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,10 +17,10 @@ "@js-soft/node-logger": "1.2.0", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.14.0", + "@nmshd/runtime": "4.14.4", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", - "axios": "^1.7.3", + "axios": "^1.7.4", "compression": "1.7.4", "cors": "2.8.5", "eventsource": "^2.0.2", @@ -57,7 +57,7 @@ "@types/lodash": "^4.17.7", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.7", - "@types/node": "^22.2.0", + "@types/node": "^22.3.0", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -1588,7 +1588,8 @@ "node_modules/@js-soft/docdb-querytranslator": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@js-soft/docdb-querytranslator/-/docdb-querytranslator-1.1.4.tgz", - "integrity": "sha512-Wn/saaEN42T3tNIcnJd6Tp/htD8dtRImqPNu4aGQLbCPHLT8sT1VyyKwmRnZjK1z0u9pOo2svKaJmeE83rZhCg==" + "integrity": "sha512-Wn/saaEN42T3tNIcnJd6Tp/htD8dtRImqPNu4aGQLbCPHLT8sT1VyyKwmRnZjK1z0u9pOo2svKaJmeE83rZhCg==", + "license": "MIT" }, "node_modules/@js-soft/eslint-config-ts": { "version": "1.6.9", @@ -1712,9 +1713,10 @@ "link": true }, "node_modules/@nmshd/consumption": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.12.1.tgz", - "integrity": "sha512-wDjWGzoxJF51GZQI3lRXwASEAOgRlkwMcyY3cDtuTv0QvW9I3Wywq04yu4ZRTzFK4QmB0rvfaWnweL6SR9nctg==", + "version": "3.12.4", + "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.12.4.tgz", + "integrity": "sha512-3t9+4QJmg3OE1EMFSUD5ZAQpMRebhHN5Sg+KVv00b0E5BWNB/K+UjeP6P0tENwJMAHRax342dD4QYOTYQllZjQ==", + "license": "MIT", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@nmshd/iql": "^1.0.2", @@ -1746,19 +1748,20 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.14.0.tgz", - "integrity": "sha512-N0GWDEZ99GZBK2f28TAH134s2GZSZVauoikV7ZxcxerSpJN9xMj+HPmzU/XC2wDOhIoaSwNn/lbEFyQBGVlMIw==", + "version": "4.14.4", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.14.4.tgz", + "integrity": "sha512-2g0JXSPyNno0TlXB8fa1wGDNdRkJ87EOVDr/IcPDCsii/cXD5clr0qGnqmY+SwvfIKT9MbqMMBRr/L5sobfeiw==", + "license": "MIT", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", "@js-soft/ts-serval": "2.0.10", "@js-soft/ts-utils": "^2.3.3", - "@nmshd/consumption": "3.12.1", + "@nmshd/consumption": "3.12.4", "@nmshd/content": "2.11.0", "@nmshd/crypto": "2.0.6", "@nmshd/transport": "2.8.2", - "ajv": "^8.16.0", + "ajv": "^8.17.1", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", "json-stringify-safe": "^5.0.1", @@ -2757,11 +2760,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "22.2.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz", - "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==", + "version": "22.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.3.0.tgz", + "integrity": "sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g==", + "license": "MIT", "dependencies": { - "undici-types": "~6.13.0" + "undici-types": "~6.18.2" } }, "node_modules/@types/on-headers": { @@ -3195,14 +3199,15 @@ } }, "node_modules/ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -3447,9 +3452,10 @@ } }, "node_modules/axios": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", - "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -5641,6 +5647,12 @@ "node": ">=16.1.0" } }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "license": "MIT" + }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", @@ -12431,9 +12443,10 @@ "dev": true }, "node_modules/undici-types": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", - "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==" + "version": "6.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.18.2.tgz", + "integrity": "sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ==", + "license": "MIT" }, "node_modules/universalify": { "version": "2.0.1", @@ -12490,6 +12503,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -13021,7 +13035,7 @@ "name": "@nmshd/connector-sdk", "license": "MIT", "dependencies": { - "axios": "^1.7.3", + "axios": "^1.7.4", "form-data": "^4.0.0", "qs": "^6.13.0" }, diff --git a/package.json b/package.json index 26e5b2b2..381c92ae 100644 --- a/package.json +++ b/package.json @@ -85,10 +85,10 @@ "@js-soft/node-logger": "1.2.0", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.14.0", + "@nmshd/runtime": "4.14.4", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", - "axios": "^1.7.3", + "axios": "^1.7.4", "compression": "1.7.4", "cors": "2.8.5", "eventsource": "^2.0.2", @@ -125,7 +125,7 @@ "@types/lodash": "^4.17.7", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.7", - "@types/node": "^22.2.0", + "@types/node": "^22.3.0", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8fc9218c..b43f1aba 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -30,7 +30,7 @@ "build:schemas:watch": "npx nodemon -e ts -w 'src/types' --exec 'npm run build:schemas'" }, "dependencies": { - "axios": "^1.7.3", + "axios": "^1.7.4", "form-data": "^4.0.0", "qs": "^6.13.0" }, diff --git a/packages/sdk/src/types/attributes/ConnectorAttribute.ts b/packages/sdk/src/types/attributes/ConnectorAttribute.ts index 9855a041..d95e4efb 100644 --- a/packages/sdk/src/types/attributes/ConnectorAttribute.ts +++ b/packages/sdk/src/types/attributes/ConnectorAttribute.ts @@ -1,5 +1,6 @@ export interface ConnectorAttribute { id: string; + parentId?: string; createdAt: string; content: ConnectorIdentityAttribute | ConnectorRelationshipAttribute; succeeds?: string; @@ -12,7 +13,9 @@ export enum ConnectorAttributeDeletionStatus { ToBeDeleted = "ToBeDeleted", ToBeDeletedByPeer = "ToBeDeletedByPeer", DeletedByPeer = "DeletedByPeer", - DeletedByOwner = "DeletedByOwner" + DeletedByOwner = "DeletedByOwner", + DeletionRequestSent = "DeletionRequestSent", + DeletionRequestRejected = "DeletionRequestRejected" } export interface ConnectorAttributeDeletionInfo { diff --git a/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts index 5b201f8c..73d7ea06 100644 --- a/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts +++ b/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts @@ -5,7 +5,4 @@ export interface GetOwnRepositoryAttributesRequest { "content.validFrom"?: string | string[]; "content.validTo"?: string | string[]; "content.value.@type"?: string | string[]; - deletionInfo?: string | string[]; - "deletionInfo.deletionStatus"?: string | string[]; - "deletionInfo.deletionDate"?: string | string[]; } diff --git a/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts index 27ed6fd3..2a64b092 100644 --- a/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts +++ b/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts @@ -14,6 +14,9 @@ export interface GetOwnSharedIdentityAttributesRequest { "query.shareInfo.requestReference"?: string | string[]; "query.shareInfo.notificationReference"?: string | string[]; "query.shareInfo.sourceAttribute"?: string | string[]; + "query.deletionInfo"?: string | string[]; + "query.deletionInfo.deletionStatus"?: string | string[]; + "query.deletionInfo.deletionDate"?: string | string[]; hideTechnical?: boolean; onlyLatestVersions?: boolean; } diff --git a/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts index e6239d37..6102e553 100644 --- a/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts +++ b/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts @@ -13,6 +13,9 @@ export interface GetPeerSharedIdentityAttributesRequest { "query.shareInfo"?: string | string[]; "query.shareInfo.requestReference"?: string | string[]; "query.shareInfo.notificationReference"?: string | string[]; + "query.deletionInfo"?: string | string[]; + "query.deletionInfo.deletionStatus"?: string | string[]; + "query.deletionInfo.deletionDate"?: string | string[]; hideTechnical?: boolean; onlyLatestVersions?: boolean; }