Merge pull request #54 from hpcc-systems/eas-service-check

Eas service check
hpcc-systems · Aug 31, 2023 · d9a0239 · d9a0239
2 parents 4fda1b5 + 459a01a
commit d9a0239
Show file tree

Hide file tree

Showing 11 changed files with 2,043 additions and 11,752 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,5 @@ passwords.txt
 
 # .tfstate files
 *.tfstate
-*.tfstate.*
+*.tfstate.*
+*.log
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -22,7 +22,7 @@
     "chai": "^4.3.4"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "^2.0.1",
     "@ln-maf/validations": "file:../validations",
     "eslint": "^8.18.0",

diff --git a/packages/aws/README.md b/packages/aws/README.md
@@ -468,6 +468,10 @@ If a queue name is used, a regex search will be done to find the queue.
 
 ## AWS ECS Step Definitions
 
+### `When at least one task is running for service {string} in cluster {string}`
+
+Checks if the service in a cluster has at least one task running on ecs
+
 ### `When ecs taskDefinition {string} exists`
 ### `When ecs taskDefinition {string} does not exist`
 

diff --git a/packages/aws/package.json b/packages/aws/package.json
@@ -27,7 +27,7 @@
     "@ln-maf/core": "*"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "*",
     "@ln-maf/validations": "^2.0.3",
     "eslint": "^8.18.0",

diff --git a/packages/aws/stepDefinitions/ecs.js b/packages/aws/stepDefinitions/ecs.js
@@ -1,6 +1,6 @@
 const { setDefaultTimeout } = require('@cucumber/cucumber')
 const { MAFWhen, performJSONObjectTransform, filltemplate } = require('@ln-maf/core')
-const { ECSClient, ListTaskDefinitionsCommand, ListClustersCommand, RunTaskCommand, DescribeClustersCommand } = require('@aws-sdk/client-ecs')
+const { ECSClient, ListTaskDefinitionsCommand, ListClustersCommand, RunTaskCommand, DescribeClustersCommand, DescribeServicesCommand } = require('@aws-sdk/client-ecs')
 
 setDefaultTimeout(15 * 60 * 1000)
 
@@ -195,3 +195,22 @@ MAFWhen('perform ecs run-task:', async function (docString) {
 MAFWhen('ecs run-task is performed', async function () {
   return await ecsRunTask.call(this)
 })
+
+/**
+ * Check that at least one task for a service is running
+ */
+MAFWhen('at least one task is running for service {string} in cluster {string}', async function (serviceName, clusterName) {
+  serviceName = filltemplate(serviceName, this.results)
+  clusterName = filltemplate(clusterName, this.results)
+  const ecsClient = new ECSClient({ maxAttempts: 2 })
+  const res = await ecsClient.send(new DescribeServicesCommand({
+    cluster: clusterName,
+    services: [serviceName]
+  }))
+  if (res.services.length === 0) {
+    throw new Error('Can\'t find service ' + serviceName + ' in cluster ' + clusterName)
+  }
+  if (res.services[0].runningCount < 1) {
+    throw new Error('Service ' + serviceName + ' is not currently running in cluster ' + clusterName)
+  }
+})
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/hpcc-systems/MAF#readme",
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "eslint": "^8.18.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",

diff --git a/packages/defaultSQL/package.json b/packages/defaultSQL/package.json
@@ -22,7 +22,7 @@
     "keytar": "7.*"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "^2.0.1",
     "@ln-maf/validations": "^2.0.1",
     "eslint": "^8.18.0",

diff --git a/packages/mysql/package.json b/packages/mysql/package.json
@@ -24,7 +24,7 @@
     "@ln-maf/core": "*"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "^2.0.1",
     "eslint": "^8.18.0",
     "eslint-config-standard": "^17.0.0",

diff --git a/packages/preprocessor/package.json b/packages/preprocessor/package.json
@@ -30,7 +30,7 @@
     "@ln-maf/core": "*"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "^2.0.1",
     "@ln-maf/validations": "^2.0.1",
     "eslint": "^8.18.0",

diff --git a/packages/validations/package.json b/packages/validations/package.json
@@ -26,7 +26,7 @@
     "@ln-maf/core": "*"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.3.0",
+    "@cucumber/cucumber": "^9.0.0",
     "@ln-maf/core": "^2.0.1",
     "eslint": "^8.18.0",
     "eslint-config-standard": "^17.0.0",