Improve DX

Signed-off-by: Scott Rigby <[email protected]>

Author: scottrigby

applications/wg-easy/Taskfile.yaml

@@ -1,40 +1,11 @@
 version: "3"
 
+# This is a shim taskfile for running tasks inside Podman
+# The actual taskfile that is mounted within the container lives in taskfiles/internal.yaml
+
 includes:
-  utils: ./taskfiles/utils.yml
   dev: ./taskfiles/container.yml
 
-vars:
-  # Application configuration
-  APP_NAME: '{{.REPLICATED_APP | default "wg-easy"}}'
-
-  # Cluster configuration
-  CLUSTER_NAME: '{{.CLUSTER_NAME | default "test-cluster"}}'
-  K8S_VERSION: '{{.K8S_VERSION | default "1.32.2"}}'
-  DISK_SIZE: '{{.DISK_SIZE | default "100"}}'
-  INSTANCE_TYPE: '{{.INSTANCE_TYPE | default "r1.small"}}'
-  DISTRIBUTION: '{{.DISTRIBUTION | default "k3s"}}'
-  KUBECONFIG_FILE: './{{.CLUSTER_NAME}}.kubeconfig'
-
-  # Ports configuration
-  EXPOSE_PORTS:
-    - port: 30443
-      protocol: https
-    - port: 30080
-      protocol: http
-
-  # GCP default configuration
-  GCP_PROJECT: '{{.GCP_PROJECT | default "replicated-qa"}}'
-  GCP_ZONE: '{{.GCP_ZONE | default "us-central1-a"}}'
-  VM_NAME: '{{.VM_NAME | default (printf "%s-dev" (or (env "GUSER") "user"))}}'
-
-  # Container workflow configuration
-  DEV_CONTAINER_REGISTRY: '{{.DEV_CONTAINER_REGISTRY | default "ghcr.io"}}'
-  DEV_CONTAINER_IMAGE: '{{.DEV_CONTAINER_IMAGE | default "replicatedhq/platform-examples/wg-easy-tools"}}'
-  DEV_CONTAINER_TAG: '{{.DEV_CONTAINER_TAG | default "latest"}}'
-  DEV_CONTAINER_NAME: '{{.DEV_CONTAINER_NAME | default "wg-easy-tools"}}'
-  CONTAINER_RUNTIME: '{{.CONTAINER_RUNTIME | default "podman"}}'
-
 tasks:
   default:
     desc: Show available tasks

applications/wg-easy/taskfiles/container.yml

@@ -1,7 +1,28 @@
 version: "3"
 
+vars:
+  DEV_CONTAINER_REGISTRY: '{{.DEV_CONTAINER_REGISTRY | default "ghcr.io"}}'
+  DEV_CONTAINER_IMAGE: '{{.DEV_CONTAINER_IMAGE | default "replicatedhq/platform-examples/wg-easy-tools"}}'
+  DEV_CONTAINER_TAG: '{{.DEV_CONTAINER_TAG | default "latest"}}'
+  DEV_CONTAINER_NAME: '{{.DEV_CONTAINER_NAME | default "wg-easy-tools"}}'
+  CONTAINER_RUNTIME: '{{.CONTAINER_RUNTIME | default "podman"}}'
+
 # Development environment tasks
 tasks:
+  shell:
+    desc: Attach to development container shell
+    silent: true
+    requires:
+      vars: [DEV_CONTAINER_NAME]
+    deps:
+      - task: start
+    cmds:
+      - echo "Connecting to {{.DEV_CONTAINER_NAME}}..."
+      - '{{.CONTAINER_RUNTIME}} exec -it {{.DEV_CONTAINER_NAME}} {{.CMD}}'
+    vars:
+      CMD: |-
+          {{if .CMD}}bash -c '{{.CMD}}'{{else}}/bin/bash{{end}}
+
   build-image:
     desc: Build development container image
     vars:
@@ -45,7 +66,7 @@ tasks:
         # Start container with host networking for kubectl port-forward compatibility
         CONTAINER_ID=$({{.CONTAINER_RUNTIME}} run --rm --name {{.DEV_CONTAINER_NAME}} -d \
           -v $(pwd):/workspace \
-          -v $(pwd)/internal/Taskfile.yaml:/workspace/Taskfile.yaml \
+          -v $(pwd)/taskfiles/internal.yaml:/workspace/Taskfile.yaml \
           -e REPLICATED_API_TOKEN={{ .REPLICATED_API_TOKEN }} \
           {{.IMAGE_NAME}} bash -c 'trap "exit 0" TERM; sleep infinity & wait')
 
@@ -56,20 +77,6 @@ tasks:
           exit 1
         fi
 
-  shell:
-    desc: Attach to development container shell
-    silent: true
-    requires:
-      vars: [DEV_CONTAINER_NAME]
-    deps:
-      - task: start
-    cmds:
-      - echo "Connecting to {{.DEV_CONTAINER_NAME}}..."
-      - '{{.CONTAINER_RUNTIME}} exec -it {{.DEV_CONTAINER_NAME}} {{.CMD}}'
-    vars:
-      CMD: |-
-          {{if .CMD}}bash -c '{{.CMD}}'{{else}}/bin/bash{{end}}
-
   stop:
     desc: Stop development container
     silent: true

applications/wg-easy/internal/Taskfile.yaml renamed to applications/wg-easy/taskfiles/internal.yaml

@@ -28,13 +28,6 @@ vars:
   GCP_ZONE: '{{.GCP_ZONE | default "us-central1-a"}}'
   VM_NAME: '{{.VM_NAME | default (printf "%s-dev" (or (env "GUSER") "user"))}}'
 
-  # Container workflow configuration
-  DEV_CONTAINER_REGISTRY: '{{.DEV_CONTAINER_REGISTRY | default "ghcr.io"}}'
-  DEV_CONTAINER_IMAGE: '{{.DEV_CONTAINER_IMAGE | default "replicatedhq/platform-examples/wg-easy-tools"}}'
-  DEV_CONTAINER_TAG: '{{.DEV_CONTAINER_TAG | default "latest"}}'
-  DEV_CONTAINER_NAME: '{{.DEV_CONTAINER_NAME | default "wg-easy-tools"}}'
-  CONTAINER_RUNTIME: '{{.CONTAINER_RUNTIME | default "podman"}}'
-
 tasks:
   default:
     desc: Show available tasks