@ossy/deployment-tools 0.0.88 → 0.0.90

package/package.json

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

@@ -60,6 +60,7 @@ class CaddyService {
   }
 
   static getProxyConfig(containerDeploymentTemplate) {
+    logInfo({ message: `[CaddyService] Checking if a proxy for ${containerDeploymentTemplate.domain} exists` })
     return fetch(`http://localhost:2019/id/${containerDeploymentTemplate.domain}`, {
       method: 'GET',
       headers: { 'Content-Type': 'application/json' }
@@ -73,6 +74,7 @@ class CaddyService {
   }
 
   static applyProxyConfig(containerDeploymentTemplate) {
+
     return CaddyService.getProxyConfig(containerDeploymentTemplate)
       .then(proxyConfig => {
           proxyConfig
@@ -82,6 +84,7 @@ class CaddyService {
   }
 
   static addProxyConfig(containerDeploymentTemplate) {
+    logInfo({ message: `[CaddyService] Adding proxy for ${containerDeploymentTemplate.domain}` })
     const proxyConfig = CaddyConfigService.createProxyConfig(containerDeploymentTemplate)
     return fetch('http://localhost:2019/config/apps/http/servers/deployment-tools/routes', {
       method: 'POST',
@@ -93,6 +96,7 @@ class CaddyService {
   }
 
   static replaceProxyConfig(containerDeploymentTemplate) {
+    logInfo({ message: `[CaddyService] Replacing proxy for ${containerDeploymentTemplate.domain}` })
     const proxyConfig = CaddyConfigService.createProxyConfig(containerDeploymentTemplate)
     return fetch(`http://localhost:2019/id/${containerDeploymentTemplate.domain}`, {
       method: 'POST',

package/src/caddy/temp-config.json

@@ -0,0 +1 @@
+{"apps":{"http":{"servers":{"deployment-tools":{"listen":[":443"],"routes":[{"@id":"cms.qa.ossy.se","handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"localhost:3015"}]}]}]}],"match":[{"host":["cms.qa.ossy.se"]}]},{"@id":"www.plexus-sanitas.com","handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"localhost:3000"}]}]}]}],"match":[{"host":["www.plexus-sanitas.com"]}]},{"@id":"www.plexus-sanitas.com","handle":[{"handler":"subroute","routes":[{"handle":[{"handler":"reverse_proxy","upstreams":[{"dial":"localhost:3016"}]}]}]}],"match":[{"host":["www.plexus-sanitas.com"]}]}]}}},"tls":{"automation":{"policies":[{"issuers":[{"challenges":{"dns":{"provider":{"aws_profile":"ci-client","max_retries":10,"name":"route53"}}},"module":"acme"},{"challenges":{"dns":{"provider":{"max_retries":10,"name":"route53"}}},"module":"zerossl"}],"subjects":["cms.qa.ossy.se","www.plexus-sanitas.com"]}]}}}}

package/src/docker/docker-service.js

@@ -27,7 +27,7 @@ class DockerService {
 
   static stopContainer(deploymentRequest) {
     logInfo({ message: `[DockerService] Stopping container for ${deploymentRequest.domain}` })
-    return exec(`docker stop ${deploymentRequest.domain}`)
+    return exec(`docker stop c-${deploymentRequest.domain}`)
       .catch(() => {}) // no worries if container isn't there
   }
 
@@ -53,7 +53,7 @@ class DockerService {
     return DockerService.getUnusedPort()
       .then(hostPort => {
         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=c-${domain} --rm ${envsAsString} ${imageUrl}`)
+        return exec(`docker run -d -p ${hostPort}:${containerPort} --name=c-${domain} --network=${platformConfig.ciDockerNetworkName} --network-alias=c-${domain} --rm ${envsAsString} ${imageUrl}`)
           .then(() => ({ hostPort }))
           .catch(logErrorAndReject(`[DockerService] Could not start container ${image}`))
       })

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

@@ -1,8 +1,5 @@
 const { DockerService } = require('./docker-service')
 
-const platformConfig = {
-  ciDockerNetworkName: 'foo'
-}
 
 const deploymentTemplate =   {
     "domain": "api.qa.ossy.se",

package/src/infrastructure/cli.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 /* eslint-disable no-new */
-const { App, CfnOutput } = require('aws-cdk-lib')
+const { App } = require('aws-cdk-lib')
 const { TrustCiStack } = require('./trust-ci-stack')
 const { DeploymentTargetStack } = require('./deployment-target-stack')
 const { DnsStack } = require('./dns-stack')
 const { PlatformTemplateService, DeploymentTemplateService } = require('../template')
 const { PlatformConfigService } = require('../config')
-const { PlatformDeploymentService } = require('../deploy')
 
 Promise.all([
   DeploymentTemplateService.readFromFiles(process.env.DEPLOYMENTS),