update from code review

Author: nvanthao

applications/wg-easy/Taskfile.yaml

@@ -50,7 +50,7 @@ vars:
   CMX_VM_DISK_SIZE: '{{.CMX_VM_DISK_SIZE | default "100"}}'
   CMX_VM_TTL: '{{.CMX_VM_TTL | default "1h"}}'
   CMX_VM_USER: '{{.CMX_VS_USER}}'
-  CMX_VM_PUBLIC_KEY: '{{.CMX_VM_PUBLIC_KEY | default (env "HOME" | printf "%s/.ssh/id_ed25519")}}'
+  CMX_VM_PUBLIC_KEY: '{{.CMX_VM_PUBLIC_KEY}}'
 
 tasks:
   default:
@@ -565,12 +565,13 @@ tasks:
         echo "Deleting CMX VM {{.CMX_VM_NAME}}..."
         replicated vm rm {{.CMX_VM_NAME}}
 
-  cmx-vm-embedded-cluster-setup:
+  cmx-vm-install:
     desc: Download and install the app as Embedded Cluster on CMX VM
     silent: false
     vars:
       CHANNEL: '{{.CHANNEL | default "Unstable"}}'
       AUTH_TOKEN: '{{.AUTH_TOKEN | default "2usDXzovcJNcpn54yS5tFQVNvCq"}}'
+      SKIP_INSTALL: '{{.SKIP_INSTALL | default "false"}}'
       ADMIN_CONSOLE_PASSWORD:
         sh: uuidgen | cut -c1-13
     deps:
@@ -582,21 +583,18 @@ tasks:
       - |
         echo "Check if user is set..."
         if [ -z "{{.CMX_VM_USER}}" ]; then
-          echo "CMX_VM_USER is not set. Set it to your Github handle. E.g. task cmx-vm-embedded-cluster-setup CMX_VM_USER=nvanthao"
-          exit 1
-        fi
-
-        echo "Check if public key exists..."
-        if [ ! -f "{{.CMX_VM_PUBLIC_KEY}}" ]; then
-          echo "{{.CMX_VM_PUBLIC_KEY}} does not exist."
+          echo "CMX_VM_USER is not set. Set it to your Github handle. E.g. task cmx-vm-install CMX_VM_USER=nvanthao"
           exit 1
         fi
 
         echo "SSH into the VM and download the app binary..."
-        SSH_BASE_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i {{.CMX_VM_PUBLIC_KEY}}"
-        VM_SSH_CMD=$(replicated vm ls --output=json | jq -r ".[] | select(.name == \"{{.CMX_VM_NAME}}\") | \"$SSH_BASE_CMD -p \(.direct_ssh_port) nvanthao@\(.direct_ssh_endpoint)\"")
+        SSH_BASE_CMD="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+        if [ -n "{{.CMX_VM_PUBLIC_KEY}}" ]; then
+          SSH_BASE_CMD="$SSH_BASE_CMD -i {{.CMX_VM_PUBLIC_KEY}}"
+        fi
+        VM_SSH_CMD=$(replicated vm ls --output=json | jq -r ".[] | select(.name == \"{{.CMX_VM_NAME}}\") | \"$SSH_BASE_CMD -p \(.direct_ssh_port) {{.CMX_VM_USER}}@\(.direct_ssh_endpoint)\"")
  
-        echo "SSH command: $VM_SSH_CMD"
+        echo "SSH base command: $SSH_BASE_CMD"
         $VM_SSH_CMD << 'EOF'
         set -e
         echo 'Downloading {{.APP_NAME}} installer...'
@@ -605,13 +603,18 @@ tasks:
         echo 'Extracting installer...'
         tar -xvzf {{.APP_NAME}}-{{.CHANNEL}}.tgz
 
-        echo "Installing {{.APP_NAME}}..."
-        sudo ./{{.APP_NAME}} install --license license.yaml --admin-console-password {{.ADMIN_CONSOLE_PASSWORD}} --yes
-
+        if [ "{{.SKIP_INSTALL}}" = "false" ]; then
+          echo "Installing {{.APP_NAME}}..."
+          sudo ./{{.APP_NAME}} install --license license.yaml --admin-console-password {{.ADMIN_CONSOLE_PASSWORD}} --yes
+        else
+          echo "Skipping installation as requested. Binary is available at ./{{.APP_NAME}}"
+        fi
         EOF
 
-        echo "Exposing port 30000 on the VM..."
-        replicated vm port expose --port 30000 {{.CMX_VM_NAME}}
+        if [ "{{.SKIP_INSTALL}}" = "false" ]; then
+          echo "Exposing port 30000 on the VM..."
+          replicated vm port expose --port 30000 {{.CMX_VM_NAME}}
 
-        echo "Visit above URL to access the Admin Console, password: {{.ADMIN_CONSOLE_PASSWORD}}"
+          echo "Visit above URL to access the Admin Console, password: {{.ADMIN_CONSOLE_PASSWORD}}"
+        fi
 

applications/wg-easy/docs/task-reference.md

@@ -47,7 +47,7 @@ These tasks help manage the development and testing environments.
 | `embedded-cluster-setup` | Sets up a Replicated embedded cluster on the GCP VM | Stage 7: Embedded Testing |
 | `cmx-vm-create` | Creates a CMX VM instance using Replicated CLI | Stage 7: Embedded Testing |
 | `cmx-vm-delete` | Deletes a CMX VM instance | Stage 7: Cleanup |
-| `cmx-vm-embedded-cluster-setup` | Sets up a Replicated embedded cluster on the CMX VM | Stage 7: Embedded Testing |
+| `cmx-vm-install` | Downloads and optionally installs the app as Embedded Cluster on CMX VM | Stage 7: Embedded Testing |
 
 ### Common Environment Combinations
 
@@ -118,14 +118,15 @@ Many tasks accept parameters to customize their behavior. Here are the most comm
 | `RELEASE_NOTES` | `release-create` | Notes for the release | "" |
 | `GCP_PROJECT` | `gcp-vm-create` | GCP project ID | Required |
 | `GCP_ZONE` | `gcp-vm-create` | GCP zone | "us-central1-a" |
-| `CMX_VM_NAME` | `cmx-vm-create`, `cmx-vm-delete`, `cmx-vm-embedded-cluster-setup` | Name for the CMX VM | "{{USER}}-cmx-vm" |
+| `CMX_VM_NAME` | `cmx-vm-create`, `cmx-vm-delete`, `cmx-vm-install` | Name for the CMX VM | "{{USER}}-cmx-vm" |
 | `CMX_VM_DISTRIBUTION` | `cmx-vm-create` | VM distribution | "ubuntu" |
 | `CMX_VM_VERSION` | `cmx-vm-create` | VM version | "24.04" |
 | `CMX_VM_INSTANCE_TYPE` | `cmx-vm-create` | VM instance type | "r1.medium" |
 | `CMX_VM_DISK_SIZE` | `cmx-vm-create` | VM disk size in GB | "100" |
 | `CMX_VM_TTL` | `cmx-vm-create` | VM time-to-live | "1h" |
-| `CMX_VM_USER` | `cmx-vm-embedded-cluster-setup` | VM user for SSH access | Required |
-| `CMX_VM_PUBLIC_KEY` | `cmx-vm-embedded-cluster-setup` | Path to SSH public key | "~/.ssh/id_ed25519" |
+| `CMX_VM_USER` | `cmx-vm-install` | VM user for SSH access | Required |
+| `CMX_VM_PUBLIC_KEY` | `cmx-vm-install` | Path to SSH public key | "" |
+| `SKIP_INSTALL` | `cmx-vm-install` | Skip the installation step, only download binary | "false" |
 
 Parameters in the Taskfile.yaml try to always have defaults so that it works out of the box but allows customization for common values.