From 7e1ccd24676b4ab37d967d826d79ae8feda0edbb Mon Sep 17 00:00:00 2001
From: Michael McGuinness <mmcguinness@aarete.com>
Date: Tue, 7 Jan 2025 13:06:43 +0000
Subject: [PATCH] cleanuptaskfile

---
 Taskfile.yml         |  8 +-------
 scripts/Taskfile.yml | 15 ---------------
 scripts/compose.yml  |  8 ++++----
 scripts/docker.yml   | 10 +++++-----
 scripts/tests.yml    |  6 +++---
 5 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index b29a251a..8e74433f 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -7,11 +7,5 @@ includes:
     taskfile: scripts/Taskfile.yml
     flatten: true
     vars:
-      PROJECT_NAME: QueryOrchestration
-      COVERAGE_FILE: coverage.out
-      COVERAGE_THRESHOLD: 80
-      PROJECT_MAIN: cmd/grpc/main.go
-      API_GRPC_DIR: api/grpc
       IMAGE_NAME: queryorchestration
-      DOCKERFILE_DIR: build/package
-      COMPOSE_FILE: deployments/compose.yaml
+      COVERAGE_THRESHOLD: 80
diff --git a/scripts/Taskfile.yml b/scripts/Taskfile.yml
index b5835081..685a991d 100644
--- a/scripts/Taskfile.yml
+++ b/scripts/Taskfile.yml
@@ -26,21 +26,6 @@ tasks:
     deps:
       - db:generate
       - proto:generate
-  dev:
-    deps:
-      - generate
-    cmds:
-      - go run {{.PROJECT_MAIN}}
-  build:
-    deps:
-      - generate
-    cmds:
-      - go build -o {{.OUT_FILE}} {{.PROJECT_MAIN}}
-  start:
-    deps:
-      - build
-    cmds:
-      - ./{{.OUT_FILE}}
   lint:
     cmds:
       - task code:lint
diff --git a/scripts/compose.yml b/scripts/compose.yml
index b5caedc9..10287127 100644
--- a/scripts/compose.yml
+++ b/scripts/compose.yml
@@ -3,15 +3,15 @@
 version: '3'
 
 vars:
-  COMPOSE_FILE_WITH_CONTEXT: "{{.CONTEXT}}/{{.COMPOSE_FILE}}"
+  COMPOSE_FILE: "{{.CONTEXT}}/deployments/compose.yaml"
 
 tasks:
   build:
     cmds:
-      - docker compose -f {{.COMPOSE_FILE_WITH_CONTEXT}} build
+      - docker compose -f {{.COMPOSE_FILE}} build
   up:
     cmds:
-      - docker compose -f {{.COMPOSE_FILE_WITH_CONTEXT}} up
+      - docker compose -f {{.COMPOSE_FILE}} up
   lint:
     cmds:
-      - docker compose -f {{.COMPOSE_FILE_WITH_CONTEXT}} config
\ No newline at end of file
+      - docker compose -f {{.COMPOSE_FILE}} config
\ No newline at end of file
diff --git a/scripts/docker.yml b/scripts/docker.yml
index f5d13ef8..297cd12c 100644
--- a/scripts/docker.yml
+++ b/scripts/docker.yml
@@ -3,14 +3,14 @@
 version: '3'
 
 vars:
-  DOCKERFILE_DIR_WITH_CONTEXT: "{{.CONTEXT}}/{{.DOCKERFILE_DIR}}"
+  DOCKERFILE_DIR: "{{.CONTEXT}}/build/package"
 
 tasks:
   lint:
     cmds:
-      - godolint {{.DOCKERFILE_DIR_WITH_CONTEXT}}/grpc/Dockerfile
-      - godolint {{.DOCKERFILE_DIR_WITH_CONTEXT}}/queue/Dockerfile
+      - godolint {{.DOCKERFILE_DIR}}/grpc/Dockerfile
+      - godolint {{.DOCKERFILE_DIR}}/queue/Dockerfile
   build:
     cmds:
-      - docker build -t {{.IMAGE_NAME}}_grpc -f {{.DOCKERFILE_DIR_WITH_CONTEXT}}/grpc/Dockerfile {{.CONTEXT}}
-      - docker build -t {{.IMAGE_NAME}}_queue -f {{.DOCKERFILE_DIR_WITH_CONTEXT}}/queue/Dockerfile {{.CONTEXT}}
\ No newline at end of file
+      - docker build -t {{.IMAGE_NAME}}_grpc -f {{.DOCKERFILE_DIR}}/grpc/Dockerfile {{.CONTEXT}}
+      - docker build -t {{.IMAGE_NAME}}_queue -f {{.DOCKERFILE_DIR}}/queue/Dockerfile {{.CONTEXT}}
\ No newline at end of file
diff --git a/scripts/tests.yml b/scripts/tests.yml
index b9591f0d..30139a48 100644
--- a/scripts/tests.yml
+++ b/scripts/tests.yml
@@ -8,20 +8,20 @@ includes:
     internal: true
 
 vars:
-  COVERAGE_FILE_WITH_CONTEXT: "{{.CONTEXT}}/{{.OUT_DIR}}/{{.COVERAGE_FILE}}"
+  COVERAGE_FILE: "{{.CONTEXT}}/{{.OUT_DIR}}/coverage.out"
 
 tasks:
   unit:
     cmds:
       - mkdir -p {{.CONTEXT}}/{{.OUT_DIR}} 
-      - go test {{.CONTEXT}}/test/unit/... -coverpkg={{.CONTEXT}}/internal/...,{{.CONTEXT}}/pkg/... -coverprofile={{.COVERAGE_FILE_WITH_CONTEXT}}
+      - go test {{.CONTEXT}}/test/unit/... -coverpkg={{.CONTEXT}}/internal/...,{{.CONTEXT}}/pkg/... -coverprofile={{.COVERAGE_FILE}}
   unit:coverage:
     deps:
       - unit
     vars:
       TMP_FILE: "{{.CONTEXT}}/{{.OUT_DIR}}/coverage.tmp"
     cmds:
-      - go tool cover -func={{.COVERAGE_FILE_WITH_CONTEXT}} > {{.TMP_FILE}}
+      - go tool cover -func={{.COVERAGE_FILE}} > {{.TMP_FILE}}
       - cat {{.TMP_FILE}}
       - |
         COVERAGE=$(grep total: {{.TMP_FILE}} | awk '{print $3}' | sed 's/%//' | bc)