stoobly-agent 1.10.0__py3-none-any.whl → 1.10.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.10.0'
+VERSION = '1.10.1'

stoobly_agent/app/api/application_http_request_handler.py

@@ -104,11 +104,14 @@ class ApplicationHTTPRequestHandler(SimpleHTTPRequestHandler):
                 headers.CLIENT.title(),
                 custom_headers.DO_PROXY.title(),
                 headers.EXPIRY.title(),
+                custom_headers.REQUEST_ORIGIN.title(),
+                headers.TOKEN_TYPE.title(),
+                headers.UID.title(),
+
+                # ProxyController headers
                 headers.PROXY_HEADERS.title(),
                 headers.REQUEST_PATH.title(),
                 custom_headers.SERVICE_URL.title(),
-                headers.TOKEN_TYPE.title(),
-                headers.UID.title(),
             ])
             self.send_header(header, allowed_headers)
             rendered_headers.append(header)

stoobly_agent/app/cli/scaffold/constants.py

@@ -18,7 +18,6 @@ CERTS_DIR_ENV = 'CERTS_DIR'
 COMPOSE_TEMPLATE = '.docker-compose.{workflow}.yml'
 CONFIG_FILE = '.config.yml'
 CONTEXT_DIR_ENV = 'CONTEXT_DIR'
-DOCKER_NAMESPACE = 'docker'
 DOTENV_FILE = '.env'
 DOTENV_PATH_ENV = 'STOOBLY_DOTENV_PATH'
 NAMESERVERS_FILE = '.nameservers'
@@ -37,8 +36,6 @@ SERVICE_ID_ENV = 'SERVICE_ID'
 SERVICE_LOCAL_ENV = 'SERVICE_LOCAL'
 SERVICE_NAME = '${SERVICE_NAME}'
 SERVICE_NAME_ENV = 'SERVICE_NAME'
-SERVICE_PROXY_MODE = '${SERVICE_PROXY_MODE}'
-SERVICE_PROXY_MODE_ENV = 'SERVICE_PROXY_MODE'
 SERVICE_SCHEME = '${SERVICE_SCHEME}'
 SERVICE_SCHEME_ENV = 'SERVICE_SCHEME'
 SERVICE_PORT = '${SERVICE_PORT}'
@@ -53,6 +50,7 @@ SERVICE_UPSTREAM_PORT = '${SERVICE_UPSTREAM_PORT}'
 SERVICE_UPSTREAM_PORT_ENV = 'SERVICE_UPSTREAM_PORT'
 SERVICE_UPSTREAM_SCHEME = '${SERVICE_UPSTREAM_SCHEME}'
 SERVICE_UPSTREAM_SCHEME_ENV = 'SERVICE_UPSTREAM_SCHEME'
+SERVICES_NAMESPACE = 'services'
 STOOBLY_HOME_DIR = '/home/stoobly'
 STOOBLY_DATA_DIR = os.path.join(STOOBLY_HOME_DIR, DATA_DIR_NAME)
 STOOBLY_CERTS_DIR = os.path.join(STOOBLY_DATA_DIR, CERTS_DIR_NAME)

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

@@ -2,7 +2,7 @@ import pdb
 
 from typing import TypedDict
 
-from ...constants import DOCKER_NAMESPACE
+from ...constants import SERVICES_NAMESPACE
 from ..constants import DOCKERFILE_SERVICE
 from .builder import ServiceBuilder
 from .types import BuildDecoratorOptions
@@ -16,7 +16,7 @@ class BuildDecorator():
     service_builder = self.__service_builder
     build = {
       'context': '../..', # Assumes app root is 2 levels up
-      'dockerfile': f"./{DOCKER_NAMESPACE}/{service_builder.service_name}/{DOCKERFILE_SERVICE}"
+      'dockerfile': f"./{SERVICES_NAMESPACE}/{service_builder.service_name}/{DOCKERFILE_SERVICE}"
     }
 
     if 'build_args' in kwargs:

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

@@ -7,12 +7,13 @@ from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
 from ...app_config import AppConfig
 from ...constants import (
-  APP_DIR, DOCKER_NAMESPACE, 
+  APP_DIR, SERVICES_NAMESPACE, 
   SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV,
   SERVICE_NAME, SERVICE_NAME_ENV, 
   SERVICE_ID,
   SERVICE_PORT, SERVICE_PORT_ENV, 
-  SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  SERVICE_SCHEME, SERVICE_SCHEME_ENV,
+  SERVICE_UPSTREAM_HOSTNAME, SERVICE_UPSTREAM_HOSTNAME_ENV, SERVICE_UPSTREAM_PORT, SERVICE_UPSTREAM_PORT_ENV, SERVICE_UPSTREAM_SCHEME, SERVICE_UPSTREAM_SCHEME_ENV,
   STOOBLY_HOME_DIR, STOOBLY_HOME_DIR, 
   WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 )
@@ -37,7 +38,7 @@ class ServiceBuilder(Builder):
     self.__env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV]
     self.__service_name = os.path.basename(service_path)
     self.__working_dir = os.path.join(
-      STOOBLY_HOME_DIR, DATA_DIR_NAME, DOCKER_NAMESPACE, SERVICE_NAME, WORKFLOW_NAME
+      STOOBLY_HOME_DIR, DATA_DIR_NAME, SERVICES_NAMESPACE, SERVICE_NAME, WORKFLOW_NAME
     )
 
   @property
@@ -220,13 +221,23 @@ class ServiceBuilder(Builder):
     volumes.append(f"{self.service_name}:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}")
 
     # Mount docker folder
-    volumes.append(f"../:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{DOCKER_NAMESPACE}")
+    volumes.append(f"../:{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}/{SERVICES_NAMESPACE}")
 
   def __with_url_environment(self, environment):
-    environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
+    if self.config.hostname:
+      environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
 
     if self.config.scheme:
       environment[SERVICE_SCHEME_ENV] = SERVICE_SCHEME
 
     if self.config.port:
-      environment[SERVICE_PORT_ENV] = SERVICE_PORT
+      environment[SERVICE_PORT_ENV] = SERVICE_PORT
+
+    if self.config.upstream_hostname:
+      environment[SERVICE_UPSTREAM_HOSTNAME_ENV] = SERVICE_UPSTREAM_HOSTNAME
+
+    if self.config.upstream_port:
+      environment[SERVICE_UPSTREAM_PORT_ENV] = SERVICE_UPSTREAM_PORT
+
+    if self.config.upstream_scheme:
+      environment[SERVICE_UPSTREAM_SCHEME_ENV] = SERVICE_UPSTREAM_SCHEME

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

@@ -165,12 +165,3 @@ class WorkflowBuilder(Builder):
       compose['volumes'] = self.volumes
 
     super().write(compose)
-
-  def __with_url_environment(self, environment):
-    environment[SERVICE_HOSTNAME_ENV] = SERVICE_HOSTNAME
-
-    if self.config.scheme:
-      environment[SERVICE_SCHEME_ENV] = SERVICE_SCHEME
-
-    if self.config.port:
-      environment[SERVICE_PORT_ENV] = SERVICE_PORT

stoobly_agent/app/cli/scaffold/docker/workflow/command_decorator.py

@@ -1,5 +1,5 @@
 from ...constants import (
-  SERVICE_PROXY_MODE, SERVICE_UPSTREAM_HOSTNAME, SERVICE_UPSTREAM_PORT, SERVICE_UPSTREAM_SCHEME,
+  SERVICE_UPSTREAM_HOSTNAME, SERVICE_UPSTREAM_PORT, SERVICE_UPSTREAM_SCHEME,
 )
 from .builder import WorkflowBuilder
 
@@ -15,6 +15,7 @@ class CommandDecorator():
   @property
   def proxy_mode(self):
     config = self.workflow_builder.config
+
     if config.upstream_hostname == 'host.docker.internal':
       return f"upstream:{SERVICE_UPSTREAM_SCHEME}://{SERVICE_UPSTREAM_HOSTNAME}:{SERVICE_UPSTREAM_PORT}"
 

stoobly_agent/app/cli/scaffold/service_config.py

@@ -12,7 +12,6 @@ from .constants import (
   SERVICE_NAME_ENV,
   SERVICE_PRIORITY_ENV,
   SERVICE_PORT_ENV,
-  SERVICE_PROXY_MODE_ENV,
   SERVICE_SCHEME_ENV,
   SERVICE_UPSTREAM_HOSTNAME_ENV,
   SERVICE_UPSTREAM_PORT_ENV,
@@ -30,7 +29,6 @@ class ServiceConfig(Config):
     self.__name = None
     self.__port = None
     self.__priority = None
-    self.__proxy_mode = None
     self.__scheme = None
     self.__upstream_hostname = None
     self.__upstream_port = None
@@ -58,9 +56,6 @@ class ServiceConfig(Config):
     if 'priority' in kwargs:
       self.__priority = kwargs.get('priority')
 
-    if 'proxy_mode' in kwargs:
-      self.__proxy_mode = kwargs.get('proxy_mode')
-
     if 'scheme' in kwargs:
       self.__scheme = kwargs.get('scheme')
 
@@ -152,22 +147,6 @@ class ServiceConfig(Config):
   def priority(self, v):
     self.__priority = v
 
-  @property
-  def proxy_mode(self) -> str:
-    if self.__proxy_mode:
-      return (self.__proxy_mode or '').strip()
-
-    if not self.hostname:
-      return ''
-
-    return 'regular'
-
-  @proxy_mode.setter
-  def proxy_mode(self, v: str):
-    if v and v not in ['regular', 'reverse']:
-      v = 'reverse' 
-    self.__proxy_mode = v
-
   @property
   def scheme(self):
     if not self.__scheme and self.__port:
@@ -221,7 +200,7 @@ class ServiceConfig(Config):
 
   @upstream_scheme.setter
   def upstream_scheme(self, v): 
-    self.__scheme = v
+    self.__upstream_scheme = v
 
   @property
   def url(self):
@@ -247,7 +226,6 @@ class ServiceConfig(Config):
     self.name = config.get(SERVICE_NAME_ENV)
     self.port = config.get(SERVICE_PORT_ENV)
     self.priority = config.get(SERVICE_PRIORITY_ENV)
-    self.proxy_mode = config.get(SERVICE_PROXY_MODE_ENV)
     self.scheme = config.get(SERVICE_SCHEME_ENV)
     self.upstream_hostname = config.get(SERVICE_UPSTREAM_HOSTNAME_ENV)
     self.upstream_port = config.get(SERVICE_UPSTREAM_PORT_ENV)
@@ -261,7 +239,6 @@ class ServiceConfig(Config):
       'name': self.name,
       'port': self.port,
       'priority': self.priority,
-      'proxy_mode': self.proxy_mode,
       'scheme': self.scheme if self.hostname else '',
       'upstream_hostname': self.upstream_hostname,
       'upstream_port': self.upstream_port,
@@ -300,6 +277,5 @@ class ServiceConfig(Config):
 
     config[SERVICE_DETACHED_ENV] = bool(self.detached)
     config[SERVICE_ID_ENV] = self.id
-    config[SERVICE_PROXY_MODE_ENV] = self.proxy_mode
 
     super().write(config)

stoobly_agent/app/cli/scaffold/service_docker_compose.py

@@ -1,6 +1,6 @@
+from stoobly_agent.app.cli.scaffold.constants import SERVICES_NAMESPACE
 from stoobly_agent.config.data_dir import DataDir
 
-
 class ServiceDockerCompose():
   def __init__(self, app_dir_path, target_workflow_name, service_name, hostname):
     self.service_name = service_name
@@ -11,5 +11,5 @@ class ServiceDockerCompose():
     self.configure_container_name = f"{target_workflow_name}-{service_name}.configure-1"
 
     data_dir_path = DataDir.instance(app_dir_path).path
-    self.docker_compose_path = f"{data_dir_path}/docker/{service_name}/{target_workflow_name}/docker-compose.yml"
-    self.init_script_path = f"{data_dir_path}/docker/{service_name}/{target_workflow_name}/bin/init"
+    self.docker_compose_path = f"{data_dir_path}/{SERVICES_NAMESPACE}/{service_name}/{target_workflow_name}/docker-compose.yml"
+    self.init_script_path = f"{data_dir_path}/{SERVICES_NAMESPACE}/{service_name}/{target_workflow_name}/bin/init"

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -12,11 +12,12 @@ from docker.models.containers import Container
 
 from stoobly_agent.app.cli.scaffold.constants import (
   PUBLIC_FOLDER_NAME,
+  SERVICES_NAMESPACE,
   STOOBLY_DATA_DIR,
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
-from stoobly_agent.app.cli.scaffold.docker.constants import APP_EGRESS_NETWORK_TEMPLATE
+from stoobly_agent.app.cli.scaffold.docker.constants import APP_INGRESS_NETWORK_TEMPLATE
 from stoobly_agent.app.cli.scaffold.hosts_file_manager import HostsFileManager
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
@@ -118,12 +119,14 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     print(f"Validating hostname inside Docker network, url: {url}")
     
     # See WorkflowRunCommand for how 'network' is generated
+    # Debug command=f"curl -k --max-time {timeout_seconds} {url} --verbose",
     network = f"{self.workflow_name}.{self.app.network}" 
     timeout_seconds = 1
+    http_code_format = '"%{http_code}"'
     output = self.docker_client.containers.run(
       image='curlimages/curl:8.11.0',
-      command=f"curl --max-time {timeout_seconds} {url} --verbose",
-      network=APP_EGRESS_NETWORK_TEMPLATE.format(network=network),
+      command=f"curl -k -s -o /dev/null -w {http_code_format} --max-time {timeout_seconds} {url}",
+      network=APP_INGRESS_NETWORK_TEMPLATE.format(network=network),
       stderr=True,
       remove=True,
     )
@@ -131,7 +134,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     # Note: 499 error could also mean success because it shows the proxy
     # connection is working, but we haven't recorded anything yet
     logs = output.decode('ascii')
-    if ('200 OK' not in logs) and ('499' not in logs):
+    if logs != '200' and  logs != '499':
       raise ScaffoldValidateException(f"Error reaching {url} from inside Docker network")
 
   # Check public folder exists in container
@@ -190,14 +193,14 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   def validate(self) -> bool:
     print(f"Validating service: {self.service_name}")
 
-    url = f"{self.service_config.scheme}://{self.hostname}"
+    url = self.service_config.url
 
     if self.service_config.hostname and self.workflow_name not in [WORKFLOW_TEST_TYPE]:
       self.validate_hostname(self.hostname, self.service_config.port)
     
     # Test workflow won't expose services that are detached and have a hostname to the host such as assets.
     # Need to test connection from inside the Docker network
-    if self.service_config.hostname and self.workflow_name == WORKFLOW_TEST_TYPE and self.service_config.detached:
+    if self.service_config.hostname and self.workflow_name == WORKFLOW_TEST_TYPE:
       self.validate_internal_hostname(url)
 
     self.validate_init_containers(self.service_docker_compose.init_container_name, self.service_docker_compose.configure_container_name)
@@ -231,7 +234,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     if self.is_local():
       print(f"Validating local user defined service: {self.service_name}")
       # Validate docker-compose path exists
-      docker_compose_path = f"{self.app_dir_path}/{DATA_DIR_NAME}/docker/{self.service_docker_compose.service_name}/{self.workflow_name}/docker-compose.yml"
+      docker_compose_path = f"{self.app_dir_path}/{DATA_DIR_NAME}/{SERVICES_NAMESPACE}/{self.service_docker_compose.service_name}/{self.workflow_name}/docker-compose.yml"
       destination_path = Path(docker_compose_path)
 
       if not destination_path.exists():

stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml

@@ -6,7 +6,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/services/${SERVICE_NAME}/${WORKFLOW_NAME}
   build.init_base:
     command: 
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
@@ -16,4 +16,4 @@ services:
       service: context_base
     volumes:
     - ${APP_DIR}:/app
-    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/services/${SERVICE_NAME}/${WORKFLOW_NAME}

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

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-# Add custom configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings

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

@@ -1,3 +1,28 @@
 #!/bin/bash
 
-# Add custom Stoobly configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings
+
+echo "Configuring rewrite rules..."
+stoobly-agent config rewrite set \
+  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
+  --mode record \
+  --name authorization \
+  --pattern ".*" \
+  --type Header \
+  --value '' \
+
+stoobly-agent config rewrite set \
+  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
+  --mode record \
+  --name cookie \
+  --pattern ".*" \
+  --type Header \
+  --value '' \
+
+stoobly-agent config rewrite set \
+  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
+  --mode record \
+  --name set-cookie \
+  --pattern ".*" \
+  --type 'Response Header' \
+  --value '' \

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

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-# Add custom configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml

@@ -6,7 +6,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
-    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/services/${SERVICE_NAME}/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
     - ${SERVICE_SCRIPTS}/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
@@ -16,4 +16,4 @@ services:
       service: context_base
     volumes:
     - ${APP_DIR}:/app
-    working_dir: /home/stoobly/.stoobly/docker/${SERVICE_NAME}/${WORKFLOW_NAME}
+    working_dir: /home/stoobly/.stoobly/services/${SERVICE_NAME}/${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-# Add custom configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings

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

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-# Add custom configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-# Add custom configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings

stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.configure

@@ -5,6 +5,26 @@
 
 entrypoint=$1
 
+port=$SERVICE_PORT
+scheme=$SERVICE_SCHEME
+service_origin="$scheme://$SERVICE_HOSTNAME"
+
+if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
+  service_origin="$service_origin:$port"
+fi
+
+port=$SERVICE_UPSTREAM_PORT
+scheme=$SERVICE_UPSTREAM_SCHEME
+upstream_origin="$scheme://$SERVICE_UPSTREAM_HOSTNAME"
+
+if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
+  upstream_origin="$upstream_origin:$port"
+fi
+
+if [ "$service_origin" != "$upstream_origin" ] && [ "$SERVICE_UPSTREAM_HOSTNAME" != "host.docker.internal" ]; then
+  service_origin="$upstream_origin"
+fi
+
 if [ -e "$entrypoint" ]; then
-  "$entrypoint"
+  "$entrypoint" "$service_origin"
 fi

stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure

@@ -1,13 +1,5 @@
 #!/bin/bash
 
-# Add custom Stoobly configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings
 
-scheme=$SERVICE_SCHEME
-hostname=$SERVICE_HOSTNAME
-port=$SERVICE_PORT
-
-origin="$scheme://$hostname"
-
-if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  origin="$origin:$port"
-fi
+origin=$1 # e.g. https://docs.stoobly.com

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

@@ -1,47 +1,21 @@
 #!/bin/bash
 
-# Add custom Stoobly configuration here
-
-scheme=$SERVICE_SCHEME
-hostname=$SERVICE_HOSTNAME
-port=$SERVICE_PORT
-
-origin="$scheme://$hostname"
-
-if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  origin="$origin:$port"
-fi
-
-# Firewall
-echo "Configuring firewall rules..."
-stoobly-agent config firewall set \
-  --action include \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode record \
-  --pattern "$origin/?.*?"
-
-# Rewrite
-echo "Configuring rewrite rules..."
-stoobly-agent config rewrite set \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode record \
-  --name authorization \
-  --pattern "$origin/?.*?" \
-  --type Header \
-  --value '' \
-
-stoobly-agent config rewrite set \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode record \
-  --name cookie \
-  --pattern "$origin/?.*?" \
-  --type Header \
-  --value '' \
-
-stoobly-agent config rewrite set \
-  --method GET --method POST --method OPTIONS --method PUT --method DELETE \
-  --mode record \
-  --name set-cookie \
-  --pattern "$origin/?.*?" \
-  --type 'Response Header' \
-  --value '' \
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings
+
+origin=$1 # e.g. https://docs.stoobly.com
+
+# Uncomment the following example to include or exclude requests
+# stoobly-agent config firewall set \
+#   --action include \
+#   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
+#   --mode record \
+#   --pattern "$origin/index.html"
+
+# Uncomment the following example to modify parts of a request
+# stoobly-agent config rewrite set \
+#   --method GET --method POST --method OPTIONS --method PUT --method DELETE \
+#   --mode record \
+#   --name etag \
+#   --pattern "$origin/.*" \
+#   --type Header \
+#   --value '' \

stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure

@@ -1,13 +1,5 @@
 #!/bin/bash
 
-# Add custom Stoobly configuration here
+# Add custom Stoobly configuration here, to learn more: https://docs.stoobly.com/core-concepts/agent/proxy-settings
 
-scheme=$SERVICE_SCHEME
-hostname=$SERVICE_HOSTNAME
-port=$SERVICE_PORT
-
-origin="$scheme://$hostname"
-
-if [ "$scheme" = 'http' -a "$port" != '80' ] || [ "$scheme" = 'https' -a "$port" != '443' ]; then
-  origin="$origin:$port"
-fi
+origin=$1 # e.g. https://docs.stoobly.com