@ossy/deployment-tools 0.0.47 → 0.0.49

package/cdk.json

@@ -1,5 +1,5 @@
 {
-  "app": "node src/infrastructure/cli.js",
+  "app": "node ./src/infrastructure/cli.js",
   "watch": {
     "include": [
       "**"

package/jsdoc.config.js

@@ -0,0 +1,19 @@
+
+module.exports = {
+  plugins: ['plugins/markdown'],
+  recurseDepth: 10,
+  source: {
+    // includePattern: '.+\\.js(doc|x)?$',
+    includePattern: '.+\\.js$',
+    excludePattern: '(^|\\/|\\\\)_'
+  },
+  sourceType: 'module',
+  tags: {
+    allowUnknownTags: true,
+    dictionaries: ['jsdoc', 'closure']
+  },
+  templates: {
+    cleverLinks: false,
+    monospaceLinks: false
+  }
+}

package/package.json

@@ -1,23 +1,18 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "Collection of scripts and tools to aid deployment of containers and static files to Amazon Web Services through GitHub Actions",
+  "source": "./src/index.js",
   "main": "./src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "echo \"The build step is not required when using JavaScript!\" && exit 0",
-    "build:docs": "jsdoc ./src/index.js ./package.json",
+    "build:docs": "jsdoc -c ./jsdoc.config.js ./src/index.js ./package.json",
     "cdk": "cdk"
   },
   "author": "Ossy",
   "license": "ISC",
-  "bin": {
-    "aws": "./src/aws-credentials/cli.js",
-    "deploy": "./src/deploy/cli.js",
-    "template": "./src/template/cli.js",
-    "server": "./src/server/cli.js",
-    "infrastructure": "./src/infrastructure/cli.js"
-  },
+  "bin": "./src/index.cli.js",
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@aws-sdk/client-sqs": "^3.186.0",

package/src/aws-credentials/cli.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 const arg = require('arg')
 const { AwsCredentialsService } = require('./aws-credentials')
 
@@ -6,10 +5,7 @@ const { PlatformTemplateService } = require('../template')
 const { PlatformConfigService } = require('../config')
 const { logInfo, logError } = require('../log')
 
-//eslint-disable-next-line no-unused-vars
-const [_, __, command, ...options] = process.argv
-
-const resolveCredentials = () => {
+const resolveCredentials = options => {
   logInfo({ message: 'resolve-credentials' })
 
   const parsedArgs = arg({
@@ -25,7 +21,7 @@ const resolveCredentials = () => {
   })
 }
 
-const assumeRole = () => {
+const assumeRole = options => {
   logInfo({ message: 'assume-role' })
 
   const parsedArgs = arg({
@@ -51,6 +47,10 @@ const assumeRole = () => {
 
 }
 
-!!command
-  ? { 'resolve-credentials': resolveCredentials, 'assume-role': assumeRole }[command]()
-  : logError({ message: 'No command provided' })
+module.exports = {
+  handler: ([command, ...options]) => {
+    !!command
+      ? { 'resolve-credentials': resolveCredentials, 'assume-role': assumeRole }[command](options)
+      : logError({ message: 'No command provided' })
+  }
+}

package/src/deploy/cli.js

@@ -1,12 +1,9 @@
 #!/usr/bin/env node
 const arg = require('arg')
 const { PlatformDeploymentService } = require('./platform-deployment')
-const { logInfo } = require('../log')
+const { logInfo, logError } = require('../log')
 
-//eslint-disable-next-line no-unused-vars
-const [_, __, ...options] = process.argv
-
-const deploy = () => {
+const deploy = options => {
   logInfo({ message: 'Running deploy command' })
 
   const parsedArgs = arg({
@@ -35,4 +32,10 @@ const deploy = () => {
   })
 }
 
-deploy()
+module.exports = {
+  handler: ([command, ...options]) => {
+    !!command
+      ? { deploy }[command](options)
+      : logError({ message: 'No command provided' })
+  }
+}

package/src/index.cli.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+/* eslint-disable global-require, no-unused-vars */
+
+const [_, __, handlerName, ...restArgs] = process.argv
+
+const loadHandler = {
+  aws: () => require('./aws-credentials/cli.js'),
+  deployment: () => require('./deploy/cli.js'),
+  template: () => require('./template/cli.js'),
+  server: () => require('./server/cli.js')
+}[handlerName]
+
+!!loadHandler && loadHandler().handler(restArgs)

package/src/infrastructure/container-server/deployment-tools.service.js

@@ -9,7 +9,7 @@ User=caddy
 Group=caddy
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/npx --yes @ossy/deployment-tools start --platforms /home/ubuntu/deployment-platform.json
+ExecStart=/usr/bin/npx --yes @ossy/deployment-tools start --platforms /home/ubuntu/platform-config.json
 Restart=on-failure
 
 [Install]

package/src/server/cli.js

@@ -1,22 +1,18 @@
-#!/usr/bin/env node
 const arg = require('arg')
 const { exec } = require('child_process')
-const { PlatformClient } = require('./platform-server')
+const { PlatformServerService } = require('./platform-server')
 
 const { logInfo, logError } = require('../log')
 
-//eslint-disable-next-line no-unused-vars
-const [_, __, command, ...restArgs] = process.argv
-
-const start = cliArgs => {
+const start = options => {
   logInfo({ message: 'Running start command' })
 
   const parsedArgs = arg({
     '--platforms': String,
     '-p': '--platforms'
-  }, { argv: cliArgs })
+  }, { argv: options })
 
-  PlatformClient.start(parsedArgs['--platforms'])
+  PlatformServerService.start(parsedArgs['--platforms'])
 }
 
 const status = () => {
@@ -29,6 +25,10 @@ const stop = () => {
   exec('systemctl stop deployment-tools.service')
 }
 
-!!command
-  ? { start, status, stop }[command]()
-  : logError({ message: 'No command provided' })
+module.exports = {
+  handler: ([command, ...options]) => {
+    !!command
+      ? { start, status, stop }[command](options)
+      : logError({ message: 'No command provided' })
+  }
+}

package/src/template/cli.js

@@ -1,13 +1,9 @@
-#!/usr/bin/env node
 const arg = require('arg')
 const { PlatformTemplateService } = require('./platform-template')
 
 const { logInfo, logError } = require('../log')
 
-//eslint-disable-next-line no-unused-vars
-const [_, __, command, ...options] = process.argv
-
-const validate = () => {
+const validate = options => {
   logInfo({ message: 'Running validate command' })
 
   const parsedArgs = arg({
@@ -19,4 +15,10 @@ const validate = () => {
     .then(() => logInfo({ message: 'Template is valid' }))
 }
 
-command === 'validate' ? validate() : logError({ message: 'No command provided' })
+module.exports = {
+  handler: ([command, ...options]) => {
+    !!command
+      ? { validate }[command](options)
+      : logError({ message: 'No command provided' })
+  }
+}