@ossy/deployment-tools 0.0.74 → 0.0.76

package/README.md

@@ -122,7 +122,8 @@ To add a new account follow the steps below.
   - don't forget to add the keypair
 - run the cdk ls command to make sure the new stack is picked up
 - run cdk bootstrap for the account and region. This will create necessary resources like roles used by aws cdk.
-- add the stack name to workflow options
+- run deploy for all stacks
+- add the instanceIp, awsRoleToAssume, and staticBucket name to the platforms.json file
 
 
 <!-- Deploys AWS infrastructure

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "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 - ?
@@ -54,15 +55,10 @@ class PlatformConfigService {
     const awsDeploymentSqsArn =
       `https://sqs.${withDefaults.awsRegion}.amazonaws.com/${withDefaults.awsAccountId}/${awsDeploymentSqsName}`
 
-    const awsRoleToAssume = process.env.CI
-      ? `github-ci-role-${withDefaults.platformName}`
-      : undefined
-
     return {
       ...withDefaults,
       awsDeploymentSqsName,
-      awsDeploymentSqsArn,
-      awsRoleToAssume,
+      awsDeploymentSqsArn
     }
 
   }

package/src/docker/docker-service.js

@@ -22,6 +22,7 @@ class DockerService {
   static createDockerNetworkForContainerManagerServer(platformConfig) {
     logInfo({ message: '[DockerService] Creating docker network for comunication between containers' })
     return exec(`docker network create ${platformConfig.ciDockerNetworkName}`)
+      .catch(() => {/* if it fils it's probably because the network already exists*/})
   }
 
   static stopContainer(deploymentRequest) {

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

@@ -1,17 +1,19 @@
 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.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.createDockerNetworkForContainerManagerServer({ ciDockerNetworkName: 'foo' })

package/src/infrastructure/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /* eslint-disable no-new */
-const { App } = require('aws-cdk-lib')
+const { App, CfnOutput } = require('aws-cdk-lib')
 const { TrustCiStack } = require('./trust-ci-stack')
 const { DeploymentTargetStack } = require('./deployment-target-stack')
 const { DnsStack } = require('./dns-stack')

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

@@ -1,4 +1,4 @@
-const { CfnOutput, Duration, RemovalPolicy } = require('aws-cdk-lib')
+const { Duration, RemovalPolicy } = require('aws-cdk-lib')
 const { Construct } = require('constructs')
 const {
   Instance,
@@ -156,12 +156,6 @@ class ContainerDeploymentTarget extends Construct {
 
     this.instancePublicIp = ec2Instance.instancePublicIp
 
-    new CfnOutput(this, 'Instance Ip', {
-      value: ec2Instance.instancePublicIp,
-      description: 'Public ip of the ec2 instance',
-      exportName: 'instanceIp'
-    })
-
   }
 }
 

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

@@ -1,6 +1,6 @@
 /* eslint-disable no-new */
 const { nanoid } = require('nanoid')
-const { Stack, Duration, RemovalPolicy } = require('aws-cdk-lib')
+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 { ContainerDeploymentTarget } = require('./container-deployment-target')
@@ -37,6 +37,26 @@ class DeploymentTargetStack extends Stack {
     })
 
     this.containerDeploymentTargetPublicIp = containerDeploymentTarget.instancePublicIp
+    this.staticDeploymentTargetBucketName = staticDeploymentTarget.bucketName
+    this.staticDeploymentTargetBucketArn = staticDeploymentTarget.bucketArn
+
+    new CfnOutput(this, 'ContainerDeploymentTargetPublicIp', {
+      value: containerDeploymentTarget.instancePublicIp,
+      description: 'Public ip of the ec2 instance',
+      exportName: 'awsContainerDeploymentTargetPublicIp'
+    })
+
+    new CfnOutput(this, 'StaticDeploymentTargetBucketName', {
+      value: staticDeploymentTarget.bucketName,
+      description: 'Name of static deployment target bucket',
+      exportName: 'awsStaticDeploymentTargetBucketName'
+    })
+
+    new CfnOutput(this, 'StaticDeploymentTargetBucketArn', {
+      value: staticDeploymentTarget.bucketArn,
+      description: 'Name of static deployment target bucket',
+      exportName: 'awsStaticDeploymentTargetBucketArn'
+    })
 
   }
 }

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,45 @@ 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)
           })
         })
 
+        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'
         }
       })