Merge remote-tracking branch 'origin/main' into eas-service-check

.github/workflows/node.js.yml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node.
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Build
+name: Build / Test
 
 on:
   push:
@@ -20,17 +20,17 @@ jobs:
           - 4566:4566
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v1.2.1
+      uses: hashicorp/setup-terraform@v2.0.3
     - run: mkdir ~/.aws/
     - run: echo -e "[default]\noutput = json\nregion = us-east-1\naws_access_key_id = foo\naws_secret_access_key = bar" > ~/.aws/credentials
     - run: npm ci
@@ -39,7 +39,6 @@ jobs:
         terraform init
         terraform plan
         terraform apply -auto-approve
-    - run: npx lerna bootstrap
     - run: npx lerna run test
       env: 
        ENVIRONMENT: CI
@@ -50,7 +49,7 @@ jobs:
 
     - name: Status Create Action
       if: ${{ always() }}
-      uses: hkusu/[email protected].0
+      uses: hkusu/[email protected].1
       id: status-create
       with:
         state: ${{ job.status }} 

package.json

@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/hpcc-systems/MAF#readme",
   "devDependencies": {
-    "lerna": "^7.0.0",
+    "lerna": "^7.1.4",
     "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   }

packages/api/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "gitHead": "2a575448a74cfaee5ec68fa10db24cf4ccade849",

packages/aws/package.json

@@ -3,8 +3,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.1",
-  "description": "Setup for AWS on MAF. This contains s3, dynamoDB, sqs, ecs, cloudwatch, and lambda stepDefinitions",
+  "version": "2.0.11",
+  "description": "AWS steps for MAF. This contains S3, DynamoDB, SQS, ECS, Cloudwatch, and Lambda stepDefinitions",
   "main": "index.js",
   "scripts": {
     "test": "bash runFeature.sh"
@@ -35,7 +35,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "gitHead": "9bf55a2c86fa17707fabfb4320c3d722e270f9e6"

packages/aws/stepDefinitions/s3.js

@@ -128,7 +128,7 @@ MAFWhen('gz file {string} is uploaded to bucket {string} as key {string}', async
     Body: fileBuffer,
     Key: key
   }
-  return await new S3Client().send(new PutObjectCommand(queryParameters))
+  return await s3Client.send(new PutObjectCommand(queryParameters))
 })
 
 MAFWhen('gz file {string} is uploaded to bucket {string} as key {string} with sha256 check', async function (filePath, bucketName, key) {
@@ -143,7 +143,7 @@ MAFWhen('gz file {string} is uploaded to bucket {string} as key {string} with sh
     Key: key,
     ChecksumSHA256: crypto.createHash('sha256').update(fileBuffer).digest('base64')
   }
-  return await new S3Client().send(new PutObjectCommand(queryParameters))
+  return await s3Client.send(new PutObjectCommand(queryParameters))
 })
 
 MAFWhen('file {string} is deleted from bucket {string} at path {string}', async function (key, bucketName, path) {

packages/aws/stepDefinitions/sqs.js

@@ -111,6 +111,12 @@ MAFWhen('{jsonObject} is sent to queue {string}', async function (message, queue
   return await sendMessageToQueue(message, queue)
 })
 
+MAFWhen('{string} message is sent to queue {string}', async function (message, queue) {
+  message = filltemplate(message, this.results)
+  queue = filltemplate(queue, this.results)
+  return await sendMessageToQueue(message, queue)
+})
+
 MAFWhen('the next message is received from queue {string}', async function (queueURL) {
   queueURL = filltemplate(queueURL, this.results)
   const res = await dequeueMessagesFromQueue(queueURL)

packages/core/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "The core for the MAF framework. Contains helpers to make it easier to use.",
   "main": "index.js",
   "scripts": {

packages/defaultSQL/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Default Sql setup on Node with cucumber",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "gitHead": "9bf55a2c86fa17707fabfb4320c3d722e270f9e6",

packages/mysql/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Setup for sql on Node",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "gitHead": "2a575448a74cfaee5ec68fa10db24cf4ccade849",

packages/preprocessor/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "This project will preprocess feature files to allow more input variables to be supplied.  This can be supplied through javascript, a csv/psv/json array file or a mixture of these.  This will hopefully allow it to be easier to maintain larger test sets.",
   "main": "index.js",
   "bin": {
@@ -18,7 +18,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cucumber/cucumber-expressions": "^12.1.3",
-    "@cucumber/messages": "^15.0.0",
+    "@cucumber/messages": "^22.0.0",
     "app-root-path": "^3.0.0",
     "command-line-args": "^5.2.1",
     "glob": "^7.2.0",
@@ -38,7 +38,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "repository": {

packages/preprocessor/src/definition.ts

@@ -25,11 +25,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import { ITestCaseHookParameter } from './types'
 import { Expression } from '@cucumber/cucumber-expressions'
-import { messages } from '@cucumber/messages'
+import * as messages from '@cucumber/messages'
 
 export interface IGetInvocationDataRequest {
   hookParameter: ITestCaseHookParameter
-  step: messages.Pickle.IPickleStep
+  step: messages.PickleStep
   world: any
 }
 

packages/validations/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "multiple-cucumber-html-reporter": "^1.21.0",
+    "multiple-cucumber-html-reporter": "^3.4.0",
     "nyc": "^15.1.0"
   },
   "gitHead": "9bf55a2c86fa17707fabfb4320c3d722e270f9e6",