stoobly-agent 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.2.0'
+VERSION = '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/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/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/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/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/app/cli/scaffold/templates/app/gateway/{.docker-compose.base.yml → .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/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):

{stoobly_agent-1.2.0.dist-info → stoobly_agent-1.2.1.dist-info}/METADATA

@@ -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.dist-info → stoobly_agent-1.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=2CaOxKsprE3DuC_BVDFB_Riqf8gAwUziEEd6yMCwXv4,44
+stoobly_agent/__init__.py,sha256=Rqvjc6nJa09O_p3-LeYoTIjjvW7PHQVwyhk5o56Z_-A,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
@@ -68,20 +68,20 @@ stoobly_agent/app/cli/report_cli.py,sha256=ZxJw0Xkx7KFZJn9e45BSKRKon8AD0Msrwy1fb
 stoobly_agent/app/cli/request_cli.py,sha256=THNloW111l9MLE0oPg4y7hVXL1U7OXoz760g0A1CtJ0,7747
 stoobly_agent/app/cli/scaffold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/app.py,sha256=8YJtx0-PcnnNod31OaSv0K53Xb38pn2eDedj-a7QXCY,3665
-stoobly_agent/app/cli/scaffold/app_command.py,sha256=o6WV6tcMGBWJsPFdV2DD-m1Dq0cy3Q3SESokaU5hgp4,2061
+stoobly_agent/app/cli/scaffold/app_command.py,sha256=WwOr8QU61iuNXXdG37gOTZ6D0ZawM3eixCOa10TMP8c,2098
 stoobly_agent/app/cli/scaffold/app_config.py,sha256=ZAHGovwxFy3zICfusj9_gUC_FBTIoB7KbPbQaGK8x1c,573
-stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=1qdKvRvJDmDmYERvbhaUapsglOOWPEHpCj0o7U7bQfo,550
+stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=5av5txxNJllELMYliIEPnhLLVq_N5ktoBxf8naJUGG0,586
 stoobly_agent/app/cli/scaffold/command.py,sha256=klpsgL6V7b2DRHpN33pl-QlmntDkvDO_dsF5JziYnL8,245
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
 stoobly_agent/app/cli/scaffold/constants.py,sha256=KBZj-eQoDmoUOJgcekyfeyi1UB0_UlxqrcWZyXEmBXA,1950
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=IsXZFUumWEBA8NYDFdAohuKmxocoqHqlVFg0-E92QLI,621
 stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=lNOvDxoLB1L8KSDrvoG4CUuWLAM2egLxwOWeV9Tf8H8,2832
-stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=bYq2i3iib_YhdE-wtL42qnwPbtfgMSwtfGpT4nFT0fk,394
+stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=fGHH_DlGd4mTogggJLHLigUscZmBrigkNmDwKQq6src,461
 stoobly_agent/app/cli/scaffold/docker/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/service/build_decorator.py,sha256=ZU7z4bkvdS3OK5O4fJhlA9_PNwnFtZW6t7vNF7V5obQ,1003
 stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=vj7Vm7eK8E8DPtD4o5X0IJA4HPdgtA2lV2wm3nGTa1c,3207
-stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py,sha256=jvlO5xjATNIp8Gr0yP2O7a68bOK-8cAiKNqRWCFzK1s,1221
+stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py,sha256=MH71h24nX5lAd6xNfSjjNyw6PjBsAXv-3kOFEe86huk,1417
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=vbmME0cbN2EnNRlzQ2umj7Y3L7aZT-EHqEpkBFMfe8U,758
@@ -104,7 +104,7 @@ stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=z7Z_v
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=a4PUVIJ_0CEIwUTCEhvtiGJSnu--AWFE1lKv-8q17fU,193
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=L0yDlJfPD775NM-HgPx4E5-r-AflVBGfBf5DYl1nfME,1027
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=mQFdZqJAf83QN4ywhQ0sZDAazkvkwYPzhxRsyjo1z74,5575
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=yHRthD0lXMMQ7NouU9esmrqf9wIyTHrARvdZKeIWXVY,5518
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=LNNuygX6hMtmElxaO6jTIYq3psYmxNv7xax7ra6JzO4,407
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=t7xRaCc9q3k7W34S0h9KX02GljSVwGpPnFmiLUvWxsw,80
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
@@ -145,7 +145,7 @@ stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha25
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=E4gGJwHfnZoFo9-0vM17-Qg5LPjx7vIPpcz2K7eiZg0,591
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
-stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.yml,sha256=llkTquAphT3lyP4gBKK3tNjpOCEsdz_Oneua7792d4M,265
+stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml,sha256=bgBvyDhyehS75D2ObEi7sl9DLGV6U3c9JhCAncsvjq8,251
 stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=LiMgBvOozkBH34-72kQXLylmrnERwjQfs8aws6BlZHM,232
 stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=4pwMuBdfaf9hX1RVJ3KU3FY4E5BXYSPFsfUGKmiuXPk,234
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
@@ -193,7 +193,7 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pE
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5xnRYrVb2KlSDARZFjLGGWeURXRu63OHoRLEhO-EAvw,3401
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4YaXYq_r2JpR2MmSwk,416
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=ICJZXBa93GwDmMqk_dWU6ACnpPUUa4YJcpFxozRCtDc,8283
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=9ww-kdQAVEuJ5GoF14qrtYCpqYHOakAk13OoiPqe4tQ,8295
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
 stoobly_agent/app/cli/scaffold_cli.py,sha256=SAE6csE_pwE6vTeu054toGYHvz82bD1n4-dGY-FBxdk,19818
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
@@ -729,8 +729,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=x7
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.2.0.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.2.0.dist-info/METADATA,sha256=GRbxwWvjR6mp74RP97y9qa97PTVe76SJIIQ2jDbQyqg,3384
-stoobly_agent-1.2.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-stoobly_agent-1.2.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.2.0.dist-info/RECORD,,
+stoobly_agent-1.2.1.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.2.1.dist-info/METADATA,sha256=JSzzPD1gvNN5RCXrZGS8F1K4PlXVJPZXGl1jJG-Uzew,3384
+stoobly_agent-1.2.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.2.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.2.1.dist-info/RECORD,,