stoobly-agent 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

stoobly_agent/__init__.py

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

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

@@ -76,19 +76,13 @@ class ServiceBuilder(Builder):
     if not self.config.hostname:
       return
 
-    args = {}
     self.with_service(self.proxy_base, {
-      'build': {
-        'args': args,
-      },
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.extends_service
       },
     })
 
-    args[SERVICE_HOSTNAME_ENV] = f"{SERVICE_HOSTNAME}"
-
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {

stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom Stoobly configuration here

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -138,8 +138,6 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
 
-    can_build = False
-
     # Add custom docker compose file
     custom_services = self.custom_services
     if custom_services:
@@ -158,16 +156,10 @@ class WorkflowRunCommand(WorkflowCommand):
       compose_file_path = os.path.relpath(self.custom_compose_path, self.__current_working_dir)
       command_options.append(f"-f {compose_file_path}")
 
-      if self.__can_build(compose_file_path):
-        can_build = True
-
     if options.get('extra_compose_path'):
       compose_file_path = os.path.relpath(options['extra_compose_path'], self.__current_working_dir)
       command_options.append(f"-f {compose_file_path}")
 
-      if self.__can_build(compose_file_path):
-        can_build = True
-
     command_options.append(f"--profile {self.workflow_name}") 
 
     if not options.get('namespace'):
@@ -177,7 +169,7 @@ class WorkflowRunCommand(WorkflowCommand):
     command += command_options
     command.append('up')
 
-    if options.get('build') and can_build:
+    if not options.get('no_build'):
       command.append('--build')
 
     if options.get('pull'):
@@ -283,20 +275,6 @@ class WorkflowRunCommand(WorkflowCommand):
     WorkflowEnv(self.workflow_path).write(env_vars)
     return env_vars
 
-  def __can_build(self, compose_path: str) -> bool:
-    if not os.path.exists(compose_path):
-        return False
-
-    with open(compose_path, 'r') as f:
-        compose = yaml.safe_load(f)
-
-    services = compose.get('services', {})
-    for service_name, service in services.items():
-        if 'build' in service:
-            # Either build is a string (context) or dict (with context/Dockerfile)
-            return True
-    return False
-
   def __find_nameservers(self, dns_resolver: dns.resolver.Resolver):
     nameservers = dns_resolver.nameservers
 

stoobly_agent/app/cli/scaffold_cli.py

@@ -411,7 +411,6 @@ def logs(**kwargs):
 
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--build', is_flag=True, help='Build images before starting containers.')
 @click.option('--ca-certs-dir-path', default=data_dir.ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--containerized', is_flag=True, help='Set if run from within a container.')
@@ -425,6 +424,7 @@ def logs(**kwargs):
 @click.option('--mkcert', is_flag=True, help='Set to generate SSL certs for HTTPS services.')
 @click.option('--namespace', help='Workflow namespace.')
 @click.option('--network', help='Workflow network name.')
+@click.option('--no-build', is_flag=True, help='Do not build images before starting containers.')
 @click.option('--pull', is_flag=True, help='Pull image before running.')
 @click.option('--script-path', help='Path to intermediate script path.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
@@ -501,9 +501,9 @@ def up(**kwargs):
 
     exec_command = command.up(
       attached=attached,
-      build=kwargs['build'],
       extra_compose_path=extra_compose_path,
       namespace=kwargs['namespace'],
+      no_build=kwargs['no_build'],
       pull=kwargs['pull'],
       user_id=kwargs['user_id']
     )

{stoobly_agent-1.6.1.dist-info → stoobly_agent-1.6.2.dist-info}/METADATA

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

{stoobly_agent-1.6.1.dist-info → stoobly_agent-1.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=iNNlTNbNNPYIjvmJh6qArdUsWMo0EWYVZbrMdnBK2AA,44
+stoobly_agent/__init__.py,sha256=YgNv7ZVr561UUQVGUuChJX5OTSxwob_6G7Si3HBAKk0,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
@@ -81,7 +81,7 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=BQzjpDZmkUrii3VDcRCBXQko
 stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=xfFBSF-1GQKNnUPTlz08Nm9HZDspUnvPvjwaLViQwVw,419
 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=37VrkckPxTkIZTfrbml9Tp22teFhJu_pQYu6V7z40lE,3304
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=RnX0KESc6kxV3oyiSmS4JqIXZNMDVMLVGg34c024cm0,3186
 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
@@ -113,7 +113,7 @@ stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml,sha256=hgPOxIInxGAzGr28-ytB4tVfmsqgpZdPMOpMRbV2R0g,418
-stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
+stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/configure,sha256=KBgjZlP3-FEhhflopx50EabXhyF98Mv0u_YrfmxMznE,52
 stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml,sha256=Rn_7qL1MVK1jNlRepSvNHH9_iFrlE86_aRxjwIim0mY,414
 stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
@@ -195,9 +195,9 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pE
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=WmGKoqJqOkhL40oLCo8PnWhBKdfbY0dO2UtRn1IKynE,3504
 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=1XFlosc3a3Amev5uW3tECwZoIBYVCJsFqG2bGtAHvgg,10652
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=bbz1QcY5nr7VwPdofngX7yVUk8yVdGLckwlbXq0ozhE,10037
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=AoWqSRXXQrqK0YeSHLJkNRTOC23PHrjJBNrq_A8KZnc,28316
+stoobly_agent/app/cli/scaffold_cli.py,sha256=nvM1hawDtL9OHKQlCRpXJjcBh_E_MIQz69MkBpLDEjg,28332
 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
@@ -738,8 +738,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=_t
 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.1.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.6.1.dist-info/METADATA,sha256=daCy3CxjBe_8ieKmVXg26SO_pDfCnh-ErkWJf2h_-wI,3087
-stoobly_agent-1.6.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.6.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.6.1.dist-info/RECORD,,
+stoobly_agent-1.6.2.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.6.2.dist-info/METADATA,sha256=FcqFwOK8OzH1zHTeVf-dAQ0VPOiUsJJvXw4CY0j4H00,3087
+stoobly_agent-1.6.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+stoobly_agent-1.6.2.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.6.2.dist-info/RECORD,,