@ossy/deployment-tools 0.0.92 → 0.0.93

package/README.md

@@ -73,6 +73,12 @@ journalctl -u deployment-tools.service -n 200 -f
 journalctl -u caddy-route53.service -n 200 -f
 ```
 
+**View logs from docker service**
+```
+// With last 200 lines and follow new logs
+journalctl -u docker.service -n 200 -f
+```
+
 **Upgrade deployment-tools server version**
 
  - 1 release new version of the npm package with `npm publish`

package/package.json

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

@@ -98,7 +98,7 @@ class CaddyService {
     logInfo({ message: `[CaddyService] Replacing proxy for ${containerDeploymentTemplate.domain}` })
     const proxyConfig = CaddyConfigService.createProxyConfig(containerDeploymentTemplate)
     return fetch(`http://localhost:2019/id/${containerDeploymentTemplate.domain}`, {
-      method: 'POST',
+      method: 'PUT',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(proxyConfig)
     })

package/src/config/platform-config.js

@@ -2,6 +2,7 @@
  * Platform config definition
  * @typedef {Object} PlatformConfig
  * @property {string} platformName - Name of platform
+ * @property {string[]=} sesDomains - list of domains to configure AWS SES email identity and DKIM records for
  * @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

package/src/docker/docker-service.js

@@ -48,6 +48,7 @@ class DockerService {
       .catch(() => {
         logError({ message: `[DockerService] Faild to remove image for ${deploymentRequest.domain}` })
       }) // no worries if container isn't there
+      .then(() => exec(`docker rm -f c-${name}`))
   }
 
   static pullImage({ image, registry }) {

package/src/infrastructure/cli.js

@@ -4,13 +4,14 @@ const { App } = require('aws-cdk-lib')
 const { TrustCiStack } = require('./trust-ci-stack')
 const { DeploymentTargetStack } = require('./deployment-target-stack')
 const { DnsStack } = require('./dns-stack')
+const { SesStack } = require('./ses-stack')
 const { PlatformTemplateService, DeploymentTemplateService } = require('../template')
 const { PlatformConfigService } = require('../config')
 
 Promise.all([
-  DeploymentTemplateService.readFromFiles(process.env.DEPLOYMENTS),
+  DeploymentTemplateService.readFromFiles('../infrastructure/deployments.json'),
   PlatformTemplateService
-    .readFromFile(process.env.PLATFORMS)
+    .readFromFile('../infrastructure/platforms.json')
     .then(templates => templates.map(PlatformConfigService.from))
 ])
   .then(([deploymentMap, configs]) => {
@@ -36,5 +37,7 @@ Promise.all([
         containerDeploymentTargetPublicIp: deploymentTarget.containerDeploymentTargetPublicIp
       })
 
+      new SesStack(app, `${config.platformName}-ses`, stackProps)
+
     })
   })

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

@@ -11,7 +11,7 @@ const {
   Peer,
   Port,
   UserData,
-  BlockDevice,
+  KeyPair,
   BlockDeviceVolume
 } = require('aws-cdk-lib/aws-ec2')
 const { Role, ServicePrincipal, Policy, PolicyStatement, Effect } = require('aws-cdk-lib/aws-iam')
@@ -156,7 +156,7 @@ class ContainerDeploymentTarget extends Construct {
           volume: BlockDeviceVolume.ebs(50)
         }
       ],
-      keyName: props.config.awsKeyPairName
+      keyPair: KeyPair.fromKeyPairName(this, 'KeyPair', props.config.awsKeyPairName)
     })
 
     props.bucket.grantRead(ec2Instance, '*')

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

@@ -1,10 +1,9 @@
 /* eslint-disable no-new */
 const { nanoid } = require('nanoid')
-const { CfnOutput, Stack, Duration, RemovalPolicy } = require('aws-cdk-lib')
-const { HostedZone, ARecord, RecordTarget } = require('aws-cdk-lib/aws-route53')
-const { Bucket, BucketEncryption, BlockPublicAccess } = require('aws-cdk-lib/aws-s3')
+const { CfnOutput, Stack, RemovalPolicy } = require('aws-cdk-lib')
+const { Bucket, BlockPublicAccess } = require('aws-cdk-lib/aws-s3')
 const { Distribution, PriceClass } = require('aws-cdk-lib/aws-cloudfront')
-const { S3Origin } = require('aws-cdk-lib/aws-cloudfront-origins')
+const { S3BucketOrigin,  } = require('aws-cdk-lib/aws-cloudfront-origins')
 const { ContainerDeploymentTarget } = require('./container-deployment-target')
 
 /**
@@ -29,7 +28,6 @@ class DeploymentTargetStack extends Stack {
       new Bucket(this, 'StaticDeploymentTarget', {
         bucketName: props.config.awsStaticBucketName,
         blockPublicAccess: BlockPublicAccess.BLOCK_ALL,
-        encryption: BucketEncryption.UNENCRYPTED,
         removalPolicy: RemovalPolicy.RETAIN,
         autoDeleteObjects: false,
         cors: [{
@@ -42,7 +40,7 @@ class DeploymentTargetStack extends Stack {
 
     const mediaCDN = new Distribution(this, 'Media', {
         defaultBehavior: {
-          origin: new S3Origin(staticDeploymentTarget, { originPath: '/media' }),
+          origin: S3BucketOrigin.withOriginAccessControl(staticDeploymentTarget, { originPath: '/media' })
         },
         priceClass: PriceClass.PRICE_CLASS_100
       })

package/src/infrastructure/ses-stack.js

@@ -0,0 +1,41 @@
+/* eslint-disable no-new */
+const { Stack } = require('aws-cdk-lib')
+const { HostedZone } = require('aws-cdk-lib/aws-route53')
+const { EmailIdentity, Identity } = require('aws-cdk-lib/aws-ses')
+
+/**
+ * SesStackProps
+ * @typedef {Object} SesStackProps
+ * @property {PlatformConfig} config - platform config
+ */
+
+/**
+ * Creates SES email identities for each domain in config.sesDomains and
+ * automatically adds the required DKIM CNAME records to the Route53 hosted zone.
+ * @class
+ */
+class SesStack extends Stack {
+
+  /**
+   * @param {object} scope
+   * @param {string} id
+   * @param {SesStackProps} props
+   */
+  constructor(scope, id, props) {
+    super(scope, id, props)
+
+    const domains = props.config.sesDomains || []
+
+    domains.forEach(domain => {
+      const zone = HostedZone.fromLookup(this, `${domain}-ses-zone`, { domainName: domain })
+
+      new EmailIdentity(this, `${domain}-ses-identity`, {
+        identity: Identity.publicHostedZone(zone),
+      })
+    })
+  }
+}
+
+module.exports = {
+  SesStack
+}