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

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

@@ -9,6 +9,8 @@
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 EXEC_WORKFLOW_NAME := exec
+PULL_OPTION := $(if $(STOOBLY_IMAGE_USE_LOCAL),,--pull)
+USER_ID := $(shell id -u)
 
 CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
@@ -17,32 +19,46 @@ 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)}")
+
+context_dir_option=--context-dir-path $(context_dir)
+user_id_option=--user-id $(USER_ID)
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
+workflow_down_options=$(user_id_option)
 workflow_options=$${STOOBLY_WORKFLOW_OPTIONS:+$$STOOBLY_WORKFLOW_OPTIONS }
+workflow_up_options=$(context_dir_option) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --from-make $(user_id_option)
 
 app_data_dir=$(app_dir)/.stoobly
-data_dir=$(context_dir)/.stoobly
+app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
+data_dir=$(context_dir)/.stoobly
+dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
+docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
+workflow_run_script=$(app_data_dir)/tmp/run.sh
 
 # Commands
-docker_compose_command=docker compose
+docker_command=docker
+docker_compose_command=$(docker_command) compose
+exec_env=export CA_CERTS_DIR="$(ca_certs_dir)" && export USER_ID=$(USER_ID)
+exec_up=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
 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_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_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
+# Build base image
+stoobly_exec_build=$(docker_command) build $(stoobly_exec_build_args) $(app_namespace_dir)
+stoobly_exec_build_args=-f "$(dockerfile_path)" -t stoobly.$(USER_ID) --build-arg USER_ID=$(USER_ID) $(PULL_OPTION) --quiet
 
-stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
+# Exec any
+stoobly_exec=$(stoobly_exec_build) && $(stoobly_exec_env) && $(exec_up)
+stoobly_exec_env=$(source_env) && $(exec_env) && export CONTEXT_DIR="$(context_dir)" 
 
-# 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=$(stoobly_exec_env) && $(source_env) && $(stoobly_exec_build) && CONTEXT_DIR=$(app_dir) $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
+# Exec workflow run
+# Because 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) && export CONTEXT_DIR="$(app_dir)"
 
-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)"
-workflow_run=$(workflow_run_env) && $(source_env) && bash "$(workflow_run_script)"
+# Workflow run
+workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
 certs:
 	@export EXEC_COMMAND=bin/.mkcert && \
@@ -67,7 +83,7 @@ intercept/enable:
 	$(stoobly_exec)
 mock: nameservers
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -79,13 +95,13 @@ mock/logs:
 	$(workflow_run)
 mock/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
 record: nameservers
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -97,7 +113,7 @@ record/logs:
 	$(workflow_run)
 record/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -132,7 +148,7 @@ scenario/snapshot:
 	$(stoobly_exec)
 test:
 	@export EXEC_COMMAND=bin/.up && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_up_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
@@ -144,7 +160,7 @@ test/logs:
 	$(workflow_run)
 test/down:
 	@export EXEC_COMMAND=bin/.down && \
-	export EXEC_OPTIONS="$(workflow_options)$(options)" && \
+	export EXEC_OPTIONS="$(workflow_down_options) $(workflow_options)$(options)" && \
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)

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

@@ -1,18 +1,13 @@
 services:
-  ui_base:
-    extends:
-      service: context_base 
-    volumes:
-      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy   
   context_base:
-    build:
-      args:
-        USER_ID: ${USER_ID}
-      dockerfile: ./.Dockerfile.context
+    extends:
+      service: stoobly_base
     volumes:
       - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
-  proxy_base:
-    build:
-      dockerfile: ./.Dockerfile.proxy
+  stoobly_base:
+    image: stoobly.${USER_ID}
+  ui_base:
     extends:
-      service: context_base
+      service: context_base 
+    volumes:
+      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy

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

@@ -1,3 +1,3 @@
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
-include $(DIR)/.Makefile
+include $(DIR).Makefile

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

@@ -1,11 +1,15 @@
 services:
   build.init_base:
-    command: ['bin/.init']
+    command: 
+    - bin/.init
     extends:
       file: ../.docker-compose.base.yml
-      service: proxy_base
+      service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
   build.configure_base:
-    command: ['bin/.configure']
+    command: 
+    - bin/.configure
     extends:
       file: ../.docker-compose.base.yml
-      service: proxy_base
+      service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}

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

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent config reset
 
 cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.init

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent snapshot apply
 
 cd $(dirname -- "$0") && ./init

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

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - record

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent config reset
 
 cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/.init

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent snapshot apply
 
 cd $(dirname -- "$0") && ./init

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

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - test

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent config reset
 
 cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/.init

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 stoobly-agent snapshot apply
 
 cd $(dirname -- "$0") && ./init

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

@@ -7,6 +7,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
     - bin/.init
@@ -14,3 +15,4 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml

@@ -1,12 +1,11 @@
 services:
   stoobly_ui.command:
-    build:
-      dockerfile: ../../.Dockerfile.context
-    command: ['${EXEC_COMMAND}', '${EXEC_ARGS}']
+    command: ['.stoobly/docker/stoobly-ui/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
     environment:
       EXEC_OPTIONS: ${EXEC_OPTIONS}
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     profiles:
       - exec

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.logs

@@ -6,5 +6,6 @@ workflow=$1
 stoobly-agent scaffold workflow logs \
   --app-dir-path "$(pwd)" \
   --dry-run \
+  --log-level warning \
   $extra_options \
   $workflow > .stoobly/tmp/run.sh

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.mock.yml

@@ -1,11 +1,10 @@
 services:
   stoobly_ui.service:
-    build:
-      dockerfile: ../../.Dockerfile.context
     command: --ui-port 4200
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     ports:
       - '4200:4200'
     profiles:

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.record.yml

@@ -1,11 +1,10 @@
 services:
   stoobly_ui.service:
-    build:
-      dockerfile: ../../.Dockerfile.context
     command: --ui-port 4200
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     ports:
       - '4200:4200'
     profiles:

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 entrypoint=$(dirname -- "$0")/configure
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/.init

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 entrypoint=$(dirname -- "$0")/configure
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/.init

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ] ; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

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

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 entrypoint=$(dirname -- "$0")/configure
 
 if [ -e "$entrypoint" ]; then

stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/.init

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/validate_command.py

@@ -35,7 +35,7 @@ class ValidateCommand():
     if logs and re.search('error', str(logs), re.IGNORECASE):
       raise ScaffoldValidateException(f"Error logs potentially detected in: {init_container_name}")
     if init_container.status != 'exited' or init_container.attrs['State']['ExitCode'] != 0:
-      raise ScaffoldValidateException(f"init container has not exited like expected: {init_container_name}")
+      raise ScaffoldValidateException(f"init container {init_container_name} exited with: {init_container.attrs['State']['ExitCode']}")
 
     configure_container = self.__get_container(configure_container_name)
 
@@ -43,7 +43,7 @@ class ValidateCommand():
     if configure_container.status == 'exited' and configure_container.attrs['State']['ExitCode'] == 0:
       configure_container_ran = True
     if not configure_container_ran:
-      raise ScaffoldValidateException(f"Configure container has not ran as expected: {configure_container_name}")
+      raise ScaffoldValidateException(f"configure container {configure_container_name} exited with: {configure_container.attrs['State']['ExitCode']}")
   
   def validate_detached(self, container: Container) -> None:
     print(f"Validating detached for: {container.name}")

stoobly_agent/app/cli/scaffold/workflow.py

@@ -33,14 +33,15 @@ class Workflow():
 
   @property
   def service_paths(self):
-    return self.app.service_paths
+    all_service_paths = self.app.service_paths
+    return list(filter(lambda path: os.path.exists(os.path.join(path, self.workflow_name)), all_service_paths))
 
   # TODO: merge into 1 services property
 
   # Returns services that run in this specific workflow
   @property
   def services_ran(self) -> List[str]:
-    services_dir = os.path.join(self.app.scaffold_dir_path, self.app.namespace)
+    services_dir = os.path.join(self.app.data_dir_path, self.app.scaffold_namespace)
 
     services = []
     for filename in os.listdir(services_dir):
@@ -56,5 +57,5 @@ class Workflow():
     return services
 
   def service_paths_from_services(self, services: List[str]):
-    app_namespace_path = self.app.namespace_path
-    return list(map(lambda service: os.path.join(app_namespace_path, service), services))
+    scaffold_namespace_path = self.app.scaffold_namespace_path
+    return list(map(lambda service: os.path.join(scaffold_namespace_path, service), services))

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -26,7 +26,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def compose_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.compose_relative_path
     )
 
@@ -70,7 +70,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def custom_compose_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.custom_compose_relative_path
     )
 
@@ -114,7 +114,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def workflow_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.workflow_relative_path
     )