Merge branch 'devel' into feature/demux-sth-r3

Author: patuwwy

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 This is the changelog for Scramjet Transform Hub. It holds only notable commits, others are grouped without commit info.
 
+## [0.36.1] - 2023-10-02
+
+## Fixed
+
+* Add missing dependency in STH Dockerfile by @patuwwy in https://github.com/scramjetorg/transform-hub/pull/956
+
+## [0.36.0] - 2023-09-25
+
+## Features
+
+* Monitoring Server by @piotrek6641 in https://github.com/scramjetorg/transform-hub/pull/944
+
+## Fixed
+
+* Disconnect Hub errors enum + types by @piotrek6641 in https://github.com/scramjetorg/transform-hub/pull/941
+* Fix runner exit by @patuwwy in https://github.com/scramjetorg/transform-hub/pull/951
+* Bump systeminformation from 5.21.4 to 5.21.7 by @dependabot in https://github.com/scramjetorg/transform-hub/pull/950
+* Fix build docs for ModuleLoader and MonitoringServer by @patuwwy in https://github.com/scramjetorg/transform-hub/pull/953
+
 ## [0.35.3] - 2023-09-04
 
 ## Features

bdd/data/sequences/args-config-test/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/scramjetorg/transform-hub.git"
   },
   "devDependencies": {
-    "@scramjet/types": "0.35.3"
+    "@scramjet/types": "0.36.1"
   },
   "private": true
 }

bdd/data/sequences/args-to-output/package.json

@@ -12,7 +12,7 @@
   "author": "Scramjet <[email protected]>",
   "license": "ISC",
   "devDependencies": {
-    "@scramjet/types": "^0.35.3",
+    "@scramjet/types": "^0.36.1",
     "@types/node": "15.12.5"
   },
   "repository": {

bdd/data/sequences/deploy-app/dist/package.json

@@ -10,7 +10,7 @@
   "author": "Scramjet <[email protected]>",
   "license": "ISC",
   "devDependencies": {
-    "@scramjet/types": "^0.35.3",
+    "@scramjet/types": "^0.36.1",
     "@types/node": "15.12.5"
   },
   "repository": {

bdd/data/sequences/deploy-app/package.json

@@ -10,7 +10,7 @@
   "author": "Scramjet <[email protected]>",
   "license": "ISC",
   "devDependencies": {
-    "@scramjet/types": "^0.35.3",
+    "@scramjet/types": "^0.36.1",
     "@types/node": "15.12.5"
   },
   "repository": {

bdd/features/e2e/E2E-010-cli.feature

@@ -136,3 +136,25 @@ Feature: CLI tests
     Scenario: E2E-010 TC-016 Get Hub logs
         When I execute CLI with "hub logs" without waiting for the end
         Then I confirm Hub logs received
+
+
+    @ci-api @cli
+    Scenario: E2E-010 TC-017 Test Instance 'restart' option
+        When I execute CLI with "seq deploy ../packages/hello.tar.gz"
+        When I execute CLI with "inst restart -"
+        Then I confirm instance status is "killing"
+        When I execute CLI with "inst info -"
+        Then I confirm instance status is "running"
+
+    ##
+    #    If you change name of instanceId, keep remember it should consist of 36 chars!!!
+    ##
+    @ci-api @cli
+    Scenario: E2E-010 TC-018 Test Set instance id
+        When I execute CLI with "seq send ../packages/hello.tar.gz"
+        When I execute CLI with "seq start - --inst-id <instanceId>"
+        When I execute CLI with "inst ls"
+        Then I confirm instance id is: <instanceId>
+        Examples:
+            | instanceId                           |
+            | Supervisor-Instance-0000-11111111111 |

bdd/iac-test-data/sequences/infinite/package.json

@@ -9,6 +9,6 @@
     "build": "si pack -o ../hello-2.tar.gz ."
   },
   "devDependencies": {
-    "@scramjet/types": "^0.35.3"
+    "@scramjet/types": "^0.36.1"
   }
 }

bdd/lib/json.parser.ts

@@ -0,0 +1,37 @@
+export function extractJsonFromSiSeqDeploy(data: any) {
+    const lines = data.split("\n");
+
+    const seqInfo = JSON.parse(lines[0]);
+    const instInfo = JSON.parse(lines[1]);
+
+    return {
+        sequenceId: seqInfo._id,
+        instanceId: instInfo._id
+    };
+}
+
+export function extractKillResponseFromSiInstRestart(data: any) {
+    const lines = data.split("\n");
+    const killResponse = JSON.parse(lines[0]).killResponse;
+
+    return killResponse;
+}
+
+export function extractInstanceFromSiInstLs(data: any, instanceId: string) {
+    const lines = data.split("\n");
+    const json = JSON.parse(lines[0]);
+    let instance: any = null;
+
+    if (json.length > 0) {
+        for (let i = 0; i < json.length; i++) {
+            const obj = json[i];
+            const id: string = obj.id;
+
+            if (id.localeCompare(instanceId) === 0) {
+                instance = obj;
+                break;
+            }
+        }
+    }
+    return instance;
+}

bdd/package.json

@@ -1,13 +1,13 @@
 {
   "name": "scramjet-bdd",
-  "version": "0.35.3",
+  "version": "0.36.1",
   "description": "As the \"problem scope\" of the business problem that our technology solves is quite complex, we decided to use the BDD practice to support the development process. BDD is a methodology of high automation and agility. It describes a cycle of interactions with well-defined outcomes. As a result of these activities, we obtain working, tested software that has a real value.",
   "main": "_cucumber.js",
   "dependencies": {
-    "@scramjet/api-client": "^0.35.3",
-    "@scramjet/logger": "^0.35.3",
-    "@scramjet/obj-logger": "^0.35.3",
-    "@scramjet/sth-config": "^0.35.3",
+    "@scramjet/api-client": "^0.36.1",
+    "@scramjet/logger": "^0.36.1",
+    "@scramjet/obj-logger": "^0.36.1",
+    "@scramjet/sth-config": "^0.36.1",
     "dockerode": "^3.3.4",
     "find-package-json": "^1.2.0",
     "freeport": "^1.0.5",
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@cucumber/cucumber": "^7.3.2",
     "@cucumber/pretty-formatter": "^1.0.0",
-    "@scramjet/types": "^0.35.3"
+    "@scramjet/types": "^0.36.1"
   },
   "scripts": {
     "build:bdd": "tsc -p tsconfig.json",