refactor: taskfile var changes (#140)

.github/etc/dictionary.txt

@@ -1,3 +0,0 @@
-buildx
-ggpull
-updategoat

Task/bash/Taskfile.yml

@@ -28,7 +28,6 @@ tasks:
           INPUT_DISABLE_MYPY: '{{.INPUT_DISABLE_MYPY | default ""}}'
           INPUT_EXCLUDE: '{{.INPUT_EXCLUDE | default ""}}'
           INPUT_LOG_LEVEL: '{{.INPUT_LOG_LEVEL | default ""}}'
-          IMAGE_NAME: '{{.IMAGE_NAME | default ""}}'
 
   build:
     desc: Build the project; docker images, compiled binaries, etc.

Task/python/Taskfile.yml

@@ -13,10 +13,6 @@ includes:
     taskfile: ../Taskfile.yml
     internal: true
 
-vars:
-  VERSION:
-    sh: pipenv run python -c 'from {{.PROJECT_SLUG}} import __version__; print(__version__)'
-
 tasks:
   lint:
     desc: Run the linter(s); paved road projects use the Seiso goat 🐐
@@ -38,12 +34,11 @@ tasks:
   build:
     desc: Build the project; docker images, compiled binaries, etc.
     platforms: [linux, darwin]
-    requires:
-      vars: ['VERSION']
     cmds:
       - task: base:build
         vars:
-          VERSION: '{{.VERSION}}'
+          # Unable to make this global due to https://taskfile.dev/usage/#variables see https://github.com/go-task/task/issues/1295
+          VERSION: pipenv run python -c 'from {{.PROJECT_SLUG}} import __version__; print(__version__)'
           PLATFORM: '{{.PLATFORM | default ""}}'
           DOCKER_BUILDX_CUSTOM_ARGS: '{{.DOCKER_BUILDX_CUSTOM_ARGS | default ""}}'
 
@@ -61,13 +56,12 @@ tasks:
   publish:
     desc: Publish the project artifacts; docker images, compiled binaries, etc.
     platforms: [linux, darwin]
-    requires:
-      vars: ['VERSION']
     cmds:
       - task: base:pipeline-docker-multiplatform-init
       - task: base:publish
         vars:
-          VERSION: '{{.VERSION}}'
+          # Unable to make this global due to https://taskfile.dev/usage/#variables see https://github.com/go-task/task/issues/1295
+          VERSION: pipenv run python -c 'from {{.PROJECT_SLUG}} import __version__; print(__version__)'
           PLATFORM: '{{.PLATFORM | default ""}}'
           DOCKER_BUILDX_CUSTOM_ARGS: '{{.DOCKER_BUILDX_CUSTOM_ARGS | default ""}}'
 

Taskfile.yml

@@ -14,11 +14,12 @@ includes:
     internal: true
     optional: true
     vars:
-      IMAGE_NAME: "{{.IMAGE_NAME}}"
-      PROJECT_SLUG: "{{.PROJECT_SLUG}}"
-      PYTHON_VERSION: "{{.PYTHON_VERSION}}"
+      IMAGE_NAME: seiso/goat
+      PROJECT_SLUG: goat
+      PYTHON_VERSION: 3.11
 
 vars:
+  # This unfortunately needs to be duplicated, pending https://github.com/go-task/task/issues/1295
   IMAGE_NAME: seiso/goat
   PROJECT_SLUG: goat
   PYTHON_VERSION: 3.11

etc/seiso_global_dictionary.txt

@@ -11,6 +11,7 @@ bruteforce
 bruteforcing
 bssid
 bssids
+buildx
 capricornis
 casp
 cissp
@@ -51,6 +52,7 @@ flameshot
 gcux
 gcwn
 getuserspns
+ggpull
 giac
 gitleaks
 gitpython
@@ -135,9 +137,9 @@ sast
 secretsdump
 seiso
 seiso's
-seiso’s
 seisollc
 seisosimpleshell
+seiso’s
 servdev
 sha256
 sha256sum
@@ -165,6 +167,7 @@ typosquat
 typosquatting
 unmarshal
 unmarshalling
+updategoat
 vectr
 vimrc
 vishing
@@ -181,4 +184,4 @@ wrike
 wrike's
 xml
 xss
-xxe
+xxe