@ossy/deployment-tools 0.0.53 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "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",
@@ -18,15 +18,16 @@
     "@aws-sdk/client-sqs": "^3.186.0",
     "@aws-sdk/client-sts": "^3.188.0",
     "arg": "^5.0.2",
+    "aws-cdk-lib": "2.47.0",
+    "constructs": "^10.0.0",
+    "dockerode": "^3.3.4",
     "express": "^4.18.1",
     "nanoid": "^3.3.4",
-    "node-fetch": "^2.6.7",
-    "aws-cdk-lib": "2.47.0",
-    "constructs": "^10.0.0"
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
-    "jsdoc": "^3.6.11",
     "aws-cdk": "2.47.0",
-    "jest": "^27.5.1"
+    "jest": "^27.5.1",
+    "jsdoc": "^3.6.11"
   }
 }

package/src/aws-credentials/aws-credentials.js

@@ -3,6 +3,9 @@ const { STSClient, AssumeRoleWithWebIdentityCommand } = require('@aws-sdk/client
 
 const { logInfo, logError } = require('../log')
 
+/**
+  * @class
+*/
 class AwsCredentialsService {
 
   static resolveAwsCredentials(platformConfig) {

package/src/config/platform-config.js

@@ -15,6 +15,15 @@ const SupportedDeploymentTypes = {
   // Static = 'STATIC'
 }
 
+// export interface PlatformConfig extends Required<Omit<PlatformTemplate, 'awsRoleToAssume' | 'awsKeyPairName'>> {
+//   activeEnvironment: SupportedEnvironments;
+//   awsRoleToAssume?: string;
+//   awsKeyPairName?: string;
+// }
+
+/**
+  * @class
+*/
 class PlatformConfigService {
 
   static from(template) {

package/src/deploy/platform-deployment.js

@@ -5,6 +5,36 @@ const { PlatformConfigService, SupportedDeploymentTypes } = require('../config')
 const { DeploymentQueueService } = require('../deployment-queue')
 const { logError } = require('../log')
 
+// export interface DeploymentTemplate {
+//   type: SupportedDeploymentTypes;
+//   targetDeploymentPlatform: string;
+//   subdomain?: string;
+//   env?: {
+//     shared?: { [name: string]: string | number };
+//     prod?: { [name: string]: string | number };
+//     test?: { [name: string]: string | number };
+//     qa?: { [name: string]: string | number };
+//   }
+// }
+
+// export interface ContainerDeploymentTemplate extends DeploymentTemplate {
+//   type: SupportedDeploymentTypes.Container;
+//   dockerFile: string;
+//   dockerContext: string;
+//   image: string;
+//   hostPort: number;
+//   containerPort: number;
+//   registry: string;
+// }
+
+// export interface ContainerDeploymentRequest extends ContainerDeploymentTemplate {
+//   authentication?: string;
+//   username?: string;
+// }
+
+/**
+  * @class
+*/
 class PlatformDeploymentService {
 
   static deploy({

package/src/deployment-queue/deployment-queue.js

@@ -7,6 +7,9 @@ const {
 const { AwsCredentialsService } = require('../aws-credentials')
 const { logInfo, logError, logDebug } = require('../log')
 
+/**
+  * @class
+*/
 class DeploymentQueueService {
 
   static sendDeploymentRequest(platformConfig, deploymentRequest) {
@@ -32,14 +35,14 @@ class DeploymentQueueService {
   static pollForDeploymentRequests(platformConfig, handleDeploymentRequest) {
     logInfo({ message: '[DeploymentQueueService] Starting polling for deployment requests' })
     DeploymentQueueService.createAwsSqsClient(platformConfig).then(sqsClient => {
-      const FIVE_MINUTES = 3000
+      const FIVE_MINUTES = 300000
 
       setInterval(() => {
 
         const receiveMessageCommand = new ReceiveMessageCommand({ QueueUrl: platformConfig.awsDeploymentSqsArn })
 
         sqsClient.send(receiveMessageCommand)
-          .then(data => data.Messages.map(message => {
+          .then(data => data && data.Messages && data.Messages.map(message => {
 
             logInfo({ message: '[DeploymentQueueService] Received deployment request' })
 
@@ -57,7 +60,7 @@ class DeploymentQueueService {
               })
 
           }))
-          .catch(error => logError({ message: '[ContainerManagerServer] Could not handle incoming deployment request', error }))
+          .catch(error => logError({ message: '[DeploymentQueueService] Could not handle incoming deployment request', error }))
       }, FIVE_MINUTES)
 
     })

package/src/docker/docker-service.js

@@ -0,0 +1,62 @@
+const { exec: execBash } = require('child_process')
+const { logInfo, logDebug } = require('../log')
+
+const exec = command => new Promise((resolve, reject) => {
+  execBash(command, (error, stdout, stderr) => {
+    if (error) return reject(error)
+    if (stderr) return reject(stderr)
+    resolve(stdout)
+  })
+})
+
+/**
+  * @class
+*/
+class DockerService {
+
+  static createDockerNetworkForContainerManagerServer(platformConfig) {
+    logInfo({ message: '[DockerService] Creating docker network for comunication between containers' })
+    return exec(`docker network create ${platformConfig.ciDockerNetworkName}`)
+  }
+
+  static stopContainer(deploymentRequest) {
+    const name = deploymentRequest.image.replaceAll('/', '_')
+    logInfo({ message: `[DockerService] Running docker stop for image with the name of ${name}` })
+    return exec(`docker stop ${name}`)
+      .catch(() => {}) // no worries if container isn't there
+  }
+
+  static startContainer(platformConfig, { image, containerPort, hostPort, registry, env }) {
+    const name = image.replaceAll('/', '_')
+    const imageUrl = !!registry ? `${registry}/${image}` : image
+    const envsAsString = Object.entries(env || {}).reduce((envs, [name, value]) => `${envs} --env ${name}=${value}`, '')
+    logInfo({ message: `[DockerService] Running docker start for image with the name of ${name} with port mapping ${hostPort}:${containerPort} and source ${imageUrl}` })
+    return exec(`docker run -d -p ${hostPort}:${containerPort} --name=${name} --network=${platformConfig.ciDockerNetworkName} --network-alias=${name} --rm ${envsAsString} ${imageUrl}`)
+  }
+
+  static resolveCredentials({ registry, username, authentication }) {
+    const shouldAuthenticate = username || authentication
+
+    shouldAuthenticate
+      ? logInfo({ message: '[DockerService] Docker credentials provided, logging in to private repository' })
+      : logInfo({ message: '[DockerService] No docker credentials provided, assuming image is publicly hosted' })
+
+    return shouldAuthenticate
+      ? exec(`docker login ${registry} -u ${username} -p ${authentication}`)
+      : Promise.resolve()
+  }
+
+  static deploy(platformConfig, deploymentRequest) {
+    logInfo({ message: '[DockerService] Starting docker deployment sequence' })
+    logDebug({ message: '[DockerService] deploymentRequest', data: deploymentRequest })
+
+    return DockerService.resolveCredentials(deploymentRequest)
+      .then(() => DockerService.stop(deploymentRequest))
+      .then(() => DockerService.startContainer(platformConfig, deploymentRequest))
+  }
+
+}
+
+module.exports = {
+  DockerService
+}

package/src/docker/docker-service.playground.js

@@ -0,0 +1,17 @@
+const { DockerService } = require('./docker-service')
+
+DockerService.deploy(
+  { ciDockerNetworkName: 'deployment-tools' },
+  {
+    type: 'CONTAINER',
+    dockerFile: './Dockerfile-prod',
+    dockerContext: './',
+    targetDeploymentPlatform: 'oskarssylwan',
+    image: 'mongo',
+    hostPort: '3005',
+    containerPort: '3000',
+    subdomain: 'cms',
+    env: {},
+    registry: 'ghcr.io'
+  }
+)

package/src/docker/index.js

@@ -0,0 +1 @@
+module.exports = require('./docker-service')

package/src/infrastructure/container-server/aws-profile.js

@@ -1,3 +1,6 @@
+/**
+  * @class
+*/
 class AwsProfile {
 
   static writeFile(roleArn, region) {

package/src/infrastructure/container-server/caddy.service.js

@@ -30,6 +30,9 @@ AmbientCapabilities=CAP_NET_BIND_SERVICE
 WantedBy=multi-user.target cloud-init.target
 `
 
+/**
+  * @class
+*/
 class CaddyService {
 
   static install() {

package/src/infrastructure/container-server/container-server.js

@@ -35,6 +35,9 @@ const InstanceImages = {
   UBUNTU: 'ami-092cce4a19b438926'
 }
 
+/**
+  * @class
+*/
 class ContainerServer extends Construct {
 
   /**
@@ -108,6 +111,9 @@ class ContainerServer extends Construct {
     const userData = UserData.forLinux()
 
     userData.addCommands(
+      'sudo groupadd docker',
+      'sudo usermod -aG docker ubuntu',
+      'newgrp docker',
       'sudo apt update -y',
       ...getInstallNodeJs(),
       ...getInstallNpm(),
@@ -148,6 +154,7 @@ class ContainerServer extends Construct {
     })
 
     props.platformConfigBucket.grantRead(ec2Instance, '*')
+    props.deploymentQueue.grant(ec2Instance, '*')
 
     // const hostedZone = !!props.createNewHostedZone
     //   ? new PublicHostedZone(this, 'HostedZone', { zoneName: props.domain })

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

@@ -5,8 +5,8 @@ After=network.target caddy-route53.service
 
 [Service]
 EnvironmentFile=/etc/environment
-User=caddy
-Group=caddy
+User=ubuntu
+Group=docker
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 ExecStart=/usr/bin/npx --yes @ossy/deployment-tools server start --platforms /home/ubuntu/platform-config.json
@@ -16,6 +16,9 @@ Restart=on-failure
 WantedBy=multi-user.target cloud-init.target
 `
 
+/**
+  * @class
+*/
 class DeploymentToolsService {
 
   static install() {

package/src/infrastructure/establish-trust-stack.js

@@ -8,6 +8,9 @@ const {
   PolicyStatement
 } = require('aws-cdk-lib/aws-iam')
 
+/**
+  * @class
+*/
 class EstablishTrustStack extends Stack {
   /**
    * Establishes trust between GithHub and Amazon Web Services.

package/src/infrastructure/platform-stack.js

@@ -8,6 +8,9 @@ const { ContainerServer } = require('./container-server')
 
 const { SupportedDeploymentTypes } = require('../config')
 
+/**
+  * @class
+*/
 class PlatformStack extends Stack {
   constructor(scope, id, props) {
     super(scope, id, props)
@@ -20,7 +23,7 @@ class PlatformStack extends Stack {
 
     if (isContainerDeploymentsEnabled) {
 
-      new Queue(this, 'DeploymentQueue', {
+      const deploymentQueue = new Queue(this, 'DeploymentQueue', {
         queueName: `${props.config.platformName}-${props.config.activeEnvironment}`,
         receiveMessageWaitTime: Duration.seconds(20)
       })
@@ -40,7 +43,8 @@ class PlatformStack extends Stack {
 
       new ContainerServer(this, 'ContainerServer', {
         platformConfig: props.config,
-        platformConfigBucket: platformConfigDeployment.deployedBucket
+        platformConfigBucket: platformConfigDeployment.deployedBucket,
+        deploymentQueue: deploymentQueue
       })
 
     }

package/src/log.js

@@ -26,7 +26,7 @@ const logError = logInput => {
 }
 
 const logDebug = logInput => {
-  const isDebugOn = process.env.DEBUG || false
+  const isDebugOn = process.env.DEBUG || true
   if (!isDebugOn) return
   const messagePrefix = prefixTo(TypeOfMessage.Debug, logInput.message)
   log(`${messagePrefix}${logInput.message}`)

package/src/server/caddy.js

@@ -17,6 +17,9 @@ const Handlers = {
   })
 }
 
+/**
+  * @class
+*/
 class CaddyService {
 
   static addDeployment(platformConfig, deploymentRequest) {

package/src/server/platform-server.js

@@ -1,5 +1,5 @@
 const { CaddyService } = require('./caddy')
-const { DockerService } = require('./docker')
+const { DockerService } = require('../docker')
 const { RestApiService } = require('./rest-api')
 
 const { PlatformTemplateService } = require('../template')
@@ -7,7 +7,10 @@ const { PlatformConfigService } = require('../config')
 const { DeploymentQueueService } = require('../deployment-queue')
 const { logError } = require('../log')
 
-// journalctl -u service-name.service
+// journalctl -u deployment-tools.service
+/**
+  * @class
+*/
 class PlatformServerService {
 
   static start(platformTemplatesFilePath) {

package/src/server/rest-api.js

@@ -1,6 +1,9 @@
 const express = require('express')
 const { logInfo } = require('../log')
 
+/**
+  * @class
+*/
 class RestApiService {
 
   static start(platformConfig) {

package/src/template/platform-template.js

@@ -4,27 +4,33 @@ const { logError, logInfo } = require('../log')
 
 /**
  * Platform template definition
- * @namespace PlatformTemplate
  * @typedef {Object} PlatformTemplate
  * @property {string} platformName - Name of platform
  * @property {string} domain - example.com
  * @property {string[]} supportedDeploymentTypes - container
  * @property {string[]} supportedEnvironments - qa
+ *
  * @property {string} awsAccountId - Aws account id
- * @property {string} awsRegion - ?
- * @property {string} awsKeyPairName - ?
+ * @property {string=} awsRegion - ?
+ * @property {string=} awsKeyPairName - ?
  * @property {string} awsRoleToAssume - ?
- * @property {string} awsDeploymentSqsArn - ?
- * @property {string} ciSubDomain - ?
- * @property {string} ciInternalServerPort- ? | number;
- * @property {string} ciServerName - ?
- * @property {string} ciDockerNetworkName - ?
+ * @property {string=} awsDeploymentSqsArn - ?
+ *
+ * @property {string=} ciSubDomain - ?
+ * @property {string|mumber=} ciInternalServerPort - ? | number;
+ * @property {string=} ciServerName - ?
+ * @property {string=} ciDockerNetworkName - ?
  * @property {string} ciGithubActionsRepo - organisation/repoName
  */
+
+/**
+  * Utility class that helps you read and validate platfor templates from file system
+  * @class
+  */
 class PlatformTemplateService {
 
   /**
-   * Reads the json file that holds the platform templates
+   *  Read and validat platform template(s) from file system
    *
    * @param {string} path - File path to platform templates json
    * @return @Async {PlatformTemplate[]} - List of platform templates
@@ -57,6 +63,15 @@ class PlatformTemplateService {
     return Promise.resolve(templates)
   }
 
+  /**
+   *  Validates the template
+   *
+   * @param {PlatformTemplate} platformTemplate - File path to platform templates json
+   * @return @Async {PlatformTemplate} - List of platform templates
+   *
+   * @example
+   *     const platformTemplate = PlatformTemplateService.readFromFile('./platforms.json')
+   */
   static fakeValidateTemplate(obj) {
     // todo: implement real one
     return obj

package/src/types.js

@@ -1,32 +0,0 @@
-// export interface PlatformConfig extends Required<Omit<PlatformTemplate, 'awsRoleToAssume' | 'awsKeyPairName'>> {
-//   activeEnvironment: SupportedEnvironments;
-//   awsRoleToAssume?: string;
-//   awsKeyPairName?: string;
-// }
-
-// export interface DeploymentTemplate {
-//   type: SupportedDeploymentTypes;
-//   targetDeploymentPlatform: string;
-//   subdomain?: string;
-//   env?: {
-//     shared?: { [name: string]: string | number };
-//     prod?: { [name: string]: string | number };
-//     test?: { [name: string]: string | number };
-//     qa?: { [name: string]: string | number };
-//   }
-// }
-//
-// export interface ContainerDeploymentTemplate extends DeploymentTemplate {
-//   type: SupportedDeploymentTypes.Container;
-//   dockerFile: string;
-//   dockerContext: string;
-//   image: string;
-//   hostPort: number;
-//   containerPort: number;
-//   registry: string;
-// }
-
-// export interface ContainerDeploymentRequest extends ContainerDeploymentTemplate {
-//   authentication?: string;
-//   username?: string;
-// }