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

stoobly_agent/__init__.py

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

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

@@ -86,7 +86,7 @@ class Builder():
 
   def with_network(self, network):
     self.__networks[network] = {
-      'name': network
+      'name': f"{APP_NETWORK}.{network}"
     }
     return self
 

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -4,7 +4,7 @@
 # STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored
 # STOOBLY_CERTS_DIR: path to a folder to store certs
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
-# STOOBLY_WORKFLOW_RUN_OPTIONS: extra options to pass to 'stoobly-agent scaffold workflow run' command
+# STOOBLY_WORKFLOW_OPTIONS: extra options to pass to 'stoobly-agent scaffold workflow' commands
 
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -17,7 +17,7 @@ app_dir=$$(realpath "$${STOOBLY_APP_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$$(realpath ~)/.mitmproxy}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
-workflow_run_options=$${STOOBLY_WORKFLOW_RUN_OPTIONS:+$$STOOBLY_WORKFLOW_RUN_OPTIONS }
+workflow_options=$${STOOBLY_WORKFLOW_OPTIONS:+$$STOOBLY_WORKFLOW_OPTIONS }
 
 app_data_dir=$(app_dir)/.stoobly
 data_dir=$(context_dir)/.stoobly
@@ -67,37 +67,37 @@ intercept/enable:
 	$(stoobly_exec)
 mock: nameservers
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_run_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 mock/logs: 
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 mock/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 record: nameservers
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_run_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 record/logs: 
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 record/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -132,19 +132,19 @@ scenario/snapshot:
 	$(stoobly_exec)
 test:
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_run_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 test/logs: 
 	@export EXEC_COMMAND=bin/.logs && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 test/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -91,6 +91,9 @@ class WorkflowRunCommand(WorkflowCommand):
   def create_network(self):
     return f"docker network create {self.network} 2> /dev/null"
 
+  def remove_network(self):
+    return f"docker network rm {self.network} > /dev/null"
+
   def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
       return ''

stoobly_agent/app/cli/scaffold_cli.py

@@ -249,6 +249,7 @@ def copy(**kwargs):
     Log levels can be "debug", "info", "warning", or "error"
 ''')
 @click.option('--namespace', help='Workflow namespace.')
+@click.option('--network', help='Workflow network namespace.')
 @click.option('--rmi', is_flag=True, help='Remove images used by containers.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.argument('workflow_name')
@@ -279,7 +280,6 @@ def down(**kwargs):
     commands.append(command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
-
   for command in commands:
     __print_header(f"SERVICE {command.service_name}")
 
@@ -292,6 +292,18 @@ def down(**kwargs):
     else:
       print(exec_command)
 
+  # After services are stopped, their network needs to be removed
+  if len(commands) > 0:
+    command: WorkflowRunCommand = commands[0]
+    remove_network_command = command.remove_network()
+
+    if not kwargs['dry_run']:
+      command.write_nameservers()
+
+      exec_stream(remove_network_command)
+    else:
+      print(remove_network_command)
+
 @workflow.command()
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
 @click.option(
@@ -332,7 +344,6 @@ def logs(**kwargs):
     commands.append(command)
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
-
   for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
 
@@ -404,7 +415,7 @@ def up(**kwargs):
 
   # Before services can be started, their network needs to be created
   if len(commands) > 0:
-    command = commands[0]
+    command: WorkflowRunCommand = commands[0]
     create_network_command = command.create_network()
 
     if not kwargs['dry_run']:

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

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

{stoobly_agent-1.2.1.dist-info → stoobly_agent-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=Rqvjc6nJa09O_p3-LeYoTIjjvW7PHQVwyhk5o56Z_-A,44
+stoobly_agent/__init__.py,sha256=CneMHh5wCk5_3Nri2IBj6xzTJmILmqH9cH5EfHON1QA,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
@@ -76,7 +76,7 @@ stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134
 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/builder.py,sha256=OE7r8vEdEkW3vwpmIctePiO0S5jvao5zMJNpxc-Yayw,2851
 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
@@ -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=yHRthD0lXMMQ7NouU9esmrqf9wIyTHrARvdZKeIWXVY,5518
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=fRazlUstXloCAtH1fmB5LAPlGclMflAYr7wtSbn16AI,5601
 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
@@ -193,9 +193,9 @@ 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=9ww-kdQAVEuJ5GoF14qrtYCpqYHOakAk13OoiPqe4tQ,8295
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=CJjemLFjcr7YlakTNIAhT71e2Y6z3nWGt9mzxsmJ0-8,8383
 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/scaffold_cli.py,sha256=rCSGrw9DQJx2r_M9V2Rm0-MtUCPf8iohT6l6tEzn_u0,20244
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=XNxpTm5z3bnBGNGI3_XZIif0ypN62WqYfDmShL5fXg4,9965
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -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.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,,
+stoobly_agent-1.2.3.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.2.3.dist-info/METADATA,sha256=NTZtZPT5h79vhU9uCuYb2cM5iFDUdTqyirMsZmEyoTU,3384
+stoobly_agent-1.2.3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.2.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.2.3.dist-info/RECORD,,