@ossy/deployment-tools 0.0.81 → 0.0.83

package/cdk.context.json

@@ -72,5 +72,9 @@
   "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.81",
+  "version": "0.0.83",
   "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/cms/cli.js

@@ -1,37 +1,45 @@
 #!/usr/bin/env node
+const { resolve } = require('path')
 const { readFileSync } = require('fs')
 const arg = require('arg')
 const fetch = require('node-fetch')
-const { PlatformDeploymentService } = require('./platform-deployment')
 const { logInfo, logError } = require('../log')
 
 const getTokenPayload = token =>
   JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString())
 
-
-const import = options => {
+const importResourceTemplates = options => {
 
   const parsedArgs = arg({
     '--authentication': String,
     '--a': '--authentication',
 
-    '--resource-templates': String,
-    '-t': '--resource-templates'
+    '--ossy-file': String,
+    '-o': '--ossy-file',
   }, { argv: options })
 
   logInfo({ message: '[CMS] reading files' })
   const token = parsedArgs['--authentication']
   const tokenPayload = getTokenPayload(token)
-  const templates = readFileSync(resolve(parsedArgs['--resource-templates']), 'utf8')
+  const ossyfile = JSON.parse(readFileSync(resolve(parsedArgs['--ossy-file']), 'utf8'))
+
+  console.log('ossyfile', ossyfile)
 
   if (!token) return logError({ message: '[CMS] No token provided with --authentication'})
-  if (!templates) return logError({ message: '[CMS] No templates provided with --resource-templates'})
+  if (!ossyfile?.workspaceId) return logError({ message: '[CMS] No workspaceId provided in ossy.json'})
+  if (!ossyfile?.resourceTemplates) return logError({ message: '[CMS] No resource templates provided in ossy.json'})
 
-  logInfo({ message: '[CMS] uploading files' })
+  logInfo({ message: '[CMS] uploading resource templates' })
+
+  const fetchOptions = {
+    method: 'POST',
+    headers: { 'Authorization': token, 'Content-Type': 'application/json' },
+    body: JSON.stringify(ossyfile.resourceTemplates)
+  }
 
   fetch(
-    `https://cms.ossy.se/api/v0/workspaces/${tokenPayload?.workspaceId}/resource-templates`,
-    { method: 'POST', headers: { 'Authorization': token }, body: templates }
+    `http://localhost:3001/api/v0/workspaces/${ossyfile.workspaceId}/resource-templates`,
+    fetchOptions
   )
   .then(() => logInfo({ message: '[CMS] done' }))
   .catch(error => logError({ message: '[CMS] Error', error }))
@@ -40,7 +48,7 @@ const import = options => {
 module.exports = {
   handler: ([command, ...options]) => {
     !!command
-      ? { deploy }[command](options)
+      ? { 'import-resource-templates': importResourceTemplates }[command](options)
       : logError({ message: '[CMS] No command provided' })
   }
 }

package/src/deploy/platform-deployment.js

@@ -28,7 +28,7 @@ class PlatformDeploymentService {
       .then(([deploymentTemplates, platformConfigs]) => {
 
         const platformConfig = platformConfigs.find(({ platformName }) => platformName === targetPlatform)
-        const deploymentTemplatesForTargetPlatform = deploymentTemplates[targetPlatform] || []
+        const deploymentTemplatesForTargetPlatform = deploymentTemplates[targetPlatform] || [] //todo remove deploymentTargetPlatform
         const deploymentTemplate = deploymentTemplatesForTargetPlatform.find(({ domain }) => domain === targetDomain)
 
         if (!platformConfig) {

package/src/docker/docker-service.js

@@ -39,9 +39,16 @@ class DockerService {
       .catch(() => {}) // no worries if container isn't there
   }
 
+  static pullImage({ image, registry }) {
+    const imageUrl = !!registry ? `${registry}/${image}` : image
+    logInfo({ message: `[DockerService] Pulling image for ${image}:latest` })
+    return exec(`docker image pull ${imageUrl}:latest`)
+      .catch(logErrorAndReject(`[DockerService] Could pull image ${image}:latest`))
+  }
+
   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}`, '')
+    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}`))
@@ -67,6 +74,7 @@ class DockerService {
     return DockerService.resolveCredentials(deploymentRequest)
       .then(() => DockerService.stopContainer(deploymentRequest))
       .then(() => DockerService.removeImage(deploymentRequest))
+      .then(() => DockerService.pullImage(deploymentTemplate))
       .then(() => DockerService.startContainer(platformConfig, deploymentRequest))
   }
 

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

@@ -1,6 +1,18 @@
 const { DockerService } = require('./docker-service')
 
+const platformConfig = {
+  ciDockerNetworkName: 'foo'
+}
 
-DockerService.removeImage(
-  { image: 'ossy-se/cms-client-web', registry: 'ghcr.io', domain: 'oskars.com', hostPort: '3005', containerPort: '3000' }
+const deploymentTemplate =   {
+    "domain": "api.qa.ossy.se",
+    "image": "ossy-se/cms-api",
+    "targetDeploymentPlatform": "ossybot",
+    "type": "CONTAINER",
+    "hostPort": "3001",
+    "containerPort": "3000",
+  }
+
+DockerService.pullImage(
+  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
     })