@ossy/deployment-tools 0.0.26 → 0.0.28

package/dist/index.js

@@ -58353,9 +58353,10 @@ var __webpack_exports__ = {};
 (() => {
 
 ;// CONCATENATED MODULE: ./src/log/index.ts
-const log = ({ type, message } = { type: 'info', message: '' }) => {
+const log = ({ type, message, error } = { type: 'info', message: '' }) => {
     const messagePrefix = `[${type.toUpperCase()}]${message.startsWith('[') ? '' : ': '}`;
     console.log(`${messagePrefix}${message}`);
+    error && console.log('\t[Reason]:', error);
 };
 
 // EXTERNAL MODULE: ./node_modules/arg/index.js
@@ -60773,7 +60774,11 @@ class DeploymentQueueClient {
             });
             return sqsClient.send(command)
                 .then(() => log({ type: 'info', message: '[DeploymentQueueClient] Deployment request sent' }))
-                .catch(() => log({ type: 'error', message: '[DeploymentQueueClient] Could not send deployment request' }));
+                .catch(error => log({
+                type: 'error',
+                message: '[DeploymentQueueClient] Could not send deployment request',
+                error
+            }));
         });
     }
     static pollForDeploymentRequests(deploymentPlatform, handleDeploymentRequest) {
@@ -60865,7 +60870,11 @@ class DeploymentPlatformClient {
         ])
             .then(([platforms, deploymentTemplates]) => {
             deploymentTemplates.map(deploymentTemplate => {
-                const deploymentPlatform = platforms.find(platform => platform.name === deploymentTemplate.targetDeploymentPlatform);
+                log({
+                    type: 'info',
+                    message: `[DeploymentPlatformClient]: Found deployment platforms [${platforms.join(', ')}]`
+                });
+                const deploymentPlatform = platforms.find(platform => platform.platformName === deploymentTemplate.targetDeploymentPlatform);
                 if (!deploymentPlatform) {
                     log({ type: 'error', message: `[DeploymentPlatformClient] Could not find a deployment platform with the name ${deploymentTemplate.targetDeploymentPlatform}` });
                     return Promise.reject();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",

package/src/caddy-client.ts

@@ -39,7 +39,7 @@ export class CaddyClient {
         }
       ]))
     })
-    .catch(() => log({ type: 'error', message: `[CaddyClient] Could not update caddy config to include ${url}` }))
+    .catch(error => log({ type: 'error', message: `[CaddyClient] Could not update caddy config to include ${url}`, error }))
   }
 
   static applyDefaultServerConfig(deploymentPlatform: DeploymentPlatform) {
@@ -105,7 +105,7 @@ export class CaddyClient {
         }
       })
     })
-      .catch(() => log({ type: 'error', message: '[CaddyClient] Could not apply default caddy config' }))
+      .catch(error => log({ type: 'error', message: '[CaddyClient] Could not apply default caddy config', error }))
   }
 
 }

package/src/deployment-platform-client.ts

@@ -37,7 +37,7 @@ export class DeploymentPlatformClient {
       )
 
     })
-    .catch(() => log({ type: 'error', message: '[DeploymentPlatformClient] Could not start the deployment platform' }))
+    .catch(error => log({ type: 'error', message: '[DeploymentPlatformClient] Could not start the deployment platform', error }))
   }
 
   //eslint-disable-next-line max-params
@@ -54,7 +54,13 @@ export class DeploymentPlatformClient {
     ])
       .then(([platforms, deploymentTemplates]) => {
         deploymentTemplates.map(deploymentTemplate => {
-          const deploymentPlatform = platforms.find(platform => platform.name === deploymentTemplate.targetDeploymentPlatform)
+
+          log({
+            type: 'info',
+            message: `[DeploymentPlatformClient]: Found deployment platforms [${platforms.join(', ')}]`
+          })
+
+          const deploymentPlatform = platforms.find(platform => platform.platformName === deploymentTemplate.targetDeploymentPlatform)
 
           if (!deploymentPlatform) {
             log({ type: 'error', message: `[DeploymentPlatformClient] Could not find a deployment platform with the name ${deploymentTemplate.targetDeploymentPlatform}` })
@@ -79,7 +85,7 @@ export class DeploymentPlatformClient {
 
         })
       })
-      .catch(error => console.log(error))
+      .catch(error => log({ type: 'error', message: '[DeploymentPlatformClient] Could not send deployment request', error }))
   }
 
   static getDeploymentTemplates(pathToOssyFile: string): Promise<DeploymentTemplate[]> {
@@ -87,7 +93,7 @@ export class DeploymentPlatformClient {
     return Promise.resolve(ossyfile.deployments || [])
   }
 
-  static getDeploymentPlatforms(pathToDeploymentPlatforms: string) {
+  static getDeploymentPlatforms(pathToDeploymentPlatforms: string): Promise<DeploymentPlatform[]> {
     let deploymentPlatforms = JSON.parse(readFileSync(resolve(pathToDeploymentPlatforms), 'utf8'))
 
     if (!Array.isArray(deploymentPlatforms)) {

package/src/deployment-queue-client.ts

@@ -22,7 +22,11 @@ export class DeploymentQueueClient {
 
         return sqsClient.send(command)
           .then(() => log({ type: 'info', message: '[DeploymentQueueClient] Deployment request sent' }))
-          .catch(() => log({ type: 'error', message: '[DeploymentQueueClient] Could not send deployment request' }))
+          .catch(error => log({
+            type: 'error',
+            message: '[DeploymentQueueClient] Could not send deployment request',
+            error
+          }))
 
       })
 
@@ -52,11 +56,11 @@ export class DeploymentQueueClient {
 
                 sqsClient.send(deleteMessageCommand)
                   .then(() => log({ type: 'info', message: '[DeploymentQueueClient] Removing deployment request from queue' }))
-                  .catch(() => log({ type: 'error', message: '[DeploymentQueueClient] Removing deployment request from queue' }))
+                  .catch(error => log({ type: 'error', message: '[DeploymentQueueClient] Could not delete message from queue', error }))
               })
 
           }))
-          .catch(() => log({ type: 'error', message: '[ContainerManagerServer] Could not handle incoming deployment request' }))
+          .catch(error => log({ type: 'error', message: '[ContainerManagerServer] Could not handle incoming deployment request', error }))
       }, FIVE_MINUTES)
 
       })

package/src/log/index.ts

@@ -1,4 +1,11 @@
-export const log = ({ type, message } = { type: 'info', message: '' }) => {
+interface LogInput {
+  type: 'info' | 'error';
+  message: string;
+  error?: any;
+}
+
+export const log = ({ type, message, error }: LogInput = { type: 'info', message: '' }) => {
   const messagePrefix = `[${type.toUpperCase()}]${message.startsWith('[') ? '' : ': '}`
   console.log(`${messagePrefix}${message}`)
+  error && console.log('\t[Reason]:', error)
 }