@ossy/deployment-tools 0.0.5 → 0.0.8

package/dist/index.js

@@ -28393,9 +28393,16 @@ function fixResponseChunkedTransferBadEnding(request, errorCallback) {
 	});
 }
 
+;// CONCATENATED MODULE: ./src/config.js
+const domain = process.env.DEPLOYMENT_TOOLS_DOMAIN || 'localhost'
+const environmentName = process.env.DEPLOYMENT_TOOLS_ENVIRONMENT_NAME || 'dev'
+const ciSubDomain = process.env.DEPLOYMENT_TOOLS_CI_SUB_DOMAIN || 'ci'
+const port = process.env.DEPLOYMENT_TOOLS_PORT || 3000
+
 ;// CONCATENATED MODULE: ./src/caddy-client.js
 
 
+
 const Matchers = {
   host: host => ({ host: [host] }),
   path: path => ({ path: [path] })
@@ -28412,64 +28419,6 @@ const Handlers = {
   })
 }
 
-const createRouteConfig = ({ domain, path, upstreamPort }) => ({
-  match: [Matchers.host(domain)],
-  handle: [
-    {
-      handler: 'subroute',
-      routes: [
-        { handle: [Handlers.reverseProxy(upstreamPort)]}
-      ]
-    }
-  ],
-  terminal: true
-})
-
-const multipleDomansAndSubroutes = () => ({
-  apps: {
-    http: {
-      servers: {
-        'ci-client': {
-          listen: [
-            ':443'
-          ],
-          routes: [
-            {
-              match: [Matchers.host('admin.localhost')],
-              handle: [
-                Handlers.subroute([{ handle: [Handlers.reverseProxy(3000)] }])
-              ],
-              terminal: true
-            },
-            {
-              match: [Matchers.host('cms.localhost')],
-              handle: [
-                Handlers.subroute([{ handle: [Handlers.reverseProxy(3005)] }])
-              ],
-              terminal: true
-            },
-            {
-              match: [Matchers.host('localhost')],
-              handle: [
-                Handlers.subroute([
-                  {
-                    handle: [Handlers.reverseProxy(3001)],
-                    match: [Matchers.path('/api/*')]
-                  },
-                  { handle: [Handlers.reverseProxy(3000)] }
-                ])
-              ],
-              terminal: true
-            }
-          ]
-        }
-      }
-    }
-  }
-})
-
-//   curl localhost:2019/id/msg
-
 class CaddyClient {
 
   constructor(serverName = 'ci-client') {
@@ -28477,16 +28426,15 @@ class CaddyClient {
   }
 
   deploy({ domain, targetPort }) {
-    return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes`, {
+    return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes/0/handle`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        match: [Matchers.host(domain)],
-        handle: [
-          Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)] }])
-        ],
-        terminal: true
-      })
+      body: JSON.stringify( Handlers.subroute([
+        {
+          match: [Matchers.host(domain)],
+          handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)]}])]
+        }
+      ]))
     })
   }
 
@@ -28500,7 +28448,13 @@ class CaddyClient {
             servers: {
               [this.serverName]: {
                 listen: [':443'],
-                routes: []
+                routes: [
+                  {
+                    match: [Matchers.host(`*.${environmentName}.${domain}`)],
+                    handle: [],
+                    terminal: true
+                  }
+                ]
               }
             }
           }
@@ -28650,11 +28604,6 @@ ${this.startContainer({ image, containerPort, hostPort, registry, env })}`
 
 const createDockerClient = () => new DockerClient()
 
-;// CONCATENATED MODULE: ./src/config.js
-const domain = process.env.DEPLOYMENT_TOOLS_DOMAIN || 'localhost'
-const subdomain = process.env.DEPLOYMENT_TOOLS_SUBDOMAIN || 'local-dev.ci'
-const port = process.env.DEPLOYMENT_TOOLS_PORT || 3000
-
 ;// CONCATENATED MODULE: ./src/container-manager-server.js
 
 
@@ -28676,7 +28625,7 @@ class ContainerManagerServer {
 
     this.caddyClient.applyDefaultServerConfig()
       .then(() => this.caddyClient.deploy({
-        domain: `${subdomain}.${domain}`,
+        domain: `${ciSubDomain}.${environmentName}.${domain}`,
         targetPort: port
       }))
 
@@ -28834,7 +28783,11 @@ class ContainerManagerCommands {
 
           console.log('body', body)
 
-          fetch(`http://${targetEnvironment}.ci.${platform.domain}/deploy`, {
+          const ciUrl = targetEnvironment === 'prod'
+            ? `http://${platform.ciSubDomain}.${platform.domain}/deploy`
+            : `http://${platform.ciSubDomain}.${targetEnvironment}.${platform.domain}/deploy`
+
+          fetch(ciUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(body)
@@ -28876,7 +28829,8 @@ After=network.target
 
 [Service]
 Environment=DEPLOYMENT_TOOLS_DOMAIN=${domain}
-Environment=DEPLOYMENT_TOOLS_SUBDOMAIN=${subdomain}
+Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${environmentName}
+Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${ciSubDomain}
 Environment=DEPLOYMENT_TOOLS_PORT=${port}
 User=root
 ExecStart=npx @ossy/deployment-tools start-container-manager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",

package/src/Caddyfile

@@ -1,22 +1,10 @@
-localhost {
-  reverse_proxy /api/* {
-    to localhost:3001
-  }
+*.qa.ossy.com {
 
-  reverse_proxy * {
-    to localhost:3000
-  }
+	@foo host ci.qa.example.com
+	handle @foo {
+    reverse_proxy * {
+      to localhost:3005
+    }
+	}
 
 }
-
-cms.localhost {
-  reverse_proxy * {
-    to localhost:3005
-  }
-}
-
-admin.localhost {
-  reverse_proxy * {
-    to localhost:3000
-  }
-}

package/src/caddy-client.js

@@ -1,4 +1,5 @@
 import fetch from 'node-fetch'
+import * as config from './config.js'
 
 const Matchers = {
   host: host => ({ host: [host] }),
@@ -16,64 +17,6 @@ const Handlers = {
   })
 }
 
-const createRouteConfig = ({ domain, path, upstreamPort }) => ({
-  match: [Matchers.host(domain)],
-  handle: [
-    {
-      handler: 'subroute',
-      routes: [
-        { handle: [Handlers.reverseProxy(upstreamPort)]}
-      ]
-    }
-  ],
-  terminal: true
-})
-
-const multipleDomansAndSubroutes = () => ({
-  apps: {
-    http: {
-      servers: {
-        'ci-client': {
-          listen: [
-            ':443'
-          ],
-          routes: [
-            {
-              match: [Matchers.host('admin.localhost')],
-              handle: [
-                Handlers.subroute([{ handle: [Handlers.reverseProxy(3000)] }])
-              ],
-              terminal: true
-            },
-            {
-              match: [Matchers.host('cms.localhost')],
-              handle: [
-                Handlers.subroute([{ handle: [Handlers.reverseProxy(3005)] }])
-              ],
-              terminal: true
-            },
-            {
-              match: [Matchers.host('localhost')],
-              handle: [
-                Handlers.subroute([
-                  {
-                    handle: [Handlers.reverseProxy(3001)],
-                    match: [Matchers.path('/api/*')]
-                  },
-                  { handle: [Handlers.reverseProxy(3000)] }
-                ])
-              ],
-              terminal: true
-            }
-          ]
-        }
-      }
-    }
-  }
-})
-
-//   curl localhost:2019/id/msg
-
 class CaddyClient {
 
   constructor(serverName = 'ci-client') {
@@ -81,16 +24,15 @@ class CaddyClient {
   }
 
   deploy({ domain, targetPort }) {
-    return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes`, {
+    return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes/0/handle`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        match: [Matchers.host(domain)],
-        handle: [
-          Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)] }])
-        ],
-        terminal: true
-      })
+      body: JSON.stringify( Handlers.subroute([
+        {
+          match: [Matchers.host(domain)],
+          handle: [Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)]}])]
+        }
+      ]))
     })
   }
 
@@ -104,7 +46,13 @@ class CaddyClient {
             servers: {
               [this.serverName]: {
                 listen: [':443'],
-                routes: []
+                routes: [
+                  {
+                    match: [Matchers.host(`*.${config.environmentName}.${config.domain}`)],
+                    handle: [],
+                    terminal: true
+                  }
+                ]
               }
             }
           }

package/src/config.js

@@ -1,3 +1,4 @@
 export const domain = process.env.DEPLOYMENT_TOOLS_DOMAIN || 'localhost'
-export const subdomain = process.env.DEPLOYMENT_TOOLS_SUBDOMAIN || 'local-dev.ci'
+export const environmentName = process.env.DEPLOYMENT_TOOLS_ENVIRONMENT_NAME || 'dev'
+export const ciSubDomain = process.env.DEPLOYMENT_TOOLS_CI_SUB_DOMAIN || 'ci'
 export const port = process.env.DEPLOYMENT_TOOLS_PORT || 3000

package/src/container-manager-commands.js

@@ -101,7 +101,11 @@ export class ContainerManagerCommands {
 
           console.log('body', body)
 
-          fetch(`http://${targetEnvironment}.ci.${platform.domain}/deploy`, {
+          const ciUrl = targetEnvironment === 'prod'
+            ? `http://${platform.ciSubDomain}.${platform.domain}/deploy`
+            : `http://${platform.ciSubDomain}.${targetEnvironment}.${platform.domain}/deploy`
+
+          fetch(ciUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(body)

package/src/container-manager-server.js

@@ -18,7 +18,7 @@ export class ContainerManagerServer {
 
     this.caddyClient.applyDefaultServerConfig()
       .then(() => this.caddyClient.deploy({
-        domain: `${config.subdomain}.${config.domain}`,
+        domain: `${config.ciSubDomain}.${config.environmentName}.${config.domain}`,
         targetPort: config.port
       }))
 

package/src/index.js

@@ -28,7 +28,8 @@ After=network.target
 
 [Service]
 Environment=DEPLOYMENT_TOOLS_DOMAIN=${config.domain}
-Environment=DEPLOYMENT_TOOLS_SUBDOMAIN=${config.subdomain}
+Environment=DEPLOYMENT_TOOLS_ENVIRONMENT_NAME=${config.environmentName}
+Environment=DEPLOYMENT_TOOLS_CI_SUB_DOMAIN=${config.ciSubDomain}
 Environment=DEPLOYMENT_TOOLS_PORT=${config.port}
 User=root
 ExecStart=npx @ossy/deployment-tools start-container-manager