@ossy/deployment-tools 0.0.75 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "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",

package/src/config/platform-config.js

@@ -3,6 +3,7 @@
  * @typedef {Object} PlatformConfig
  * @property {string} platformName - Name of platform
  * @property {string} environmentType - local, test, qa, prod
+ * @property {object} dnsRecords - map of dns records by root domain, only supports MX records so that we can add dns records for our email service
  *
  * @property {string} awsAccountId - Aws account id
  * @property {string=} awsRegion - ?

package/src/docker/docker-service.js

@@ -16,21 +16,29 @@ class DockerService {
 
   static startDefaultContainers(platformConfig) {
     return exec(`docker run -d --name=mongodb --network=${platformConfig.ciDockerNetworkName} --network-alias=mongodb --rm mongo`)
-      .catch(logErrorAndReject('[DockerService] Could not start mongodb container'))
+      .catch(() => {/* if it fails it's probably because the network already exists*/})
   }
 
   static createDockerNetworkForContainerManagerServer(platformConfig) {
     logInfo({ message: '[DockerService] Creating docker network for comunication between containers' })
     return exec(`docker network create ${platformConfig.ciDockerNetworkName}`)
+      .catch(() => {/* if it fails it's probably because the network already exists*/ })
   }
 
   static stopContainer(deploymentRequest) {
     const name = deploymentRequest.image.replaceAll('/', '_')
-    logInfo({ message: `[DockerService] Running docker stop for image with the name of ${name}` })
+    logInfo({ message: `[DockerService] Stopping container for ${name}` })
     return exec(`docker stop ${name}`)
       .catch(() => {}) // no worries if container isn't there
   }
 
+  static removeImage(deploymentRequest) {
+    const name = deploymentRequest.image.replaceAll('/', '_')
+    logInfo({ message: `[DockerService] Removing image ${name}` })
+    return exec(`docker image rm -f ${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
@@ -59,6 +67,7 @@ class DockerService {
 
     return DockerService.resolveCredentials(deploymentRequest)
       .then(() => DockerService.stopContainer(deploymentRequest))
+      .then(() => DockerService.removeImage(deploymentRequest))
       .then(() => DockerService.startContainer(platformConfig, deploymentRequest))
   }
 

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

@@ -1,17 +1,4 @@
 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'
-  }
-)
+
+DockerService.removeImage({ ciDockerNetworkName: 'foo', image: 'mongo' })

package/src/infrastructure/dns-stack.js

@@ -1,5 +1,10 @@
-const { Stack } = require('aws-cdk-lib')
-const { HostedZone, ARecord, RecordTarget } = require('aws-cdk-lib/aws-route53')
+const { Stack, Duration } = require('aws-cdk-lib')
+const {
+  HostedZone,
+  ARecord,
+  MxRecord,
+  RecordTarget
+} = require('aws-cdk-lib/aws-route53')
 const { SupportedDeploymentTypes, SupportedEnvironments } = require('../config')
 const { DeploymentTemplateService } = require('../template')
 
@@ -41,21 +46,46 @@ class DnsStack extends Stack {
     DeploymentTemplateService
       .groupDeploymentDomainsByRootDomain(containerDeployments)
       .forEach((domains, rootDomain) => {
-        const hostedZone = new HostedZone(this, rootDomain, { zoneName: rootDomain })
+        const zone = new HostedZone(this, rootDomain, { zoneName: rootDomain })
 
         domains.forEach(domain => {
           new ARecord(this, domain, {
-            zone: hostedZone,
+            zone,
             recordName: domain,
-            target: RecordTarget.fromIpAddresses(props.containerDeploymentTargetPublicIp)
+            target: RecordTarget.fromIpAddresses(props.containerDeploymentTargetPublicIp),
+            ttl: Duration.seconds(60)
           })
         })
 
+        if (props.config.dnsRecords && props.config.dnsRecords[rootDomain]) {
+          const records = props.config.dnsRecords[rootDomain] || []
+
+          records.forEach(({ type, ttl, recordName, values }) => {
+            switch (type) {
+
+              case 'MX':
+                new MxRecord(
+                  this,
+                  `${recordName}-MX-Record`,
+                  { type, recordName, values, ttl: Duration.seconds(ttl), zone }
+                )
+                break
+
+              default:
+                throw new Error(`Unsupported record type: ${type}`)
+            }
+          })
+        }
+
       })
 
   }
 }
 
+function createDnsRecords(zone, records) {
+
+}
+
 module.exports = {
   DnsStack
 }

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

@@ -33,8 +33,10 @@ class TrustCiStack extends Stack {
     const GitHubPrincipal = new OpenIdConnectPrincipal(provider)
       .withConditions({
         StringLike: {
-          'token.actions.githubusercontent.com:sub':
-            `repo:${props.config.ciGithubActionsRepo}:*`
+          'token.actions.githubusercontent.com:sub': `repo:${props.config.ciGithubActionsRepo}:*`
+        },
+        StringEquals: {
+            'token.actions.githubusercontent.com:aud': 'sts.amazonaws.com'
         }
       })