stoobly-agent 1.6.3__py3-none-any.whl → 1.6.5__py3-none-any.whl

stoobly_agent/__init__.py

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

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

@@ -6,6 +6,12 @@
 # STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
 # STOOBLY_WORKFLOW_SERVICE_OPTIONS: extra --service options to pass  'stoobly-agent scaffold workflow' commands
 
+# Overridable Options
+#
+# workflow_down_extra_options: e.g. $(eval workflow_down_extra_options=<OPTIONS>)
+# workflow_log_extra_options: e.g. $(eval workflow_log_extra_options=<OPTIONS>)
+# workflow_up_extra_options: e.g. $(eval workflow_up_extra_options=<OPTIONS>)
+
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 EXEC_WORKFLOW_NAME := exec
@@ -21,19 +27,24 @@ certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
-exec_namespace=$(shell echo $(context_dir) | (md5 2>/dev/null || md5sum 2>/dev/null || shasum 2>/dev/null) | awk '{print $$1}')
-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_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
 dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
 exec_docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
+exec_namespace=$(shell echo $(context_dir) | (md5 2>/dev/null || md5sum 2>/dev/null || shasum 2>/dev/null) | awk '{print $$1}')
 workflow_script=.stoobly/tmp/$(WORKFLOW).sh
 
+# Options
+certs_dir_options=--ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir)
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(exec_namespace)
+working_dir_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir)
+
+workflow_down_options=--user-id $(USER_ID) $(workflow_down_extra_options)
+workflow_log_options=$(workflow_log_extra_options)
+workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
+workflow_up_options=$(working_dir_options) $(certs_dir_options) --user-id $(USER_ID) $(workflow_up_extra_options)
+
 # Commands
 docker_command=docker
 docker_compose_command=$(docker_command) compose
@@ -51,7 +62,7 @@ stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) $(exec_up)
 stoobly_exec_env=$(source_env) && $(exec_env) CONTEXT_DIR="$(context_dir)" 
 
 # Exec workflow run
-# Because scaffold is stored in the application source code directory, 
+# Scaffold is stored in the application source code directory, 
 # when running a scaffold command from within a container, it needs access to $(app_dir) rather than $(context_dir)
 stoobly_exec_run=$(stoobly_exec_build) && $(stoobly_exec_run_env) $(exec_up)
 stoobly_exec_run_env=$(source_env) && $(exec_env) CONTEXT_DIR="$(app_dir)"
@@ -156,7 +167,7 @@ tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:
 	@export EXEC_COMMAND=.down && \
-	export EXEC_OPTIONS="$(user_id_option) $(workflow_run_options) $(options)" && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -176,7 +187,7 @@ workflow/hostname/install: command/install workflow/hostname
 workflow/hostname/uninstall: command/uninstall workflow/hostname  
 workflow/logs:
 	@export EXEC_COMMAND=.logs && \
-	export EXEC_OPTIONS="$(workflow_run_options) $(options)" && \
+	export EXEC_OPTIONS="$(workflow_log_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -190,10 +201,10 @@ workflow/services:
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run)
 workflow/test:
-	$(eval WORKFLOW=test) $(eval WORKFLOW_UP_OPTIONS=--no-publish)
+	$(eval WORKFLOW=test) $(eval workflow_up_extra_options=$(workflow_up_extra_options) --no-publish)
 workflow/up:
 	@export EXEC_COMMAND=.up && \
-	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
-	$(workflow_run)
+	$(workflow_run)

stoobly_agent/app/cli/scaffold_cli.py

@@ -671,8 +671,11 @@ def __get_services(app: App, **kwargs):
 
     # Intersection
     selected_services = list(filter(lambda x: x in workflow_services, selected_services))
+
+  services = list(set(selected_services))
+  services.sort()
   
-  return list(set(selected_services))
+  return services
 
 def __print_header(text: str):
   Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}{text}{bcolors.ENDC}")

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.5

{stoobly_agent-1.6.3.dist-info → stoobly_agent-1.6.5.dist-info}/METADATA

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

{stoobly_agent-1.6.3.dist-info → stoobly_agent-1.6.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=0ju0Gr8XihbpTDeP0psa1wNQdyDjYO1NTxBTv9DtSIA,44
+stoobly_agent/__init__.py,sha256=FYIyPbfR6mLDgFFIfcM5CnhR00_E1w00kHQzl-Cx_5I,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=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -104,7 +104,7 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=M5fc9RiCgN9ReCXsb3KIVJIKo0aSIOv28Q3izLkEQTo,10036
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=xnUFSlP8YvEs04lTh1Jj_ggNcwyVjyzZjzF0Vh9pris,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=EVBaDI6IrdDEFNYtrGsAZ1DwbBG8kL05ZiR7dbZHsto,8442
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=_41jFjNZ9RVX9jzrNqFkYo1hbQBEopCNAo-7ON5jC24,8939
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=6tFqXh3ine8vaD0FCL5TMoY5NjKx2wLUR8XpW3tJtew,245
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
@@ -199,7 +199,7 @@ stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=eF3aaK4OIZXYuSBEAeBnhAL7EZrS1G4mSYrJbEiXt2o,11082
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=wv1Zrq0GoYO8ryac3oGno0C282c6UjMtniO19mBSyrE,4036
-stoobly_agent/app/cli/scaffold_cli.py,sha256=FX8YW5n_qO1d4kiUbCS5YJLwRLRVCREDC8M5S5eq39U,28645
+stoobly_agent/app/cli/scaffold_cli.py,sha256=qR1AvPbUFsn9QL_QrWVFxW77n4yMVI7DVwiV2ylRcOM,28686
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=cpCjxFYBuVwLuq_b2lIUu-5zWqupRlrp4xWgDytirSM,10047
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -699,7 +699,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=a1SFLyEyRRLuADvAw6ckQQKORFXvyK1lyrbkaLWx8oU,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=8merClJHSZh5o5xLmNfSrExyEZszRWmdOcyxaN-hVPE,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=rIVj4DW_H5_YZ8poqVLQ51c-jw2ZNHQqMYuhBbwrFzE,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -740,8 +740,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 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.6.3.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.6.3.dist-info/METADATA,sha256=gy2wgmF4gEAbx1NFjr9JegRICSa-SzamtmE4JdUxYOE,3087
-stoobly_agent-1.6.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.6.3.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.6.3.dist-info/RECORD,,
+stoobly_agent-1.6.5.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.6.5.dist-info/METADATA,sha256=Oa3fF1GyGA7R11STcQmvd066FkpVfB0trRpdl364JIA,3087
+stoobly_agent-1.6.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+stoobly_agent-1.6.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.6.5.dist-info/RECORD,,