Move tasks to data_tasks directory

Adapt executable and github actions naming as well
hypothesis · Nov 25, 2022 · dcab408 · dcab408
1 parent 97a0a35
commit dcab408
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/sql_tasks.yml → .github/workflows/data_tasks.yml b/.github/workflows/sql_tasks.yml → .github/workflows/data_tasks.yml
@@ -1,12 +1,12 @@
-# Run various SQL defined tasks, usually related to the report aggregations
+# Run various tasks, usually related to the report aggregations
 
-name: SQL tasks
+name: Data tasks
 on:
   workflow_dispatch:
     inputs:
       Task:
         type: choice
-        description: "The SQL task to perform"
+        description: "The data task to perform"
         required: true
         options:
           - "report/refresh"
@@ -47,12 +47,12 @@ jobs:
 
   run_task:
     needs: check_for_danger
-    name: "Run '${{ inputs.Task }}' SQL task in ${{ inputs.Environment }} / ${{ inputs.Region }}"
+    name: "Run '${{ inputs.Task }}' Data task in ${{ inputs.Environment }} / ${{ inputs.Region }}"
     uses: hypothesis/workflows/.github/workflows/eb-task.yml@main
     with:
       App: ${{ github.event.repository.name }}
       Env: ${{ inputs.Environment }}
       Timeout: 3600
       Region: ${{ inputs.Region }}
-      Command: 'newrelic-admin run-program python bin/run_sql_task.py --config-file conf/production.ini --task ${{ inputs.Task }}'
+      Command: 'newrelic-admin run-program python bin/run_data_task.py --config-file conf/production.ini --task ${{ inputs.Task }}'
     secrets: inherit
diff --git a/bin/run_sql_task.py → bin/run_data_task.py b/bin/run_sql_task.py → bin/run_data_task.py
@@ -16,10 +16,10 @@
 
 from lms.models import Regions
 
-TASK_ROOT = importlib_resources.files("lms.sql_tasks") / "tasks"
+TASK_ROOT = importlib_resources.files("lms.data_tasks")
 
 parser = ArgumentParser(
-    description=f"A script for running SQL tasks defined in: {TASK_ROOT}"
+    description=f"A script for running tasks defined in: {TASK_ROOT}"
 )
 parser.add_argument(
     "-c",
@@ -28,7 +28,7 @@
     help="The paster config for this application. (e.g. development.ini)",
 )
 
-parser.add_argument("-t", "--task", required=True, help="The SQL task name to run")
+parser.add_argument("-t", "--task", required=True, help="The data task name to run")
 
 parser.add_argument(
     "--no-python",

diff --git a/...sks/hello_world/01_hello_world.jinja2.sql → ...sks/hello_world/01_hello_world.jinja2.sql b/...sks/hello_world/01_hello_world.jinja2.sql → ...sks/hello_world/01_hello_world.jinja2.sql
diff --git a/...asks/tasks/hello_world/02_hello_world.sql → ...data_tasks/hello_world/02_hello_world.sql b/...asks/tasks/hello_world/02_hello_world.sql → ...data_tasks/hello_world/02_hello_world.sql
diff --git a/...lo_world/02_sub_task/01_subtask_hello.sql → ...lo_world/02_sub_task/01_subtask_hello.sql b/...lo_world/02_sub_task/01_subtask_hello.sql → ...lo_world/02_sub_task/01_subtask_hello.sql
diff --git a/...ate_dev_users/01_create_schema.jinja2.sql → ...ate_dev_users/01_create_schema.jinja2.sql b/...ate_dev_users/01_create_schema.jinja2.sql → ...ate_dev_users/01_create_schema.jinja2.sql
diff --git a/...eate_dev_users/02_create_users.jinja2.sql → ...eate_dev_users/02_create_users.jinja2.sql b/...eate_dev_users/02_create_users.jinja2.sql → ...eate_dev_users/02_create_users.jinja2.sql
diff --git a/...s/tasks/report/create_dev_users/README.md → ...a_tasks/report/create_dev_users/README.md b/...s/tasks/report/create_dev_users/README.md → ...a_tasks/report/create_dev_users/README.md
diff --git a/...om_scratch/00_schema/01_create.jinja2.sql → ...om_scratch/00_schema/01_create.jinja2.sql b/...om_scratch/00_schema/01_create.jinja2.sql → ...om_scratch/00_schema/01_create.jinja2.sql
diff --git a/...00_schema/02_create_fdw_server.jinja2.sql → ...00_schema/02_create_fdw_server.jinja2.sql b/...00_schema/02_create_fdw_server.jinja2.sql → ...00_schema/02_create_fdw_server.jinja2.sql
diff --git a/...cratch/00_schema/03_create_fdw_schema.sql → ...cratch/00_schema/03_create_fdw_schema.sql b/...cratch/00_schema/03_create_fdw_schema.sql → ...cratch/00_schema/03_create_fdw_schema.sql
diff --git a/...cratch/01_functions/01_date_functions.sql → ...cratch/01_functions/01_date_functions.sql b/...cratch/01_functions/01_date_functions.sql → ...cratch/01_functions/01_date_functions.sql
diff --git a/...tities/01_users/01_create_view.jinja2.sql → ...tities/01_users/01_create_view.jinja2.sql b/...tities/01_users/01_create_view.jinja2.sql → ...tities/01_users/01_create_view.jinja2.sql
diff --git a/.../02_entities/01_users/02_initial_fill.sql → .../02_entities/01_users/02_initial_fill.sql b/.../02_entities/01_users/02_initial_fill.sql → .../02_entities/01_users/02_initial_fill.sql
diff --git a/...2_entities/02_user_map/01_create_view.sql → ...2_entities/02_user_map/01_create_view.sql b/...2_entities/02_user_map/01_create_view.sql → ...2_entities/02_user_map/01_create_view.sql
diff --git a/..._entities/02_user_map/02_initial_fill.sql → ..._entities/02_user_map/02_initial_fill.sql b/..._entities/02_user_map/02_initial_fill.sql → ..._entities/02_user_map/02_initial_fill.sql
diff --git a/...ities/03_groups/01_create_view.jinja2.sql → ...ities/03_groups/01_create_view.jinja2.sql b/...ities/03_groups/01_create_view.jinja2.sql → ...ities/03_groups/01_create_view.jinja2.sql
diff --git a/...02_entities/03_groups/02_initial_fill.sql → ...02_entities/03_groups/02_initial_fill.sql b/...02_entities/03_groups/02_initial_fill.sql → ...02_entities/03_groups/02_initial_fill.sql
diff --git a/..._entities/04_group_map/01_create_view.sql → ..._entities/04_group_map/01_create_view.sql b/..._entities/04_group_map/01_create_view.sql → ..._entities/04_group_map/01_create_view.sql
diff --git a/...entities/04_group_map/02_initial_fill.sql → ...entities/04_group_map/02_initial_fill.sql b/...entities/04_group_map/02_initial_fill.sql → ...entities/04_group_map/02_initial_fill.sql
diff --git a/.../02_entities/05_events/01_create_view.sql → .../02_entities/05_events/01_create_view.sql b/.../02_entities/05_events/01_create_view.sql → .../02_entities/05_events/01_create_view.sql
diff --git a/...02_entities/05_events/02_initial_fill.sql → ...02_entities/05_events/02_initial_fill.sql b/...02_entities/05_events/02_initial_fill.sql → ...02_entities/05_events/02_initial_fill.sql
diff --git a/.../01_user_groups/01_create_view.jinja2.sql → .../01_user_groups/01_create_view.jinja2.sql b/.../01_user_groups/01_create_view.jinja2.sql → .../01_user_groups/01_create_view.jinja2.sql
diff --git a/...erence/01_user_groups/02_initial_fill.sql → ...erence/01_user_groups/02_initial_fill.sql b/...erence/01_user_groups/02_initial_fill.sql → ...erence/01_user_groups/02_initial_fill.sql
diff --git a/...ference/02_group_roles/01_create_view.sql → ...ference/02_group_roles/01_create_view.sql b/...ference/02_group_roles/01_create_view.sql → ...ference/02_group_roles/01_create_view.sql
diff --git a/...erence/02_group_roles/02_initial_fill.sql → ...erence/02_group_roles/02_initial_fill.sql b/...erence/02_group_roles/02_initial_fill.sql → ...erence/02_group_roles/02_initial_fill.sql
diff --git a/.../03_organization_roles/01_create_view.sql → .../03_organization_roles/01_create_view.sql b/.../03_organization_roles/01_create_view.sql → .../03_organization_roles/01_create_view.sql
diff --git a/...03_organization_roles/02_initial_fill.sql → ...03_organization_roles/02_initial_fill.sql b/...03_organization_roles/02_initial_fill.sql → ...03_organization_roles/02_initial_fill.sql
diff --git a/..._group_activity/01_create_view.jinja2.sql → ..._group_activity/01_create_view.jinja2.sql b/..._group_activity/01_create_view.jinja2.sql → ..._group_activity/01_create_view.jinja2.sql
diff --git a/...nts/01_group_activity/02_initial_fill.sql → ...nts/01_group_activity/02_initial_fill.sql b/...nts/01_group_activity/02_initial_fill.sql → ...nts/01_group_activity/02_initial_fill.sql
diff --git a/...2_user_activity/01_create_view.jinja2.sql → ...2_user_activity/01_create_view.jinja2.sql b/...2_user_activity/01_create_view.jinja2.sql → ...2_user_activity/01_create_view.jinja2.sql
diff --git a/...unts/02_user_activity/02_initial_fill.sql → ...unts/02_user_activity/02_initial_fill.sql b/...unts/02_user_activity/02_initial_fill.sql → ...unts/02_user_activity/02_initial_fill.sql
diff --git a/..._organization_activity/01_create_view.sql → ..._organization_activity/01_create_view.sql b/..._organization_activity/01_create_view.sql → ..._organization_activity/01_create_view.sql
diff --git a/...organization_activity/02_initial_fill.sql → ...organization_activity/02_initial_fill.sql b/...organization_activity/02_initial_fill.sql → ...organization_activity/02_initial_fill.sql
diff --git a/...nt_permissions/01_grant_schema.jinja2.sql → ...nt_permissions/01_grant_schema.jinja2.sql b/...nt_permissions/01_grant_schema.jinja2.sql → ...nt_permissions/01_grant_schema.jinja2.sql
diff --git a/...asks/report/create_from_scratch/README.md → ...asks/report/create_from_scratch/README.md b/...asks/report/create_from_scratch/README.md → ...asks/report/create_from_scratch/README.md
diff --git a/.../report/refresh/00_fdw_refresh.jinja2.sql → .../report/refresh/00_fdw_refresh.jinja2.sql b/.../report/refresh/00_fdw_refresh.jinja2.sql → .../report/refresh/00_fdw_refresh.jinja2.sql
diff --git a/...ks/report/refresh/01_entities_refresh.sql → ...ks/report/refresh/01_entities_refresh.sql b/...ks/report/refresh/01_entities_refresh.sql → ...ks/report/refresh/01_entities_refresh.sql
diff --git a/...rt/refresh/02_cross_reference_refresh.sql → ...rt/refresh/02_cross_reference_refresh.sql b/...rt/refresh/02_cross_reference_refresh.sql → ...rt/refresh/02_cross_reference_refresh.sql
diff --git a/...rt/refresh/03_activity_counts_refresh.sql → ...rt/refresh/03_activity_counts_refresh.sql b/...rt/refresh/03_activity_counts_refresh.sql → ...rt/refresh/03_activity_counts_refresh.sql
diff --git a/lms/sql_tasks/tasks/report/refresh/README.md → lms/data_tasks/report/refresh/README.md b/lms/sql_tasks/tasks/report/refresh/README.md → lms/data_tasks/report/refresh/README.md
diff --git a/lms/sql_tasks/__init__.py b/lms/sql_tasks/__init__.py
diff --git a/tests/functional/bin/run_sql_task_test.py → tests/functional/bin/run_data_task_test.py b/tests/functional/bin/run_sql_task_test.py → tests/functional/bin/run_data_task_test.py
@@ -32,7 +32,7 @@ def run_task(self, environ, task_name):
         result = check_output(
             [
                 sys.executable,
-                "bin/run_sql_task.py",
+                "bin/run_data_task.py",
                 "--config-file",
                 "conf/development.ini",
                 "--task",