@ossy/deployment-tools 0.0.62 → 0.0.64

package/package.json

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

@@ -0,0 +1,96 @@
+const Matchers = {
+  host: host => ({ host: [host] }),
+  path: path => ({ path: [path] })
+}
+
+const Handlers = {
+  reverseProxy: upstreamPort => ({
+    handler: 'reverse_proxy',
+    upstreams: [{ dial: `localhost:${upstreamPort}` }]
+  }),
+  subroute: routes => ({
+    handler: 'subroute',
+    routes
+  })
+}
+
+/**
+  * @class
+*/
+class CaddyConfigService {
+
+  static getRouteConfig(platformConfig, deploymentRequest) {
+
+    const url = [
+      deploymentRequest.subdomain,
+      platformConfig.activeEnvironment !== 'prod' ? platformConfig.activeEnvironment : undefined,
+      platformConfig.domain
+    ]
+      .filter(x => !!x)
+      .join('.')
+
+    return {
+      match: [Matchers.host(url)],
+      handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(deploymentRequest.hostPort)]}])]
+    }
+  }
+
+  static getDefaultConfig(platformConfig) {
+    return {
+      apps: {
+        http: {
+          servers: {
+            [platformConfig.ciServerName]: {
+              listen: [':80', ':443'],
+              routes: [
+                {
+                  match: [Matchers.host(`${platformConfig.ciSubDomain}.${platformConfig.activeEnvironment}.${platformConfig.domain}`)],
+                  handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(platformConfig.ciInternalServerPort)]}])]
+                }
+              ]
+            }
+          }
+        },
+        tls: platformConfig.activeEnvironment === 'local-dev' ? undefined : {
+          automation: {
+            policies: [
+              {
+                subjects:[`*.${platformConfig.activeEnvironment}.${platformConfig.domain}`],
+                issuers:[
+                  {
+                    challenges:{
+                      dns:{
+                        provider:{
+                          'max_retries': 10,
+                          name: 'route53',
+                          'aws_profile': 'ci-client'
+                        }
+                      }
+                    },
+                    module: 'acme'
+                  },
+                  {
+                    challenges:{
+                      dns:{
+                        provider:{
+                          'max_retries': 10,
+                          name: 'route53'
+                        }
+                      }
+                    },
+                    module: 'zerossl'
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+
+}
+
+module.exports = {
+  CaddyConfigService
+}

package/src/caddy/caddy.js

@@ -0,0 +1,63 @@
+const fetch = require('node-fetch')
+const { CaddyConfigService } = require('./caddy-config')
+const { logInfo, logError, logDebug } = require('../log')
+
+/**
+  * @class
+*/
+class CaddyService {
+
+  static addDeployment(platformConfig, deploymentRequest) {
+    const routeConfig = CaddyConfigService.getRouteConfig(platformConfig, deploymentRequest)
+    const host = routeConfig.match[0].host[0]
+    logInfo({ message: `[CaddyService] Updating caddy config to route ${host} to localhost:${deploymentRequest.hostPort}` })
+
+    return fetch(`http://localhost:2019/config/apps/http/servers/${platformConfig.ciServerName}/routes`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(routeConfig)
+    })
+      .then(response => response?.error && logError({ message: `[CaddyService] Could not update caddy config to include ${host}`, error }))
+      .catch(error => logError({ message: `[CaddyService] Could not update caddy config to include ${host}`, error }))
+  }
+
+  static applyDefaultConfig(platformConfig) {
+    return CaddyService.fetchServerConfig(platformConfig)
+      .then(caddyConfig => {
+
+        if (caddyConfig) {
+          logInfo({ message: '[CaddyService] Server config already exist, not applying default config' })
+          return
+        }
+
+        logInfo({ message: '[CaddyService] Applying default caddy config' })
+        const defaultConfig = CaddyConfigService.getDefaultConfig(platformConfig)
+        return fetch('http://localhost:2019/load', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(defaultConfig)
+        })
+      })
+      .then(response => response?.error && logError({ message: '[CaddyService] Could not apply default caddy config', error }))
+      .catch(error => logError({ message: '[CaddyService] Could not apply default caddy config', error }))
+
+  }
+
+  static fetchServerConfig(platformConfig) {
+    logInfo({ message: '[CaddyService] Fetching server config' })
+    return fetch(`http://localhost:2019/config/apps/http/servers/${platformConfig.ciServerName}`, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' }
+    })
+      .then(x => x.json())
+      .then(response => {
+        if (!response?.error) return response
+        logInfo({ message: '[CaddyService] No server config found' })
+        logDebug({ message: '[CaddyService] Error while fetching server config', data: response.error })
+      })
+  }
+}
+
+module.exports = {
+  CaddyService
+}

package/src/caddy/caddy.playground.js

@@ -0,0 +1,21 @@
+const { CaddyService } = require('./caddy')
+
+const config = {
+  activeEnvironment: 'prod',
+  domain: 'localhost',
+  ciServerName: 'ossy',
+  ciSubDomain: 'ci',
+  ciInternalServerPort: '3000'
+}
+
+const deploymentRequest = {
+  subdomain: 'cc',
+  hostPort: '3000'
+}
+
+CaddyService.applyDefaultConfig(config)
+
+// CaddyService.addDeployment(config, deploymentRequest)
+
+// CaddyService.fetchServerConfig(config)
+//   .then(console.log)

package/src/caddy/index.js

@@ -0,0 +1 @@
+module.exports = require('./caddy.js')

package/src/infrastructure/container-server/user-data-commands.js

@@ -1,4 +1,3 @@
-
 const getInstallDocker = () => [
   'apt-get remove docker docker-engine docker.io containerd runc',
   `apt-get install \

package/src/log.js

@@ -21,16 +21,20 @@ const logInfo = logInput => {
 
 const logError = logInput => {
   const messagePrefix = prefixTo(TypeOfMessage.Error, logInput.message)
+  log('\n')
   log(`${messagePrefix}${logInput.message}`)
-  logInput.error && log('\n[Reason]:', logInput.error, '\n')
+  logInput.error && log('[Reason]:', logInput.error)
+  log('\n')
 }
 
 const logDebug = logInput => {
   const isDebugOn = process.env.DEBUG || true
   if (!isDebugOn) return
   const messagePrefix = prefixTo(TypeOfMessage.Debug, logInput.message)
+  log('\n')
   log(`${messagePrefix}${logInput.message}`)
-  logInput.data && log('\n[Debug data]:', logInput.data, '\n')
+  logInput.data && log('[DEBUG DATA]:', logInput.data)
+  log('\n')
 }
 
 const logErrorAndReject = message => error => {

package/src/server/platform-server.js

@@ -1,4 +1,4 @@
-const { CaddyService } = require('./caddy')
+const { CaddyService } = require('../caddy')
 const { DockerService } = require('../docker')
 const { RestApiService } = require('./rest-api')
 
@@ -8,6 +8,7 @@ const { DeploymentQueueService } = require('../deployment-queue')
 const { logError } = require('../log')
 
 // journalctl -u deployment-tools.service
+// docker logs
 /**
   * @class
 */

package/src/server/platform-server.playground.js

@@ -0,0 +1,10 @@
+// const { PlatformServerService } = require('./platform-server')
+const { RestApiService } = require('./rest-api')
+
+// PlatformServerService.start({
+//
+// })
+
+RestApiService.start({
+  ciInternalServerPort: 3000
+})

package/src/server/caddy.js

@@ -1,114 +0,0 @@
-const fetch = require('node-fetch')
-const { logInfo, logError } = require('../log')
-
-const Matchers = {
-  host: host => ({ host: [host] }),
-  path: path => ({ path: [path] })
-}
-
-const Handlers = {
-  reverseProxy: upstreamPort => ({
-    handler: 'reverse_proxy',
-    upstreams: [{ dial: `localhost:${upstreamPort}` }]
-  }),
-  subroute: routes => ({
-    handler: 'subroute',
-    routes
-  })
-}
-
-/**
-  * @class
-*/
-class CaddyService {
-
-  static addDeployment(platformConfig, deploymentRequest) {
-
-    const url = `${deploymentRequest.subdomain}.${platformConfig.activeEnvironment}.${platformConfig.domain}`
-
-    logInfo({ message: `[CaddyService] Updating caddy config to route ${url} to localhost:${deploymentRequest.hostPort}` })
-
-    return fetch(`http://localhost:2019/config/apps/http/servers/${platformConfig.ciServerName}/routes/0/handle`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(Handlers.subroute([
-        {
-          match: [Matchers.host(url)],
-          handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(deploymentRequest.hostPort)]}])]
-        }
-      ]))
-    })
-      .catch(error => logError({ message: `[CaddyService] Could not update caddy config to include ${url}`, error }))
-  }
-
-  static applyDefaultConfig(platformConfig) {
-    logInfo({ message: '[CaddyService] Applying default caddy config' })
-    return fetch('http://localhost:2019/load', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        apps: {
-          http: {
-            servers: {
-              [platformConfig.ciServerName]: {
-                listen: [':80', ':443'],
-                routes: [
-                  {
-                    match: [Matchers.host(`*.${platformConfig.activeEnvironment}.${platformConfig.domain}`)],
-                    handle: [Handlers.subroute([
-                      {
-                        match: [Matchers.host(`${platformConfig.ciSubDomain}.${platformConfig.activeEnvironment}.${platformConfig.domain}`)],
-                        handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(platformConfig.ciInternalServerPort)]}])]
-                      }
-                    ])],
-                    terminal: true
-                  }
-                ]
-              }
-            }
-          },
-          tls: {
-            automation: {
-              policies: [
-                {
-                  subjects:[`*.${platformConfig.activeEnvironment}.${platformConfig.domain}`],
-                  issuers:[
-                    {
-                      challenges:{
-                        dns:{
-                          provider:{
-                            'max_retries': 10,
-                            name: 'route53',
-                            'aws_profile': 'ci-client'
-                          }
-                        }
-                      },
-                      module: 'acme'
-                    },
-                    {
-                      challenges:{
-                        dns:{
-                          provider:{
-                            'max_retries': 10,
-                            name: 'route53'
-                          }
-                        }
-                      },
-                      module: 'zerossl'
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        }
-      })
-    })
-      .catch(error => logError({ message: '[CaddyService] Could not apply default caddy config', error }))
-  }
-
-}
-
-module.exports = {
-  CaddyService
-}