stoobly-agent 1.6.2__tar.gz → 1.6.3__tar.gz

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.6.2
+Version: 1.6.3
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.6.2"
+version = "1.6.3"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.6.2'
+VERSION = '1.6.3'

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/app_command.py

@@ -5,6 +5,7 @@ import shutil
 from .app import App
 from .app_config import AppConfig
 from .command import Command
+from .docker.constants import DOCKER_COMPOSE_NETWORKS
 
 class AppCommand(Command):
 
@@ -29,6 +30,20 @@ class AppCommand(Command):
   def app_config_path(self):
     return self.__config.path
 
+  @property
+  def networks_compose_path(self):
+    return os.path.join(
+      self.data_dir_path,
+      self.networks_compose_relative_path
+    )
+
+  @property
+  def networks_compose_relative_path(self):
+    return os.path.join(
+      self.namespace,
+      DOCKER_COMPOSE_NETWORKS
+    )
+
   @property
   def scaffold_namespace_path(self):
     return self.app.scaffold_namespace_path

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/constants.py

@@ -32,6 +32,9 @@ SERVICE_SCHEME_ENV = 'SERVICE_SCHEME'
 SERVICE_PORT = '${SERVICE_PORT}'
 SERVICE_PORT_ENV = 'SERVICE_PORT'
 SERVICE_PRIORITY_ENV = 'SERVICE_PRIORITY'
+SERVICE_SCRIPTS = '${SERVICE_SCRIPTS}'
+SERVICE_SCRIPTS_DIR = '/usr/local/bin/services'
+SERVICE_SCRIPTS_ENV = 'SERVICE_SCRIPTS'
 STOOBLY_HOME_DIR = '/home/stoobly'
 STOOBLY_DATA_DIR = os.path.join(STOOBLY_HOME_DIR, DATA_DIR_NAME)
 STOOBLY_CERTS_DIR = os.path.join(STOOBLY_DATA_DIR, CERTS_DIR_NAME)
@@ -52,6 +55,9 @@ WORKFLOW_NAME = '${WORKFLOW_NAME}'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_NAMESPACE_ENV = 'WORKFLOW_NAMESPACE'
 WORKFLOW_RECORD_TYPE = 'record'
+WORKFLOW_SCRIPTS = '${WORKFLOW_SCRIPTS}'
+WORKFLOW_SCRIPTS_DIR = '/usr/local/bin/workflows'
+WORKFLOW_SCRIPTS_ENV = 'WORKFLOW_SCRIPTS'
 WORKFLOW_TEMPLATE = '${WORKFLOW_TEMPLATE}'
 WORKFLOW_TEMPLATE_ENV = 'WORKFLOW_TEMPLATE'
 WORKFLOW_TEST_TYPE = 'test'

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/builder.py

@@ -3,7 +3,7 @@ import pathlib
 import pdb
 import yaml
 
-from .constants import APP_NETWORK, APP_NETWORK_NAME, DOCKER_COMPOSE_CUSTOM 
+from .constants import APP_EGRESS_NETWORK, APP_EGRESS_NETWORK_NAME, APP_INGRESS_NETWORK, APP_INGRESS_NETWORK_NAME, DOCKER_COMPOSE_CUSTOM 
 
 class Builder():
 
@@ -35,12 +35,12 @@ class Builder():
     return self.__dir_path
 
   @property
-  def public_network(self):
-    return self.__networks.get(APP_NETWORK_NAME)
+  def egress_network(self):
+    return self.__networks.get(APP_EGRESS_NETWORK_NAME)
 
   @property
-  def public_network_name(self):
-    return APP_NETWORK_NAME
+  def egress_network_name(self):
+    return APP_EGRESS_NETWORK_NAME
 
   @property
   def networks(self):
@@ -86,12 +86,19 @@ class Builder():
 
   def with_network(self, network):
     self.__networks[network] = {
-      'name': f"{APP_NETWORK}.{network}"
+      'name': f"{APP_EGRESS_NETWORK}.{network}"
     }
     return self
 
-  def with_public_network(self, network = APP_NETWORK):
-    self.__networks[APP_NETWORK_NAME] = {
+  def with_egress_network(self, network = APP_EGRESS_NETWORK):
+    self.__networks[APP_EGRESS_NETWORK_NAME] = {
+      'external': True,
+      'name': network,
+    }
+    return self
+
+  def with_ingress_network(self, network = APP_INGRESS_NETWORK):
+    self.__networks[APP_INGRESS_NETWORK_NAME] = {
       'external': True,
       'name': network,
     }

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -1,8 +1,13 @@
-APP_NETWORK_NAME = 'app'
-APP_NETWORK = '${APP_NETWORK}'
+APP_EGRESS_NETWORK = '${APP_NETWORK}.egress'
+APP_EGRESS_NETWORK_NAME = 'app.egress'
+APP_EGRESS_NETWORK_TEMPLATE = '{network}.egress'
+APP_INGRESS_NETWORK = '${APP_NETWORK}.ingress'
+APP_INGRESS_NETWORK_NAME = 'app.ingress'
+APP_INGRESS_NETWORK_TEMPLATE = '{network}.ingress'
 DOCKER_COMPOSE_BASE = '.docker-compose.base.yml'
 DOCKER_COMPOSE_BASE_TEMPLATE = '.docker-compose.base.template.yml'
 DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
+DOCKER_COMPOSE_NETWORKS = '.docker-compose.networks.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
 

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, WORKFLOW_TEMPLATE
+from ...constants import WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -22,8 +22,6 @@ class ServiceBuilder(Builder):
     self.__config = config
     self.__service_name = os.path.basename(service_path)
 
-    self.load()
-
   @property
   def app_base(self):
     return f"{self.service_name}.app_base"
@@ -86,7 +84,7 @@ class ServiceBuilder(Builder):
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {
-      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
+      'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -97,7 +95,7 @@ class ServiceBuilder(Builder):
   def build_configure_base(self):
     environment = {}
     self.with_service(self.configure_base, {
-      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
+      'command': [f"{WORKFLOW_SCRIPTS}/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -112,7 +110,11 @@ class ServiceBuilder(Builder):
     if self.config.hostname:
       self.build_proxy_base()
 
-    super().write({
-      'networks': self.networks,
+    compose = {
       'services': self.services,
-    })
+    }
+
+    if self.networks:
+      compose['networks'] = self.networks
+
+    super().write(compose)

stoobly_agent-1.6.2/stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py → stoobly_agent-1.6.3/stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py

@@ -8,14 +8,18 @@ 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.templates.constants import CORE_GATEWAY_SERVICE_NAME
 
-def set_gateway_ports(service_paths: List[str]):
+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)
 
+    if not config.hostname:
+      continue
+
     try:
       port = int(config.port)
     except Exception:
@@ -25,6 +29,8 @@ def set_gateway_ports(service_paths: List[str]):
     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)
   docker_compose_src_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE_TEMPLATE)
@@ -41,7 +47,15 @@ def set_gateway_ports(service_paths: List[str]):
     gateway_base = services.get('gateway_base')
 
     if gateway_base:
-      gateway_base['ports'] = ports
+      if not no_publish:
+        gateway_base['ports'] = ports
+
+      gateway_base['networks'] = {
+        'app.egress': {},
+        'app.ingress': {
+          'aliases': hostnames
+        }
+      }
 
   with open(docker_compose_dest_path, 'w') as fp:
     yaml.dump(compose, fp)

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py

@@ -22,7 +22,6 @@ class BuildDecorator():
       **app_service,
       **{ 
           'extends': service_builder.build_extends_proxy_base(self.workflow_builder.dir_path),
-          'hostname': service_builder.config.hostname,
           'profiles': self.workflow_builder.profiles,
         } 
     }

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -32,11 +32,6 @@ class WorkflowBuilder(Builder):
       STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, self.service_builder.service_name, self.workflow_name
     )
 
-    if self.config.hostname:
-      self.with_public_network()
-
-    self.load()
-  
   @property
   def app(self):
     return f"{self.namespace}.app"
@@ -91,8 +86,6 @@ class WorkflowBuilder(Builder):
 
   def build_all(self):
     # Resources
-    self.with_network(self.service_builder.service_name)
-    
     if self.config.detached:
       self.with_volume(self.service_builder.service_name)
 
@@ -101,7 +94,6 @@ class WorkflowBuilder(Builder):
     self.build_configure()
 
     if self.config.hostname:
-      self.with_public_network()
       self.build_proxy() # Depends on configure, must call build_configure first
 
   def build_init(self):
@@ -166,7 +158,7 @@ class WorkflowBuilder(Builder):
 
     depends_on = {}
     environment = { **self.env_dict() }
-    networks = [self.service_builder.service_name]
+    networks = {}
     volumes = []
 
     service = {
@@ -188,14 +180,13 @@ class WorkflowBuilder(Builder):
         'condition': 'service_completed_successfully',
       }
 
-    if self.config.hostname:
-      environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
-      environment['VIRTUAL_PORT'] = SERVICE_PORT
-      environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
+    environment['VIRTUAL_HOST'] = SERVICE_HOSTNAME
+    environment['VIRTUAL_PORT'] = SERVICE_PORT
+    environment['VIRTUAL_PROTO'] = SERVICE_SCHEME
 
-      # Expose this container service to the public network 
-      # so that it is accessible to other Stoobly services
-      networks.append(self.public_network_name)
+    # Expose this container service to the public network 
+    # so that it is accessible to other Stoobly services
+    networks[self.egress_network_name] = {}
 
     if self.config.detached:
       volumes.append(f"{self.service_builder.service_name}:{STOOBLY_HOME_DIR}/.stoobly")
@@ -213,10 +204,14 @@ class WorkflowBuilder(Builder):
     dest = self.custom_compose_file_path
 
     if not os.path.exists(dest):
-      super().write({
-        'networks': self.networks,
+      compose = {
         'services': {}
-      }, dest)
+      }
+
+      if self.networks:
+        compose['networks'] = self.networks
+
+      super().write(compose, dest)
 
   def with_env(self, v: List[str]): 
     if not isinstance(v, list):
@@ -225,11 +220,17 @@ class WorkflowBuilder(Builder):
     return self
 
   def write(self):
-    super().write({
-      'networks': self.networks,
+    compose = {
       'services': self.services,
-      'volumes': self.volumes,
-    })
+    }
+
+    if self.networks:
+      compose['networks'] = self.networks
+
+    if self.volumes:
+      compose['volumes'] = self.volumes
+
+    super().write(compose)
 
   def __with_url_environment(self, environment):
     environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py

@@ -1,7 +1,7 @@
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 
 from ...constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE
-from .development_decorator import DevelopmentDecorator
+from .dns_decorator import DnsDecorator
 from .mock_decorator import MockDecorator
 from .reverse_proxy_decorator import ReverseProxyDecorator
 
@@ -11,11 +11,11 @@ def get_workflow_decorators(workflow: str, service_config: ServiceConfig):
   if workflow == WORKFLOW_RECORD_TYPE:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator)
-      workflow_decorators.append(DevelopmentDecorator)
+      workflow_decorators.append(DnsDecorator)
   elif workflow == WORKFLOW_MOCK_TYPE:
      if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator)    
-      workflow_decorators.append(DevelopmentDecorator)
+      workflow_decorators.append(DnsDecorator)
   else:
     if service_config.hostname:
       workflow_decorators.append(ReverseProxyDecorator if service_config.detached else MockDecorator) 

stoobly_agent-1.6.2/stoobly_agent/app/cli/scaffold/docker/workflow/development_decorator.py → stoobly_agent-1.6.3/stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py

@@ -2,7 +2,7 @@ from ...constants import SERVICE_DNS
 
 from .builder import WorkflowBuilder
 
-class DevelopmentDecorator():
+class DnsDecorator():
 
   def __init__(self, workflow_builder: WorkflowBuilder):
     self.__workflow_builder = workflow_builder

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -41,5 +41,5 @@ class MockDecorator():
 
     services[proxy_name] = { 
       **proxy_service,
-      **{ 'command': command, 'hostname': f"{SERVICE_HOSTNAME}" },
+      **{ 'command': command },
     }

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -40,19 +40,6 @@ class ReverseProxyDecorator():
 
     additional_properties = { 'command': command }
 
-    # Proxying forwards requests to the actual service
-    # If the destination hostname is the same as the service's hostname, then
-    # If we set the 'hostname' property, this will cause an "infinite loop"
-    proxy_mode_toks = config.proxy_mode.split(':', 1)
-
-    if len(proxy_mode_toks) > 1:
-      directed = proxy_mode_toks[0] == 'reverse' or proxy_mode_toks[0] == 'upstream'
-      if directed:
-        spec = proxy_mode_toks[1]
-        uri = urlparse(spec)
-        if uri.hostname != self.service_builder.config.hostname:
-          additional_properties['hostname'] = f"{SERVICE_HOSTNAME}"
-
     service = { 
       **proxy_service,
       **additional_properties,

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -18,6 +18,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
+from stoobly_agent.app.cli.scaffold.docker.constants import APP_EGRESS_NETWORK_TEMPLATE
 from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
@@ -113,7 +114,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',
       command=f"curl --max-time {timeout_seconds} {url} --verbose",
-      network=self.app_config.network,
+      network=APP_EGRESS_NETWORK_TEMPLATE.format(network=self.app_config.network),
       stderr=True,
       remove=True,
     )

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -25,7 +25,7 @@ exec_namespace=$(shell echo $(context_dir) | (md5 2>/dev/null || md5sum 2>/dev/n
 user_id_option=--user-id $(USER_ID)
 stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(exec_namespace)
 workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
-workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option)
+workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option) $(WORKFLOW_UP_OPTIONS)
 
 app_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
@@ -88,7 +88,6 @@ nameservers: tmpdir
 		echo "$$nameserver" > $(app_tmp_dir)/.nameservers; \
 	else \
 		echo "/etc/resolv.conf not found." >&2; \
-		exit 1; \
 	fi
 intercept/disable:
 	@export EXEC_COMMAND=.disable && \
@@ -191,7 +190,7 @@ workflow/services:
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run)
 workflow/test:
-	$(eval WORKFLOW=test)
+	$(eval WORKFLOW=test) $(eval WORKFLOW_UP_OPTIONS=--no-publish)
 workflow/up:
 	@export EXEC_COMMAND=.up && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \

stoobly_agent-1.6.3/stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml

@@ -0,0 +1,7 @@
+networks:
+  app.egress:
+    external: true
+    name: ${APP_NETWORK}.egress
+  app.ingress:
+    external: true
+    name: ${APP_NETWORK}.ingress

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -1,7 +1,7 @@
 services:
   build.configure_base:
     command: 
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
     extends:
       file: ../.docker-compose.base.yml
@@ -9,7 +9,7 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
   build.init_base:
     command: 
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
     extends:
       file: ../.docker-compose.base.yml

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml

@@ -2,7 +2,7 @@ networks: {}
 services:
   entrypoint.configure_base:
     command:
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
     - bin/configure
     environment: {}
     extends:
@@ -11,7 +11,7 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
-    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
     - bin/init
     environment: {}
     extends:

stoobly_agent-1.6.3/stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml

@@ -0,0 +1,18 @@
+# Define custom services here
+#
+# Container services that need to make request(s) to a Stoobly defined service 
+# need to have either 'app.ingress' or 'app.egress' added to the 'networks' property
+#
+# e.g. If we want to make a request by hostname, then the following should be added
+# networks:
+#   - app.ingress
+#
+# e.g. If we want to make a request by container service name, then the following should be added
+# networks:
+#   - app.egress
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+services: {}

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml

@@ -3,11 +3,5 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: gateway_base
-    networks:
-      - app
     profiles:
-      - mock
-networks:
-  app:
-    name: ${APP_NETWORK}
-    external: true
+      - mock

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml

@@ -3,11 +3,5 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: gateway_base
-    networks:
-      - app
     profiles:
-      - record
-networks:
-  app:
-    name: ${APP_NETWORK}
-    external: true
+      - record

stoobly_agent-1.6.3/stoobly_agent/app/cli/scaffold/templates/app/gateway/test/.docker-compose.test.yml

@@ -0,0 +1,7 @@
+services:
+  gateway.service:
+    extends:
+      file: ../.docker-compose.base.yml
+      service: gateway_base
+    profiles:
+      - test

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -13,9 +13,10 @@ from stoobly_agent.lib.logger import Logger
 from .app import App
 from .constants import (
   APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
-  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_TEMPLATE_ENV
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV, 
+  WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_SCRIPTS_DIR, WORKFLOW_SCRIPTS_ENV, WORKFLOW_TEMPLATE_ENV
 )
-from .docker.constants import DOCKERFILE_CONTEXT
+from .docker.constants import APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
 
@@ -122,11 +123,17 @@ class WorkflowRunCommand(WorkflowCommand):
     command.append('|| true')
     return ' '.join(command)
 
-  def create_network(self):
-    return f"docker network create {self.network} &> /dev/null"
+  def create_egress_network(self):
+    return f"docker network create {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
 
-  def remove_network(self):
-    return f"docker network rm {self.network} &> /dev/null || true"
+  def create_ingress_network(self):
+    return f"docker network create {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
+
+  def remove_egress_network(self):
+    return f"docker network rm {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
+
+  def remove_ingress_network(self):
+    return f"docker network rm {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
 
   def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
@@ -138,6 +145,9 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
 
+    # Add docker compose networks file
+    command_options.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
+
     # Add custom docker compose file
     custom_services = self.custom_services
     if custom_services:
@@ -203,6 +213,9 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command.append(f"-f {os.path.relpath(self.compose_path, os.getcwd())}")
 
+    # Add docker compose networks file
+    command.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
+
     # Add custom docker compose file
     if self.custom_services:
       command.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
@@ -257,8 +270,10 @@ class WorkflowRunCommand(WorkflowCommand):
     _config[CERTS_DIR_ENV] = self.certs_dir_path
     _config[CONTEXT_DIR_ENV] = self.context_dir_path
     _config[SERVICE_NAME_ENV] = self.service_name
+    _config[SERVICE_SCRIPTS_ENV] = SERVICE_SCRIPTS_DIR
     _config[USER_ID_ENV] = user_id or os.getuid()
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
+    _config[WORKFLOW_SCRIPTS_ENV] = WORKFLOW_SCRIPTS_DIR
     _config[WORKFLOW_TEMPLATE_ENV] = self.workflow_name
     
     if namespace:
@@ -267,9 +282,12 @@ class WorkflowRunCommand(WorkflowCommand):
     if self.network:
       _config[APP_NETWORK_ENV] = self.network
 
+    # Specified DNS should prioritized, otherwise defaults to internal DNS
     nameservers = self.nameservers
     if nameservers:
       _config[SERVICE_DNS_ENV] = nameservers[0]
+    else:
+      _config[SERVICE_DNS_ENV] = '8.8.8.8'
 
     env_vars = self.config(_config)
     WorkflowEnv(self.workflow_path).write(env_vars)

{stoobly_agent-1.6.2 → stoobly_agent-1.6.3}/stoobly_agent/app/cli/scaffold/workflow_validate_command.py

@@ -39,13 +39,6 @@ class WorkflowValidateCommand(WorkflowCommand, ValidateCommand):
       raise ScaffoldValidateException(f"Container '{mock_ui_container_name}' not found for service '{CORE_MOCK_UI_SERVICE_NAME}'")
 
   def validate_no_core_components(self):
-    try:
-      core_gateway_container = self.docker_client.containers.get(self.managed_services_docker_compose.gateway_container_name)
-      if core_gateway_container:
-        raise ScaffoldValidateException(f"Gateway container is running when it shouldn't: {core_gateway_container.name}")
-    except docker_errors.NotFound:
-      pass
-    
     try:
       core_mock_ui_container_name = self.docker_client.containers.get(self.managed_services_docker_compose.mock_ui_container_name)
       if core_mock_ui_container_name: