stoobly-agent 1.6.7__py3-none-any.whl → 1.7.0__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.6.7'
+VERSION = '1.7.0'

stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -10,6 +10,7 @@ DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
 DOCKER_COMPOSE_NETWORKS = '.docker-compose.networks.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
+GATEWAY_NGINX_TEMPLATE = 'nginx.tmpl'
 
 # TODO: add scaffold container name templates here
 

stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py

@@ -1,38 +1,25 @@
 import os
 import pdb
+import shutil
 import yaml
 
 from typing import List
 
+from stoobly_agent.config.data_dir import DATA_DIR_NAME, TMP_DIR_NAME
+from stoobly_agent.app.cli.scaffold.constants import APP_DIR
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
-from stoobly_agent.app.cli.scaffold.docker.constants import DOCKER_COMPOSE_BASE, DOCKER_COMPOSE_BASE_TEMPLATE
+from stoobly_agent.app.cli.scaffold.docker.constants import APP_INGRESS_NETWORK_NAME, APP_EGRESS_NETWORK_NAME, DOCKER_COMPOSE_BASE, DOCKER_COMPOSE_BASE_TEMPLATE, GATEWAY_NGINX_TEMPLATE
 from stoobly_agent.app.cli.scaffold.templates.constants import CORE_GATEWAY_SERVICE_NAME
+from stoobly_agent.app.cli.scaffold.templates import run_template_path
 
 def configure_gateway(service_paths: List[str], no_publish = False):
   if len(service_paths) == 0:
     return
 
-  ports = []
-  hostnames = []
-  for path in service_paths:
-    config = ServiceConfig(path)
+  hostnames, ports = __find_hosts(service_paths)
 
-    if not config.hostname:
-      continue
-
-    try:
-      port = int(config.port)
-    except Exception:
-      continue
-    
-    port_mapping = f"{port}:{443 if config.scheme == 'https' else 80}"
-    if port > 0 and port <= 65535 and port_mapping not in ports:
-      ports.append(port_mapping)
-
-    hostnames.append(config.hostname) 
-
-  app_dir_path = os.path.dirname(service_paths[0])
-  gateway_service_path = os.path.join(app_dir_path, CORE_GATEWAY_SERVICE_NAME)
+  service_dir_path = os.path.dirname(service_paths[0])
+  gateway_service_path = os.path.join(service_dir_path, CORE_GATEWAY_SERVICE_NAME)
   docker_compose_src_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE_TEMPLATE)
   docker_compose_dest_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE)
 
@@ -50,12 +37,66 @@ def configure_gateway(service_paths: List[str], no_publish = False):
       if not no_publish:
         gateway_base['ports'] = ports
 
-      gateway_base['networks'] = {
-        'app.egress': {},
-        'app.ingress': {
-          'aliases': hostnames
-        }
-      }
+      app_dir_path = os.path.dirname(os.path.dirname(service_dir_path))
+      __with_no_publish(gateway_base, app_dir_path)
+      __with_networks(gateway_base, hostnames) 
 
   with open(docker_compose_dest_path, 'w') as fp:
-    yaml.dump(compose, fp)
+    yaml.dump(compose, fp) 
+
+def __with_networks(config: dict, hostnames: List[str]):
+  networks = {} 
+  config['networks'] = networks
+  networks[APP_EGRESS_NETWORK_NAME] = {}
+  networks[APP_INGRESS_NETWORK_NAME] = {
+    'aliases': hostnames
+  }
+
+def __with_no_publish(config: dict, app_dir_path: str):
+  if not config['volumes']:
+    config['volumes'] = []
+
+  # Copy nginx.tmpl to .stoobly/tmp
+  nginx_template_src_path = os.path.join(run_template_path(), GATEWAY_NGINX_TEMPLATE)
+  nginx_template_relative_path = os.path.join(DATA_DIR_NAME, TMP_DIR_NAME, GATEWAY_NGINX_TEMPLATE)
+  nginx_template_dest_path = os.path.join(app_dir_path, nginx_template_relative_path)
+
+  if not os.path.exists(os.path.dirname(nginx_template_dest_path)):
+    os.makedirs(os.path.dirname(nginx_template_dest_path), exist_ok=True)
+
+  shutil.copy(nginx_template_src_path, nginx_template_dest_path)
+
+  config['volumes'].append(
+    f"{os.path.join(APP_DIR, nginx_template_relative_path)}:/app/nginx.tmpl:ro"
+  )
+
+  environment = {}
+  if not config['environment']:
+    config['environment'] = environment
+  else:
+    environment = config['environment']
+
+  environment['HTTPS_METHOD'] = 'noredirect'
+
+def __find_hosts(service_paths):
+  hostnames = []
+  ports = []
+  for path in service_paths:
+    config = ServiceConfig(path)
+
+    if not config.hostname:
+      continue
+
+    try:
+      port = int(config.port)
+    except Exception:
+      continue
+    
+    port_mapping = f"{port}:{port}"
+    if port > 0 and port <= 65535 and port_mapping not in ports:
+      ports.append(port_mapping)
+
+    if config.hostname not in hostnames:
+      hostnames.append(config.hostname) 
+
+  return hostnames, ports

stoobly_agent/app/cli/scaffold/templates/__init__.py

@@ -0,0 +1,8 @@
+import os
+import pathlib
+
+def __path():
+  return os.path.join(pathlib.Path(__file__).parent.resolve())
+
+def run_template_path():
+  return os.path.join(__path(), 'run')

stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml

@@ -2,7 +2,7 @@ services:
   gateway_base:
     environment:
       TRUST_DOWNSTREAM_PROXY: true
-    image: nginxproxy/nginx-proxy:1.5
+    image: nginxproxy/nginx-proxy:1.7
     profiles:
       - gateway_base
     volumes: