refactor: align aspects folder structure

(cherry picked from commit 3e26d3c)

Author: Ian2012

tutoraspects/patches/k8s-jobs

@@ -19,12 +19,17 @@ spec:
           allowPrivilegeEscalation: false
           runAsUser: 0
         volumeMounts:
-            - mountPath: /app/aspects/scripts
-              name: scripts
+          - mountPath: /app/aspects/dbt
+            name: dbt
+          - mountPath: /app/aspects/scripts
+            name: scripts
       volumes:
         - name: scripts
           configMap:
             name: aspects-scripts
+        - name: dbt
+          configMap:
+            name: aspects-dbt
 ---
 apiVersion: batch/v1
 kind: Job

tutoraspects/patches/kustomization-configmapgenerator

@@ -1,9 +1,16 @@
 - name: aspects-scripts
-  files:{% for file in "aspects/apps/scripts"|walk_templates %}
+  files:{% for file in "aspects/apps/aspects/scripts"|walk_templates %}
   - plugins/{{ file }}{% endfor %}
   options:
     labels:
         app.kubernetes.io/name: aspects
+- name: aspects-dbt
+  files:{% for file in "aspects/apps/aspects/dbt"|walk_templates %}
+  - plugins/{{ file }}{% endfor %}
+  options:
+    labels:
+        app.kubernetes.io/name: aspects
+
 {% if RUN_CLICKHOUSE %}
 - name: clickhouse-settings
   files:

tutoraspects/patches/local-docker-compose-jobs-services

@@ -2,7 +2,7 @@ aspects-job:
   user: root
   image: {{ DOCKER_IMAGE_ASPECTS }}
   volumes:
-    - ../../env/plugins/aspects/apps:/app/aspects
+    - ../../env/plugins/aspects/apps/aspects:/app/aspects
   depends_on:
     - superset {% if RUN_CLICKHOUSE%}
     - clickhouse{% endif %}

tutoraspects/plugin.py

@@ -432,9 +432,9 @@ def load_xapi_test_data(num_batches: int, batch_size: int) -> list[tuple[str, st
         (
             "aspects",
             "echo 'Making demo xapi script executable...' && "
-            "chmod +x /app/aspects/scripts/aspects/clickhouse-demo-xapi-data.sh && "
+            "chmod +x /app/aspects/scripts/clickhouse-demo-xapi-data.sh && "
             "echo 'Done. Running script...' && "
-            f"bash /app/aspects/scripts/aspects/clickhouse-demo-xapi-data.sh {num_batches}"
+            f"bash /app/aspects/scripts/clickhouse-demo-xapi-data.sh {num_batches}"
             f" {batch_size} && "
             "echo 'Done!';",
         ),
@@ -467,9 +467,9 @@ def dbt(command: string) -> list[tuple[str, str]]:
         (
             "aspects",
             "echo 'Making dbt script executable...' && "
-            "chmod +x /app/aspects/scripts/aspects/dbt.sh && "
+            "chmod +x /app/aspects/scripts/dbt.sh && "
             f"echo 'Running dbt {command}' && "
-            f"bash /app/aspects/scripts/aspects/dbt.sh {command} && "
+            f"bash /app/aspects/scripts/dbt.sh {command} && "
             "echo 'Done!';",
         ),
     ]

tutoraspects/templates/aspects/apps/scripts/aspects/profiles.yml tutoraspects/templates/aspects/apps/aspects/dbt/profiles.yml

@@ -5,15 +5,15 @@ python3 -m venv virtualenv
 
 echo "Installing dbt packages..."
 
-pip install -r requirements.txt
+pip install -r /app/aspects/dbt/requirements.txt
 
 echo "Installing aspects-dbt"
 git clone -b {{ DBT_BRANCH }} {{ DBT_REPOSITORY }}
 
 cd {{ DBT_REPOSITORY_PATH }} || exit
 
 echo "Installing dbt dependencies"
-dbt deps --profiles-dir /app/aspects/scripts/aspects/
+dbt deps --profiles-dir /app/aspects/dbt/
 
 echo "Running dbt $*"
-dbt "$@" --profiles-dir /app/aspects/scripts/aspects/
+dbt "$@" --profiles-dir /app/aspects/dbt/

tutoraspects/templates/aspects/apps/scripts/aspects/requirements.txt tutoraspects/templates/aspects/apps/aspects/dbt/requirements.txt

@@ -5,15 +5,15 @@ python3 -m venv virtualenv
 
 echo "Installing dbt packages..."
 
-pip install -r /app/aspects/scripts/aspects/requirements.txt
+pip install -r /app/aspects/dbt/requirements.txt
 
 echo "Installing aspects-dbt"
 git clone -b {{ DBT_BRANCH }} {{ DBT_REPOSITORY }}
 
 cd {{ DBT_REPOSITORY_PATH }} || exit
 
 echo "Installing dbt dependencies"
-dbt deps --profiles-dir /app/aspects/scripts/aspects/
+dbt deps --profiles-dir /app/aspects/dbt/
 
 echo "Running dbt"
-dbt run --profiles-dir /app/aspects/scripts/aspects/
+dbt run --profiles-dir /app/aspects/dbt/