restructure task variables

Author: Diaphteiros

Taskfile_library.yaml

@@ -42,27 +42,16 @@ vars:
     sh: 'cat "{{.ROOT_DIR2}}/go.mod" | grep "module " | sed "s/module //" | sed -E "s/[[:blank:]].*//"'
   NESTED_MODULES: '{{.NESTED_MODULES | default "" }}'
 
-  LOCALBIN: '{{ .LOCALBIN | default (print .ROOT_DIR2 "/bin") }}'
-  LOCALTMP: '{{ .LOCALTMP | default (print .ROOT_DIR2 "/tmp") }}'
+  LOCALBIN: '{{ env "LOCALBIN" | default ( .LOCALBIN | default (print .ROOT_DIR2 "/bin") ) }}'
+  LOCALTMP: '{{ env "LOCALTMP" | default ( .LOCALTMP | default (print .ROOT_DIR2 "/tmp") ) }}'
   CONTROLLER_GEN: '{{ .CONTROLLER_GEN | default (print .LOCALBIN "/controller-gen") }}'
-  CONTROLLER_GEN_VERSION: '{{ .CONTROLLER_GEN_VERSION | default "v0.16.4" }}'
   FORMATTER: '{{ .FORMATTER | default (print .LOCALBIN "/goimports") }}'
-  FORMATTER_VERSION: '{{ .FORMATTER_VERSION | default "v0.26.0" }}'
   LINTER: '{{ .LINTER | default (print .LOCALBIN "/golangci-lint") }}'
-  LINTER_VERSION: '{{ .LINTER_VERSION | default "v1.64.4" }}'
   JQ: '{{ .JQ | default (print .LOCALBIN "/jq") }}'
-  JQ_VERSION: '{{ .JQ_VERSION | default "v1.7.1" }}'
   HELM: '{{ .HELM | default (print .LOCALBIN "/helm") }}'
-  HELM_VERSION: '{{ .HELM_VERSION | default "v3.17.1" }}'
   YAML2JSON: '{{ .YAML2JSON | default (print .LOCALBIN "/yaml2json") }}'
-  YAML2JSON_VERSION: '{{ .YAML2JSON_VERSION | default "v1.3.5" }}'
   OCM: '{{ .OCM | default (print .LOCALBIN "/ocm") }}'
-  OCM_VERSION: '{{ .OCM_VERSION | default "v0.21.0" }}'
   ENVTEST: '{{ .ENVTEST | default (print .LOCALBIN "/setup-envtest") }}'
-  ENVTEST_VERSION: '{{ .ENVTEST_VERSION | default "release-0.16" }}'
-
-  DOCKER_BUILDER_NAME: # move to build taskfile later
-    sh: 'echo -n ${DOCKER_BUILDER_NAME:-"openmcp-multiarch-builder"}'
 
   # separator strings
   SEP_MSG: "This is just a separator, what did you expect to happen?"

tasks_build_img.yaml

@@ -5,6 +5,10 @@ includes:
     taskfile: tasks_build_bin.yaml
     internal: true
 
+vars:
+  DOCKER_BUILDER_NAME:
+    sh: 'echo -n ${DOCKER_BUILDER_NAME:-"openmcp-multiarch-builder"}'
+
 tasks:
   # This is a dummy task that serves as a separator between task namespaces in the 'task -l' output.
   "---":

tasks_tools.yaml

@@ -33,9 +33,10 @@ tasks:
     requires:
       vars:
       - CONTROLLER_GEN
-      - CONTROLLER_GEN_VERSION
     deps:
     - localbin
+    vars:
+      CONTROLLER_GEN_VERSION: '{{ env "CONTROLLER_GEN_VERSION" | default ( .CONTROLLER_GEN_VERSION | default "v0.16.4" ) }}'
     status:
     - test -x {{.CONTROLLER_GEN}}
     - '{{.CONTROLLER_GEN}} --version | grep -q "{{.CONTROLLER_GEN_VERSION}}"'
@@ -49,9 +50,10 @@ tasks:
     requires:
       vars:
       - FORMATTER
-      - FORMATTER_VERSION
     deps:
     - localbin
+    vars:
+      FORMATTER_VERSION: '{{ env "FORMATTER_VERSION" | default ( .FORMATTER_VERSION | default "v0.26.0" ) }}'
     status:
     - test -x {{.FORMATTER}}
     - test -f {{.LOCALBIN}}/formatter_version
@@ -67,9 +69,10 @@ tasks:
     requires:
       vars:
       - LINTER
-      - LINTER_VERSION
     deps:
     - localbin
+    vars:
+      LINTER_VERSION: '{{ env "LINTER_VERSION" | default ( .LINTER_VERSION | default "v1.64.4" ) }}'
     status:
     - test -x {{.LINTER}}
     - '{{.LINTER}} --version | grep -q {{.LINTER_VERSION | trimPrefix "v"}}'
@@ -83,10 +86,10 @@ tasks:
     requires:
       vars:
       - JQ
-      - JQ_VERSION
     deps:
     - localbin
     vars:
+      JQ_VERSION: '{{ env "JQ_VERSION" | default ( .JQ_VERSION | default "v1.7.1" ) }}'
       JQ_OS:
         sh: 'if [[ "{{.OS}}" == "darwin" ]]; then echo "macos"; else echo "{{.OS}}"; fi' # jq uses 'macos' instead of 'darwin'
     status:
@@ -103,15 +106,15 @@ tasks:
     requires:
       vars:
       - HELM
-      - HELM_VERSION
     deps:
     - localbin
-    status:
-    - test -x "{{.HELM}}"
-    - '"{{.HELM}}" version --short | grep -q {{.HELM_VERSION}}'
     vars:
+      HELM_VERSION: '{{ env "HELM_VERSION" | default ( .HELM_VERSION | default "v3.17.1" ) }}'
       tmpdir:
         sh: 'mktemp -d'
+    status:
+    - test -x "{{.HELM}}"
+    - '"{{.HELM}}" version --short | grep -q {{.HELM_VERSION}}'
     cmds:
     - 'mkdir -p {{.tmpdir}}/helm-unpacked'
     - 'curl -sfL "https://get.helm.sh/helm-{{.HELM_VERSION}}-{{.OS}}-{{.ARCH}}.tar.gz" --output "{{.tmpdir}}/helm.tar.gz"'
@@ -127,9 +130,10 @@ tasks:
     requires:
       vars:
       - YAML2JSON
-      - YAML2JSON_VERSION
     deps:
     - localbin
+    vars:
+      YAML2JSON_VERSION: '{{ env "YAML2JSON_VERSION" | default ( .YAML2JSON_VERSION | default "v1.3.5" ) }}'
     status:
     - 'test -x "{{.YAML2JSON}}"'
     - '"{{.YAML2JSON}}" --version | grep -q "{{.YAML2JSON_VERSION | trimPrefix "v"}}"'
@@ -144,13 +148,13 @@ tasks:
     requires:
       vars:
       - OCM
-      - OCM_VERSION
     deps:
     - localbin
     status:
     - 'test -x "{{.OCM}}"'
     - '"{{.OCM}}" --version | grep -q "{{.OCM_VERSION | trimPrefix "v"}}"'
     vars:
+      OCM_VERSION: '{{ env "OCM_VERSION" | default ( .OCM_VERSION | default "v0.21.0" ) }}'
       tmpdir:
         sh: 'mktemp -d'
     cmds:
@@ -164,9 +168,10 @@ tasks:
     requires:
       vars:
       - ENVTEST
-      - ENVTEST_VERSION
     deps:
     - localbin
+    vars:
+      ENVTEST_VERSION: '{{ env "ENVTEST_VERSION" | default ( .ENVTEST_VERSION | default "release-0.16" ) }}'
     status:
     - 'test -x "{{.ENVTEST}}"'
     - test -f {{.LOCALBIN}}/envtest_version