@ossy/deployment-tools 0.0.80 → 0.0.82

package/cdk.context.json

@@ -68,5 +68,13 @@
   "hosted-zone:account=426023801260:domainName=ossy.se:region=eu-north-1": {
     "Id": "/hostedzone/Z01074843R7T9G6P0BW11",
     "Name": "ossy.se."
+  },
+  "hosted-zone:account=858451553223:domainName=oskarssylwan.se:region=eu-north-1": {
+    "Id": "/hostedzone/Z06541531WYSO7D1IVDTT",
+    "Name": "oskarssylwan.se."
+  },
+  "hosted-zone:account=858451553223:domainName=oskarssylwan.com:region=eu-north-1": {
+    "Id": "/hostedzone/Z07488011P8FXGWA11LTS",
+    "Name": "oskarssylwan.com."
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "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/caddy/caddy-config.js

@@ -1,5 +1,4 @@
 const { DeploymentTemplateService } = require('../template')
-const { SupportedEnvironments } = require('../config')
 
 const Matchers = {
   host: host => ({ host: [host] }),
@@ -25,7 +24,7 @@ class CaddyConfigService {
   static createConfig(platformConfig, deploymentTemplates) {
 
     const containerDeployments = DeploymentTemplateService
-      .getContainerDeploymentsForEnvironmentType(platformConfig.environmentType, deploymentTemplates)
+      .getContainerDeployments(deploymentTemplates)
 
     return {
       apps: {
@@ -40,21 +39,11 @@ class CaddyConfigService {
             }
           }
         },
-        tls: platformConfig.environmentType === 'local-dev' ? undefined : {
+        tls: {
           automation: {
             policies: [
               {
-                subjects: [...DeploymentTemplateService.groupDeploymentDomainsByRootDomain(containerDeployments).keys()]
-                  .flatMap(rootDomain => {
-                      const environmentSubdomain = platformConfig.environmentType === SupportedEnvironments.PROD
-                        ? ''
-                        : `${platformConfig.environmentType}.`
-
-                      return [
-                        `*.${environmentSubdomain}${rootDomain}`,
-                        `${environmentSubdomain}${rootDomain}`
-                      ]
-                    }),
+                subjects: containerDeployments.map(({ domain }) => domain),
                 issuers:[
                   {
                     challenges: {

package/src/config/platform-config.js

@@ -2,7 +2,6 @@
  * Platform config definition
  * @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
@@ -20,14 +19,6 @@ const SupportedRegions = {
   North: 'eu-north-1'
 }
 
-const SupportedEnvironments = {
-  LOCAL: 'local',
-  QA: 'qa',
-  TEST: 'test',
-  DEMO: 'demo',
-  PROD: 'prod'
-}
-
 const SupportedDeploymentTypes = {
   Container: 'CONTAINER',
   Static: 'STATIC'
@@ -41,9 +32,7 @@ class PlatformConfigService {
   static from(template) {
 
     const withDefaults = {
-      platformName: SupportedEnvironments.LOCAL,
-      domain: 'localhost',
-      environmentType: SupportedEnvironments.LOCAL,
+      platformName: 'local',
       awsRegion: SupportedRegions.North,
       ...template,
       // values below should not be overriden by the template properties
@@ -68,6 +57,5 @@ class PlatformConfigService {
 module.exports = {
   PlatformConfigService,
   SupportedRegions,
-  SupportedEnvironments,
   SupportedDeploymentTypes
 }

package/src/deploy/platform-deployment.js

@@ -1,7 +1,7 @@
 const { readFileSync } = require('fs')
 const { resolve } = require('path')
 const { PlatformTemplateService, DeploymentTemplateService } = require('../template')
-const { PlatformConfigService, SupportedDeploymentTypes, SupportedEnvironments } = require('../config')
+const { PlatformConfigService, SupportedDeploymentTypes } = require('../config')
 const { DeploymentQueueService } = require('../deployment-queue')
 const { CaddyConfigService } = require('../caddy')
 const { logError } = require('../log')

package/src/docker/docker-service.js

@@ -26,9 +26,8 @@ class DockerService {
   }
 
   static stopContainer(deploymentRequest) {
-    const name = deploymentRequest.image.replaceAll('/', '_')
-    logInfo({ message: `[DockerService] Stopping container for ${name}` })
-    return exec(`docker stop ${name}`)
+    logInfo({ message: `[DockerService] Stopping container for ${deploymentRequest.domain}` })
+    return exec(`docker stop ${deploymentRequest.domain}`)
       .catch(() => {}) // no worries if container isn't there
   }
 
@@ -40,12 +39,11 @@ class DockerService {
       .catch(() => {}) // no worries if container isn't there
   }
 
-  static startContainer(platformConfig, { image, containerPort, hostPort, registry, env }) {
-    const name = image.replaceAll('/', '_')
+  static startContainer(platformConfig, { image, containerPort, hostPort, registry, env, domain }) {
     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}`)
+    const envsAsString = Object.entries(env || {}).reduce((envs, [name, value]) => `${envs} --env ${name}="${value}"`, '')
+    logInfo({ message: `[DockerService] Starting container for ${domain} with port mapping ${hostPort}:${containerPort} and source ${imageUrl}` })
+    return exec(`docker run -d -p ${hostPort}:${containerPort} --name=${domain} --network=${platformConfig.ciDockerNetworkName} --network-alias=${domain} --rm ${envsAsString} ${imageUrl}`)
       .catch(logErrorAndReject(`[DockerService] Could not start container ${image}`))
   }
 

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

@@ -1,4 +1,19 @@
 const { DockerService } = require('./docker-service')
 
+const platformConfig = {
+  ciDockerNetworkName: 'foo'
+}
 
-DockerService.removeImage({ ciDockerNetworkName: 'foo', image: 'mongo' })
+const deploymentTemplate =   {
+    "domain": "api.qa.ossy.se",
+    "image": "ossy-se/cms-api",
+    "targetDeploymentPlatform": "ossybot",
+    "type": "CONTAINER",
+    "hostPort": "3001",
+    "containerPort": "3000",
+  }
+
+DockerService.startContainer(
+  platformConfig,
+  deploymentTemplate
+)

package/src/infrastructure/container-deployment-target/container-deployment-target.js

@@ -10,7 +10,9 @@ const {
   SecurityGroup,
   Peer,
   Port,
-  UserData
+  UserData,
+  BlockDevice,
+  BlockDeviceVolume
 } = require('aws-cdk-lib/aws-ec2')
 const { Role, ServicePrincipal, Policy, PolicyStatement, Effect } = require('aws-cdk-lib/aws-iam')
 const { Queue } = require('aws-cdk-lib/aws-sqs')
@@ -73,7 +75,7 @@ class ContainerDeploymentTarget extends Construct {
     })
 
     const platformConfigDeployment = new BucketDeployment(this, 'PlatformConfigDeployment', {
-      sources: [Source.jsonData('platform-config.json', props.config)],
+      sources: [Source.jsonData('platform-config.json', { ...props.config, awsRoleToAssume: undefined })],
       destinationBucket: props.bucket
     })
 
@@ -143,11 +145,17 @@ class ContainerDeploymentTarget extends Construct {
       role,
       instanceType: InstanceType.of(
         InstanceClass.T3,
-        InstanceSize.MICRO
+        InstanceSize.LARGE
       ),
       machineImage: new GenericLinuxImage({
         [SupportedRegions.North]: InstanceImages.UBUNTU
       }),
+      blockDevices: [
+        {
+          deviceName: '/dev/sda1',
+          volume: BlockDeviceVolume.ebs(50)
+        }
+      ],
       keyName: props.config.awsKeyPairName
     })
 

package/src/infrastructure/deployment-target-stack.js

@@ -29,7 +29,6 @@ class DeploymentTargetStack extends Stack {
         autoDeleteObjects: true
       })
 
-    // TODO: add persistant storage
     const containerDeploymentTarget =
       new ContainerDeploymentTarget(this, 'ContainerDeploymentTarget', {
       config: props.config,

package/src/infrastructure/dns-stack.js

@@ -5,7 +5,7 @@ const {
   MxRecord,
   RecordTarget
 } = require('aws-cdk-lib/aws-route53')
-const { SupportedDeploymentTypes, SupportedEnvironments } = require('../config')
+const { SupportedDeploymentTypes } = require('../config')
 const { DeploymentTemplateService } = require('../template')
 
 /**
@@ -34,22 +34,16 @@ class DnsStack extends Stack {
   constructor(scope, id, props) {
     super(scope, id, props)
 
-    if (props.config.environmentType === SupportedEnvironments.PROD) {
-      // const isDomainForCorrectEnvironment = !Object.values(SupportedEnvironments)
-      //   .find(env => deployment.domain.includes(env))
-      return
-    }
-
     const containerDeployments = DeploymentTemplateService
-      .getContainerDeploymentsForEnvironmentType(props.config.environmentType, props.deployments)
+      .getContainerDeployments(props.deployments)
 
     DeploymentTemplateService
       .groupDeploymentDomainsByRootDomain(containerDeployments)
       .forEach((domains, rootDomain) => {
-        const zone = new HostedZone(this, rootDomain, { zoneName: rootDomain })
+        const zone = HostedZone.fromLookup(this, `${rootDomain}-zone`, { domainName: rootDomain })
 
         domains.forEach(domain => {
-          new ARecord(this, domain, {
+          new ARecord(this, `${domain}-record`, {
             zone,
             recordName: domain,
             target: RecordTarget.fromIpAddresses(props.containerDeploymentTargetPublicIp),

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

@@ -1,4 +1,4 @@
-const { Stack, Duration } = require('aws-cdk-lib')
+const { Stack, Duration, CfnOutput } = require('aws-cdk-lib')
 const {
   OpenIdConnectProvider,
   OpenIdConnectPrincipal,
@@ -41,10 +41,9 @@ class TrustCiStack extends Stack {
       })
 
     // eslint-disable-next-line no-new
-    new Role(this, 'GitHubActionsRole', {
+    const role = new Role(this, 'GitHubActionsRole', {
       assumedBy: GitHubPrincipal,
       description: 'Role assumed by GitHubPrincipal for deploying from CI using aws cdk',
-      roleName: props.config.awsRoleToAssume,
       maxSessionDuration: Duration.hours(1),
       inlinePolicies: {
         CdkDeploymentPolicy: new PolicyDocument({
@@ -62,6 +61,13 @@ class TrustCiStack extends Stack {
         })
       }
     })
+
+    new CfnOutput(this, 'CiAwsRoleToAssume', {
+      value: role.roleName,
+      description: 'Name of role to be assumed in CI/CD pipelines on github',
+      exportName: 'awsRoleToAssume'
+    })
+
   }
 }
 

package/src/template/deployment-template.js

@@ -1,7 +1,7 @@
 const { glob } = require('glob')
 const { readFileSync } = require('fs')
 const { logError, logInfo } = require('../log')
-const { SupportedDeploymentTypes, SupportedEnvironments } = require('../config')
+const { SupportedDeploymentTypes } = require('../config')
 
 /**
  * Deployment template definition
@@ -32,6 +32,11 @@ class DeploymentTemplateService {
        .then(filePaths => filePaths
            .map(path => readFileSync(path, 'utf-8'))
            .flatMap(json => JSON.parse(json))
+           .map(deploymentTemplate => ({
+             containerPort: '3000',
+             registry: 'ghcr.io',
+             ...deploymentTemplate
+           }))
            .reduce((deploymentsMap, deployment) => {
              if (!!deploymentsMap[deployment.targetDeploymentPlatform]) {
                return {
@@ -52,13 +57,9 @@ class DeploymentTemplateService {
        )
    }
 
-  static getContainerDeploymentsForEnvironmentType(environmentType, deployments) {
+  static getContainerDeployments(deployments) {
     return deployments
-      .filter(deployment => {
-        const isContainerDeployment = deployment.type === SupportedDeploymentTypes.Container
-        const isDomainForCorrectEnvironment = deployment.domain.includes(environmentType)
-        return isContainerDeployment && isDomainForCorrectEnvironment
-      })
+      .filter(deployment => deployment.type === SupportedDeploymentTypes.Container)
   }
 
    static groupDeploymentDomainsByRootDomain(deployments) {

package/src/template/platform-template.js

@@ -6,8 +6,6 @@ const { logError, logInfo } = require('../log')
  * Platform template definition
  * @typedef {Object} PlatformTemplate
  * @property {string} platformName - Name of platform
- * @property {string} domain - example.com
- * @property {string} environmentType - local, test, qa, prod
  *
  * @property {string} awsAccountId - Aws account id
  * @property {string=} awsRegion - ?