@ossy/deployment-tools 0.0.24 → 0.0.25

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npx --yes @vercel/ncc build src/index.js --out dist --license licenses.txt"
+    "build": "npx --yes @vercel/ncc build src/index.js --out dist --license licenses.txt",
+    "build:esbuild": "npx --yes esbuild src/index.js --platform=node --bundle --outfile=dist/index.js"
   },
   "author": "Ossy",
   "license": "ISC",

package/src/caddy-client.js

@@ -1,5 +1,7 @@
 import fetch from 'node-fetch'
-import * as config from './config.js'
+import { resolveConfiguration } from './config.js'
+
+const config = resolveConfiguration()
 
 export const Matchers = {
   host: host => ({ host: [host] }),

package/src/config.js

@@ -1,9 +1,22 @@
-export const platformName = process.env.DEPLOYMENT_TOOLS_PLATFORM_NAME
-export const domain = process.env.DEPLOYMENT_TOOLS_DOMAIN || 'localhost'
-export const environmentName = process.env.DEPLOYMENT_TOOLS_ENVIRONMENT_NAME || 'dev'
-export const ciSubDomain = process.env.DEPLOYMENT_TOOLS_CI_SUB_DOMAIN || 'ci'
-export const port = process.env.DEPLOYMENT_TOOLS_PORT || 3000
-export const awsAccountId = process.env.AWS_ACCOUNT_ID
-export const awsRegion = process.env.AWS_REGION
+export const resolveConfiguration = (deploymentPlatform = {}) => {
+  const platformName = deploymentPlatform.name || process.env.DEPLOYMENT_TOOLS_PLATFORM_NAME
+  const domain = deploymentPlatform.domain || process.env.DEPLOYMENT_TOOLS_DOMAIN || 'localhost'
+  const environmentName = process.env.DEPLOYMENT_TOOLS_ENVIRONMENT_NAME || 'dev'
+  const ciSubDomain = deploymentPlatform.ciSubDomain || process.env.DEPLOYMENT_TOOLS_CI_SUB_DOMAIN || 'ci'
+  const port = process.env.DEPLOYMENT_TOOLS_PORT || 3000
+  const awsAccountId = deploymentPlatform.awsAccountId || process.env.AWS_ACCOUNT_ID
+  const awsRegion = deploymentPlatform.awsRegion || process.env.AWS_REGION
 
-export const deploymentQueueUrl = `https://sqs.${awsRegion}.amazonaws.com/${awsAccountId}/${platformName}-${environmentName}`
+  const deploymentQueueUrl = `https://sqs.${awsRegion}.amazonaws.com/${awsAccountId}/${platformName}-${environmentName}`
+
+  return {
+    platformName,
+    domain,
+    environmentName,
+    ciSubDomain,
+    port,
+    awsAccountId,
+    awsRegion,
+    deploymentQueueUrl
+  }
+}

package/src/container-manager-client.js

@@ -72,9 +72,6 @@ export class ContainerManagerClient {
     pathToDeploymentPlatforms,
     pathToOssyFile
   ) {
-    console.log('pathToDeploymentPlatforms', pathToDeploymentPlatforms)
-    console.log('pathToOssyFile', pathToOssyFile)
-    console.log('pathToOssyFile resolved', resolve(pathToOssyFile))
     return Promise.all([
       this.getDeploymentPlatforms(pathToDeploymentPlatforms),
       this.getDeployments(pathToOssyFile)
@@ -104,7 +101,7 @@ export class ContainerManagerClient {
 
           return AwsCredentialsClient.getTemporaryCredentials(platform.awsAccountId, platform.awsRegion)
             .then(credentials => {
-              const deploymentQueueClient = DeploymentQueueClient.new({ credentials })
+              const deploymentQueueClient = DeploymentQueueClient.new({ deploymentPlatform: platform, credentials })
               return deploymentQueueClient.sendMessage(body)
                 .then(() => console.log('[ContainerManagerCommands] Deployment request has been sent'))
                 .catch(error => console.log('[ContainerManagerCommands] Could not send deployment request', error))

package/src/container-manager-server.js

@@ -2,7 +2,9 @@ import express from 'express'
 import { CaddyClient } from './caddy-client.js'
 import { DockerClient } from './docker-client.js'
 import { DeploymentQueueClient } from './deployment-queue-client.js'
-import * as config from './config.js'
+import { resolveConfiguration } from './config.js'
+
+const config = resolveConfiguration()
 
 export class ContainerManagerServer {
 

package/src/deployment-queue-client.js

@@ -4,22 +4,16 @@ import {
   DeleteMessageCommand,
   ReceiveMessageCommand
 } from '@aws-sdk/client-sqs'
-import * as config from './config.js'
+import { resolveConfiguration } from './config.js'
 
 export class DeploymentQueueClient {
 
-  static new({ queueUrl, region, credentials } = {}) {
-
-    const deploymentQueueClientDefaultConfig = {
-      queueUrl: queueUrl || config.deploymentQueueUrl,
-      region: region || config.awsRegion,
-      credentials
-    }
-
-    return new DeploymentQueueClient(deploymentQueueClientDefaultConfig)
+  static new(config) {
+    return new DeploymentQueueClient(config)
   }
 
-  constructor({ queueUrl, region, credentials }) {
+  constructor({ deploymentPlatform, credentials } = {}) {
+    const { region, deploymentQueueUrl: queueUrl } = resolveConfiguration(deploymentPlatform)
     this.queueUrl = queueUrl
     this.sqs = new SQSClient({ region, credentials })
   }