stoobly-agent 1.2.0__tar.gz → 1.2.1__tar.gz

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/PKG-INFO

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

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/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.2.0"
+version = "1.2.1"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.2.0'
+VERSION = '1.2.1'

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/app_command.py

@@ -12,7 +12,9 @@ class AppCommand(Command):
     super().__init__(app)
 
     self.__config = AppConfig(self.scaffold_namespace_path)
-    self.__config.network = app.network
+
+    if not self.__config.network:
+      self.__config.network = app.network
 
   @property
   def app_dir_path(self):

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/app_create_command.py

@@ -19,6 +19,6 @@ class AppCreateCommand(AppCommand):
         self.app.copy_folders_and_hidden_files(self.app_templates_root_dir, dest)
 
         with open(os.path.join(dest, '.gitignore'), 'w') as fp:
-            fp.write("\n".join(['**/.env']))
+            fp.write("\n".join(['gateway/.docker-compose.base.yml', '**/.env']))
 
         self.app_config.write()

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -1,5 +1,6 @@
 APP_NETWORK = '${APP_NETWORK}'
 DOCKER_COMPOSE_BASE = '.docker-compose.base.yml'
+DOCKER_COMPOSE_BASE_TEMPLATE = '.docker-compose.base.template.yml'
 DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_PROXY = '.Dockerfile.proxy'

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py

@@ -5,7 +5,7 @@ import yaml
 from typing import List
 
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
-from stoobly_agent.app.cli.scaffold.docker.constants import DOCKER_COMPOSE_BASE
+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]):
@@ -20,15 +20,18 @@ def set_gateway_ports(service_paths: List[str]):
       port = int(config.port)
     except Exception:
       continue
-
-    if port > 0 and port <= 65535 and port not in ports:
-      ports.append(port)
+    
+    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)
 
   app_dir_path = os.path.dirname(service_paths[0])
   gateway_service_path = os.path.join(app_dir_path, CORE_GATEWAY_SERVICE_NAME)
-  docker_compose_path = os.path.join(gateway_service_path, DOCKER_COMPOSE_BASE)
+  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)
 
-  with open(docker_compose_path, 'r+') as fp:
+  compose = {}
+  with open(docker_compose_src_path, 'r') as fp:
     compose = yaml.safe_load(fp)
     services = compose.get('services')
 
@@ -37,11 +40,8 @@ def set_gateway_ports(service_paths: List[str]):
     
     gateway_base = services.get('gateway_base')
 
-    if not gateway_base:
-      return
-
-    gateway_base['ports'] = list(map(lambda port: f"{port}:{port}", ports))
+    if gateway_base:
+      gateway_base['ports'] = ports
 
-    fp.seek(0)
-    yaml.dump(compose, fp)
-    fp.truncate()
+  with open(docker_compose_dest_path, 'w') as fp:
+    yaml.dump(compose, fp)

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -28,16 +28,17 @@ docker_compose_command=docker compose
 source_env=set -a; [ -f .env ] && source .env; set +a
 
 docker_compose_file_path=$(app_data_dir)/docker/stoobly-ui/exec/.docker-compose.exec.yml
+
 stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --remove-orphans
-stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
+stoobly_exec_build=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_build_args)
 stoobly_exec_build_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) build --pull --quiet
-stoobly_exec_build=$(docker_compose_command) "$(docker_compose_file_path)" $(stoobly_exec_build_args)
+stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
+
 stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
 # Because scaffold is stored in the APP_DIR, when running a scaffold command from within a container,
 # it needs access to APP_DIR rather than CONTEXT_DIR
-stoobly_exec_run_env=export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
-stoobly_exec_run=$(stoobly_exec_run_env) && $(source_env) && CONTEXT_DIR=$(app_dir) $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
+stoobly_exec_run=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && CONTEXT_DIR=$(app_dir) $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
 workflow_run_script=$(app_data_dir)/tmp/run.sh
 workflow_run_env=export APP_DIR="$(app_dir)" && export CERTS_DIR="$(certs_dir)" && export CONTEXT_DIR="$(context_dir)"

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

@@ -3,7 +3,6 @@ services:
     environment:
       TRUST_DOWNSTREAM_PROXY: true
     image: nginxproxy/nginx-proxy:1.5
-    ports: {}
     profiles:
       - gateway_base
     volumes:

{stoobly_agent-1.2.0 → stoobly_agent-1.2.1}/stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -34,7 +34,7 @@ class WorkflowRunCommand(WorkflowCommand):
     self.__certs_dir_path = app.certs_dir_path
     self.__context_dir_path = app.context_dir_path
     self.__extra_compose_path = kwargs.get('extra_compose_path')
-    self.__network = kwargs.get('network') or app.network
+    self.__network = kwargs.get('network') or self.app_config.network
 
   @property
   def ca_certs_dir_path(self):