From 7b7da9862f887f1d9669eb988fecd98ecf02ad46 Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Fri, 15 Nov 2024 16:10:02 +0800 Subject: [PATCH 1/7] fix itemTerm in target file --- .../api-targets/api-target.order.eline.add.yaml | 1 - .../api-targets/api-target.order.uni.add.yaml | 1 - .../src/main/resources/mef-sonata/product.yaml | 1 + .../mef-sonata/template-upgrade/release.1.5.15.yaml | 13 +++++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.15.yaml diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.add.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.add.yaml index e5fd25b6..2f85b5be 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.add.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.eline.add.yaml @@ -57,7 +57,6 @@ spec: "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "expectedCompletionDate": "${mefRequestBody.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${mefRequestBody.productOrderItem[0].expediteIndicator}", - "itemTerm": "${mefRequestBody.productOrderItem[0].itemTerm}", "milestone": "${mefRequestBody.productOrderItem[0].milestone}", "state": "((mefResponseBody.state))", "terminationError": "${mefRequestBody.productOrderItem[0].terminationError}" diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.add.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.add.yaml index 188ca4b1..17a66184 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.add.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/api-targets/api-target.order.uni.add.yaml @@ -57,7 +57,6 @@ spec: "completionDate": "((mefResponseBody.state=='completed'?mefResponseBody.completionDate:null))", "expectedCompletionDate": "${mefRequestBody.productOrderItem[0].requestedCompletionDate}", "expediteAcceptedIndicator": "${mefRequestBody.productOrderItem[0].expediteIndicator}", - "itemTerm": "${mefRequestBody.productOrderItem[0].itemTerm}", "milestone": "${mefRequestBody.productOrderItem[0].milestone}", "state": "((mefResponseBody.state))", "terminationError": "${mefRequestBody.productOrderItem[0].terminationError}" diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml index cfbb759c..49e99c3f 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/product.yaml @@ -104,6 +104,7 @@ spec: - classpath:/mef-sonata/template-upgrade/release.1.5.12.yaml - classpath:/mef-sonata/template-upgrade/release.1.5.13.yaml - classpath:/mef-sonata/template-upgrade/release.1.5.14.yaml + - classpath:/mef-sonata/template-upgrade/release.1.5.15.yaml templateUpgradePaths: diff --git a/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.15.yaml b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.15.yaml new file mode 100644 index 00000000..b5d7b7fc --- /dev/null +++ b/kraken-java-sdk/kraken-java-sdk-mef/src/main/resources/mef-sonata/template-upgrade/release.1.5.15.yaml @@ -0,0 +1,13 @@ +--- +kind: kraken.product.template-upgrade +apiVersion: v1 +metadata: + key: kraken.product.template-upgrade.1.5.15 + name: V1.5.15 + labels: + productSpec: grace + productVersion: V1.5.15 + publishDate: 2024-11-15 16:11 + description: | + fix itemTerm + version: 2 \ No newline at end of file From 690a5791c3195386cf7da60e5953f1cc9713418b Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Mon, 18 Nov 2024 01:39:22 +0000 Subject: [PATCH 2/7] Bump verson to 1.0.0-rc.0 in pom.xml files --- kraken-app/kraken-app-agent/pom.xml | 4 ++-- kraken-app/kraken-app-controller/pom.xml | 4 ++-- kraken-app/kraken-app-hub/pom.xml | 6 +++--- kraken-app/pom.xml | 20 +++++++++---------- kraken-java-sdk/kraken-java-sdk-auth/pom.xml | 8 ++++---- .../kraken-java-sdk-controller/pom.xml | 10 +++++----- kraken-java-sdk/kraken-java-sdk-core/pom.xml | 6 +++--- kraken-java-sdk/kraken-java-sdk-data/pom.xml | 8 ++++---- .../kraken-java-sdk-gateway/pom.xml | 10 +++++----- kraken-java-sdk/kraken-java-sdk-mef/pom.xml | 4 ++-- kraken-java-sdk/kraken-java-sdk-sync/pom.xml | 8 ++++---- kraken-java-sdk/kraken-java-sdk-test/pom.xml | 2 +- kraken-java-sdk/pom.xml | 4 ++-- pom.xml | 2 +- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/kraken-app/kraken-app-agent/pom.xml b/kraken-app/kraken-app-agent/pom.xml index c6149822..03e0695f 100644 --- a/kraken-app/kraken-app-agent/pom.xml +++ b/kraken-app/kraken-app-agent/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-agent kraken-app-agent - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-snapshot + 1.0.0-rc.0 true diff --git a/kraken-app/kraken-app-controller/pom.xml b/kraken-app/kraken-app-controller/pom.xml index 520857be..a0f3a8c9 100644 --- a/kraken-app/kraken-app-controller/pom.xml +++ b/kraken-app/kraken-app-controller/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-controller kraken-app-controller - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-snapshot + 1.0.0-rc.0 true diff --git a/kraken-app/kraken-app-hub/pom.xml b/kraken-app/kraken-app-hub/pom.xml index cf1f583d..047ae19e 100644 --- a/kraken-app/kraken-app-hub/pom.xml +++ b/kraken-app/kraken-app-hub/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-hub kraken-app-hub - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-snapshot + 1.0.0-rc.0 @@ -23,7 +23,7 @@ com.consoleconnect.kraken kraken-java-sdk-gateway - 1.0.0-snapshot + 1.0.0-rc.0 diff --git a/kraken-app/pom.xml b/kraken-app/pom.xml index 6fc0e211..d1ccc366 100644 --- a/kraken-app/pom.xml +++ b/kraken-app/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app kraken-app - 1.0.0-snapshot + 1.0.0-rc.0 pom com.consoleconnect.kraken kraken-platform - 1.0.0-snapshot + 1.0.0-rc.0 @@ -40,42 +40,42 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-sync - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-gateway - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-controller - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-mef - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-snapshot + 1.0.0-rc.0 diff --git a/kraken-java-sdk/kraken-java-sdk-auth/pom.xml b/kraken-java-sdk/kraken-java-sdk-auth/pom.xml index 029a1b65..cf2b3961 100644 --- a/kraken-java-sdk/kraken-java-sdk-auth/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-auth/pom.xml @@ -4,11 +4,11 @@ com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 kraken-java-sdk-auth kraken-java-sdk-auth - 1.0.0-snapshot + 1.0.0-rc.0 jar @@ -33,13 +33,13 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 org.springframework.boot diff --git a/kraken-java-sdk/kraken-java-sdk-controller/pom.xml b/kraken-java-sdk/kraken-java-sdk-controller/pom.xml index 6c6332a0..8bf92e48 100644 --- a/kraken-java-sdk/kraken-java-sdk-controller/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-controller/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-controller kraken-java-sdk-controller - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 @@ -18,13 +18,13 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-snapshot + 1.0.0-rc.0 @@ -63,7 +63,7 @@ com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-core/pom.xml b/kraken-java-sdk/kraken-java-sdk-core/pom.xml index 5989329f..cd835368 100644 --- a/kraken-java-sdk/kraken-java-sdk-core/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-core/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-core kraken-java-sdk-core - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 @@ -155,7 +155,7 @@ com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-data/pom.xml b/kraken-java-sdk/kraken-java-sdk-data/pom.xml index 914ce4bc..07b684ee 100644 --- a/kraken-java-sdk/kraken-java-sdk-data/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-data/pom.xml @@ -5,23 +5,23 @@ 4.0.0 kraken-java-sdk-data kraken-java-sdk-data - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml b/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml index ea8e2c82..0a6c0dc2 100644 --- a/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-gateway kraken-java-sdk-gateway - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 @@ -18,13 +18,13 @@ com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-snapshot + 1.0.0-rc.0 @@ -94,7 +94,7 @@ com.consoleconnect.kraken kraken-java-sdk-test test - 1.0.0-snapshot + 1.0.0-rc.0 diff --git a/kraken-java-sdk/kraken-java-sdk-mef/pom.xml b/kraken-java-sdk/kraken-java-sdk-mef/pom.xml index b9bb9c1b..3ea312c8 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-mef/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-mef kraken-java-sdk-mef - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 diff --git a/kraken-java-sdk/kraken-java-sdk-sync/pom.xml b/kraken-java-sdk/kraken-java-sdk-sync/pom.xml index efbb90ba..7eaf2cba 100644 --- a/kraken-java-sdk/kraken-java-sdk-sync/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-sync/pom.xml @@ -5,23 +5,23 @@ 4.0.0 kraken-java-sdk-sync kraken-java-sdk-sync - 1.0.0-snapshot + 1.0.0-rc.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-snapshot + 1.0.0-rc.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-snapshot + 1.0.0-rc.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-test/pom.xml b/kraken-java-sdk/kraken-java-sdk-test/pom.xml index f9dbf1d6..bb31dcda 100644 --- a/kraken-java-sdk/kraken-java-sdk-test/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-test/pom.xml @@ -6,7 +6,7 @@ com.consoleconnect.kraken kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 kraken-java-sdk-test kraken-java-sdk-test diff --git a/kraken-java-sdk/pom.xml b/kraken-java-sdk/pom.xml index 07a409c2..499b4508 100644 --- a/kraken-java-sdk/pom.xml +++ b/kraken-java-sdk/pom.xml @@ -5,13 +5,13 @@ 4.0.0 kraken-java-sdk kraken-java-sdk - 1.0.0-snapshot + 1.0.0-rc.0 pom com.consoleconnect.kraken kraken-platform - 1.0.0-snapshot + 1.0.0-rc.0 diff --git a/pom.xml b/pom.xml index ecf4effd..0e76dde0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.consoleconnect.kraken kraken-platform kraken platform - 1.0.0-snapshot + 1.0.0-rc.0 pom From 1c57afd60ef290e43633663b97f3fa252b798f13 Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Mon, 18 Nov 2024 01:39:22 +0000 Subject: [PATCH 3/7] Bump version to 1.0.0-rc.0 in package.json files --- kraken-app/kraken-app-portal/package-lock.json | 4 ++-- kraken-app/kraken-app-portal/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kraken-app/kraken-app-portal/package-lock.json b/kraken-app/kraken-app-portal/package-lock.json index 1f78aa1e..1cf7377b 100644 --- a/kraken-app/kraken-app-portal/package-lock.json +++ b/kraken-app/kraken-app-portal/package-lock.json @@ -1,12 +1,12 @@ { "name": "kraken-app-portal", - "version": "1.0.0-snapshot", + "version": "1.0.0-rc.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kraken-app-portal", - "version": "1.0.0-snapshot", + "version": "1.0.0-rc.0", "dependencies": { "@ant-design/icons": "^5.3.7", "@apidevtools/swagger-parser": "^10.1.0", diff --git a/kraken-app/kraken-app-portal/package.json b/kraken-app/kraken-app-portal/package.json index 897505af..485f7742 100644 --- a/kraken-app/kraken-app-portal/package.json +++ b/kraken-app/kraken-app-portal/package.json @@ -1,7 +1,7 @@ { "name": "kraken-app-portal", "private": true, - "version": "1.0.0-snapshot", + "version": "1.0.0-rc.0", "type": "module", "scripts": { "dev": "vite", From 07420777a722c833d0c53a3864adee8b05bf7bd8 Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Mon, 18 Nov 2024 11:00:16 +0800 Subject: [PATCH 4/7] fix vulnerability in portal service --- kraken-app/kraken-app-portal/package-lock.json | 6 +++--- kraken-app/kraken-app-portal/package.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kraken-app/kraken-app-portal/package-lock.json b/kraken-app/kraken-app-portal/package-lock.json index 1f78aa1e..295cebea 100644 --- a/kraken-app/kraken-app-portal/package-lock.json +++ b/kraken-app/kraken-app-portal/package-lock.json @@ -4264,9 +4264,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dev": true, "dependencies": { "path-key": "^3.1.0", diff --git a/kraken-app/kraken-app-portal/package.json b/kraken-app/kraken-app-portal/package.json index 897505af..eab326f7 100644 --- a/kraken-app/kraken-app-portal/package.json +++ b/kraken-app/kraken-app-portal/package.json @@ -102,6 +102,7 @@ "@esbuild/win32-ia32": "^0.24.0", "@esbuild/win32-x64": "^0.24.0", "@esbuild/aix-ppc64": "^0.24.0", - "fsevents": "2.3.2" + "fsevents": "2.3.2", + "cross-spawn": "7.0.5" } } From a48d9a5087a58e0285852c725c28798694e877b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:59:58 +0800 Subject: [PATCH 5/7] build(misc): bump version to 2.0.0-snapshot.0 in main (#176) --- kraken-app/kraken-app-agent/pom.xml | 4 ++-- kraken-app/kraken-app-controller/pom.xml | 4 ++-- kraken-app/kraken-app-hub/pom.xml | 6 +++--- .../kraken-app-portal/package-lock.json | 4 ++-- kraken-app/kraken-app-portal/package.json | 2 +- kraken-app/pom.xml | 20 +++++++++---------- kraken-java-sdk/kraken-java-sdk-auth/pom.xml | 8 ++++---- .../kraken-java-sdk-controller/pom.xml | 10 +++++----- kraken-java-sdk/kraken-java-sdk-core/pom.xml | 6 +++--- kraken-java-sdk/kraken-java-sdk-data/pom.xml | 8 ++++---- .../kraken-java-sdk-gateway/pom.xml | 10 +++++----- kraken-java-sdk/kraken-java-sdk-mef/pom.xml | 4 ++-- kraken-java-sdk/kraken-java-sdk-sync/pom.xml | 8 ++++---- kraken-java-sdk/kraken-java-sdk-test/pom.xml | 2 +- kraken-java-sdk/pom.xml | 4 ++-- pom.xml | 2 +- 16 files changed, 51 insertions(+), 51 deletions(-) diff --git a/kraken-app/kraken-app-agent/pom.xml b/kraken-app/kraken-app-agent/pom.xml index 03e0695f..cb911cce 100644 --- a/kraken-app/kraken-app-agent/pom.xml +++ b/kraken-app/kraken-app-agent/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-agent kraken-app-agent - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-rc.0 + 2.0.0-snapshot.0 true diff --git a/kraken-app/kraken-app-controller/pom.xml b/kraken-app/kraken-app-controller/pom.xml index a0f3a8c9..c8456c93 100644 --- a/kraken-app/kraken-app-controller/pom.xml +++ b/kraken-app/kraken-app-controller/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-controller kraken-app-controller - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-rc.0 + 2.0.0-snapshot.0 true diff --git a/kraken-app/kraken-app-hub/pom.xml b/kraken-app/kraken-app-hub/pom.xml index 047ae19e..e1548694 100644 --- a/kraken-app/kraken-app-hub/pom.xml +++ b/kraken-app/kraken-app-hub/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app-hub kraken-app-hub - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-app - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -23,7 +23,7 @@ com.consoleconnect.kraken kraken-java-sdk-gateway - 1.0.0-rc.0 + 2.0.0-snapshot.0 diff --git a/kraken-app/kraken-app-portal/package-lock.json b/kraken-app/kraken-app-portal/package-lock.json index ba6cc416..364485c0 100644 --- a/kraken-app/kraken-app-portal/package-lock.json +++ b/kraken-app/kraken-app-portal/package-lock.json @@ -1,12 +1,12 @@ { "name": "kraken-app-portal", - "version": "1.0.0-rc.0", + "version": "2.0.0-snapshot.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "kraken-app-portal", - "version": "1.0.0-rc.0", + "version": "2.0.0-snapshot.0", "dependencies": { "@ant-design/icons": "^5.3.7", "@apidevtools/swagger-parser": "^10.1.0", diff --git a/kraken-app/kraken-app-portal/package.json b/kraken-app/kraken-app-portal/package.json index bd3bd28c..69b21e2c 100644 --- a/kraken-app/kraken-app-portal/package.json +++ b/kraken-app/kraken-app-portal/package.json @@ -1,7 +1,7 @@ { "name": "kraken-app-portal", "private": true, - "version": "1.0.0-rc.0", + "version": "2.0.0-snapshot.0", "type": "module", "scripts": { "dev": "vite", diff --git a/kraken-app/pom.xml b/kraken-app/pom.xml index d1ccc366..681dedb8 100644 --- a/kraken-app/pom.xml +++ b/kraken-app/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-app kraken-app - 1.0.0-rc.0 + 2.0.0-snapshot.0 pom com.consoleconnect.kraken kraken-platform - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -40,42 +40,42 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-sync - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-gateway - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-controller - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-mef - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-rc.0 + 2.0.0-snapshot.0 diff --git a/kraken-java-sdk/kraken-java-sdk-auth/pom.xml b/kraken-java-sdk/kraken-java-sdk-auth/pom.xml index cf2b3961..89b12d4d 100644 --- a/kraken-java-sdk/kraken-java-sdk-auth/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-auth/pom.xml @@ -4,11 +4,11 @@ com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 kraken-java-sdk-auth kraken-java-sdk-auth - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar @@ -33,13 +33,13 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 org.springframework.boot diff --git a/kraken-java-sdk/kraken-java-sdk-controller/pom.xml b/kraken-java-sdk/kraken-java-sdk-controller/pom.xml index 8bf92e48..6582fc83 100644 --- a/kraken-java-sdk/kraken-java-sdk-controller/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-controller/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-controller kraken-java-sdk-controller - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -18,13 +18,13 @@ com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -63,7 +63,7 @@ com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-core/pom.xml b/kraken-java-sdk/kraken-java-sdk-core/pom.xml index cd835368..410aeeb2 100644 --- a/kraken-java-sdk/kraken-java-sdk-core/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-core/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-core kraken-java-sdk-core - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -155,7 +155,7 @@ com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-data/pom.xml b/kraken-java-sdk/kraken-java-sdk-data/pom.xml index 07b684ee..4ac11ca0 100644 --- a/kraken-java-sdk/kraken-java-sdk-data/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-data/pom.xml @@ -5,23 +5,23 @@ 4.0.0 kraken-java-sdk-data kraken-java-sdk-data - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-core - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml b/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml index 0a6c0dc2..7a09639f 100644 --- a/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-gateway/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-gateway kraken-java-sdk-gateway - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -18,13 +18,13 @@ com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-auth - 1.0.0-rc.0 + 2.0.0-snapshot.0 @@ -94,7 +94,7 @@ com.consoleconnect.kraken kraken-java-sdk-test test - 1.0.0-rc.0 + 2.0.0-snapshot.0 diff --git a/kraken-java-sdk/kraken-java-sdk-mef/pom.xml b/kraken-java-sdk/kraken-java-sdk-mef/pom.xml index 3ea312c8..424c4576 100644 --- a/kraken-java-sdk/kraken-java-sdk-mef/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-mef/pom.xml @@ -5,12 +5,12 @@ 4.0.0 kraken-java-sdk-mef kraken-java-sdk-mef - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 diff --git a/kraken-java-sdk/kraken-java-sdk-sync/pom.xml b/kraken-java-sdk/kraken-java-sdk-sync/pom.xml index 7eaf2cba..f9369488 100644 --- a/kraken-java-sdk/kraken-java-sdk-sync/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-sync/pom.xml @@ -5,23 +5,23 @@ 4.0.0 kraken-java-sdk-sync kraken-java-sdk-sync - 1.0.0-rc.0 + 2.0.0-snapshot.0 jar com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-data - 1.0.0-rc.0 + 2.0.0-snapshot.0 com.consoleconnect.kraken kraken-java-sdk-test - 1.0.0-rc.0 + 2.0.0-snapshot.0 test diff --git a/kraken-java-sdk/kraken-java-sdk-test/pom.xml b/kraken-java-sdk/kraken-java-sdk-test/pom.xml index bb31dcda..9ea66e8e 100644 --- a/kraken-java-sdk/kraken-java-sdk-test/pom.xml +++ b/kraken-java-sdk/kraken-java-sdk-test/pom.xml @@ -6,7 +6,7 @@ com.consoleconnect.kraken kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 kraken-java-sdk-test kraken-java-sdk-test diff --git a/kraken-java-sdk/pom.xml b/kraken-java-sdk/pom.xml index 499b4508..982bb4c1 100644 --- a/kraken-java-sdk/pom.xml +++ b/kraken-java-sdk/pom.xml @@ -5,13 +5,13 @@ 4.0.0 kraken-java-sdk kraken-java-sdk - 1.0.0-rc.0 + 2.0.0-snapshot.0 pom com.consoleconnect.kraken kraken-platform - 1.0.0-rc.0 + 2.0.0-snapshot.0 diff --git a/pom.xml b/pom.xml index 0e76dde0..ac661f27 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.consoleconnect.kraken kraken-platform kraken platform - 1.0.0-rc.0 + 2.0.0-snapshot.0 pom From 9e1cd49083e5963063d0c5e10a9f912bbfc6573e Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Tue, 19 Nov 2024 15:20:42 +0800 Subject: [PATCH 6/7] improvement on sync kraken version --- .../service/PushKrakenVersionService.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java b/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java index 5924e8f4..4e3227e4 100644 --- a/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java +++ b/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java @@ -5,9 +5,13 @@ import com.consoleconnect.kraken.operator.core.enums.MgmtEventType; import com.consoleconnect.kraken.operator.core.repo.MgmtEventRepository; import com.consoleconnect.kraken.operator.core.repo.SystemInfoRepository; +import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; @Service @RequiredArgsConstructor @@ -15,6 +19,7 @@ public class PushKrakenVersionService { private static final String KEY = "CONTROL_PLANE"; private final SystemInfoRepository systemInfoRepository; private final MgmtEventRepository eventRepository; + private final MgmtEventRepository mgmtEventRepository; @Scheduled(cron = "${app.cron-job.sync-system-info-from-control-plane:-}") public void runIt() { @@ -23,12 +28,24 @@ public void runIt() { .findOneByKey(KEY) .ifPresent( systemInfoEntity -> { - MgmtEventEntity entity = new MgmtEventEntity(); - entity.setStatus(EventStatusType.WAIT_TO_SEND.name()); - entity.setPayload(systemInfoEntity); - entity.setResourceId(systemInfoEntity.getId().toString()); - entity.setEventType(MgmtEventType.CLIENT_SYSTEM_INFO.name()); - eventRepository.save(entity); + Page mgmtEventEntities = + mgmtEventRepository.findByEventTypeInAndStatus( + List.of(MgmtEventType.CLIENT_SYSTEM_INFO.name()), null, Pageable.ofSize(1)); + if (CollectionUtils.isEmpty(mgmtEventEntities.getContent())) { + MgmtEventEntity entity = new MgmtEventEntity(); + entity.setStatus(EventStatusType.WAIT_TO_SEND.name()); + entity.setPayload(systemInfoEntity); + entity.setResourceId(systemInfoEntity.getId().toString()); + entity.setEventType(MgmtEventType.CLIENT_SYSTEM_INFO.name()); + eventRepository.save(entity); + } else { + // if sync system info event exists, update state to wait_to_send to re-active the + // event + MgmtEventEntity eventEntity = mgmtEventEntities.getContent().get(0); + eventEntity.setStatus(EventStatusType.WAIT_TO_SEND.name()); + eventEntity.setPayload(systemInfoEntity); + eventRepository.save(eventEntity); + } }); } } From 1d1ecbc8cfa1ce278a4590a4b12f033e2778731a Mon Sep 17 00:00:00 2001 From: zhiyaoPCCW Date: Tue, 19 Nov 2024 15:26:47 +0800 Subject: [PATCH 7/7] improvement on sync kraken version --- .../operator/sync/service/PushKrakenVersionService.java | 5 ++--- .../operator/sync/service/PushKrakenVersionServiceTest.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java b/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java index 4e3227e4..9e06658a 100644 --- a/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java +++ b/kraken-java-sdk/kraken-java-sdk-sync/src/main/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionService.java @@ -5,7 +5,6 @@ import com.consoleconnect.kraken.operator.core.enums.MgmtEventType; import com.consoleconnect.kraken.operator.core.repo.MgmtEventRepository; import com.consoleconnect.kraken.operator.core.repo.SystemInfoRepository; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -29,8 +28,8 @@ public void runIt() { .ifPresent( systemInfoEntity -> { Page mgmtEventEntities = - mgmtEventRepository.findByEventTypeInAndStatus( - List.of(MgmtEventType.CLIENT_SYSTEM_INFO.name()), null, Pageable.ofSize(1)); + mgmtEventRepository.search( + MgmtEventType.CLIENT_SYSTEM_INFO.name(), null, Pageable.ofSize(1)); if (CollectionUtils.isEmpty(mgmtEventEntities.getContent())) { MgmtEventEntity entity = new MgmtEventEntity(); entity.setStatus(EventStatusType.WAIT_TO_SEND.name()); diff --git a/kraken-java-sdk/kraken-java-sdk-sync/src/test/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionServiceTest.java b/kraken-java-sdk/kraken-java-sdk-sync/src/test/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionServiceTest.java index 622123a5..30f44f1c 100644 --- a/kraken-java-sdk/kraken-java-sdk-sync/src/test/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionServiceTest.java +++ b/kraken-java-sdk/kraken-java-sdk-sync/src/test/java/com/consoleconnect/kraken/operator/sync/service/PushKrakenVersionServiceTest.java @@ -42,6 +42,9 @@ void givenSystemInfoEvent_whenRun_thenPushSuccessfully() { systemInfoRepository.save(entity); // when pushKrakenVersionService.runIt(); + entity.setStageAppVersion("2.0.0"); + systemInfoRepository.save(entity); + pushKrakenVersionService.runIt(); // then Page eventEntities = mgmtEventRepository.findByEventTypeInAndStatus(