Add e2e test for static port forwards

Signed-off-by: Praful Khanduri <[email protected]>

Author: Horiodino

.github/workflows/test.yml

@@ -612,3 +612,24 @@ jobs:
         sudo chown $(whoami) /dev/kvm
     - name: Smoke test
       run: limactl start --tty=false
+
+  static-port-forwarding:
+    name: "Static Port Forwarding Tests"
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y qemu-utils qemu-system-x86 ovmf curl
+    - name: Make
+      run: make
+    - name: Install
+      run: sudo make install
+    - name: Run plain mode static port forwarding test
+      run: bash hack/test-plain-static-port-forward.sh
+    - name: Run non-plain mode static port forwarding test
+      run: bash hack/test-nonplain-static-port-forward.sh

cmd/limactl/editflags/editflags.go

@@ -288,9 +288,9 @@ func YQExpressions(flags *flag.FlagSet, newInstance bool) ([]string, error) {
 					if len(parts) != 2 {
 						return "", fmt.Errorf("invalid static port forward format %q, expected HOST:GUEST", s)
 					}
-					hostPort := strings.TrimSpace(parts[0])
-					guestPort := strings.TrimSpace(parts[1])
-					expr += fmt.Sprintf(`{"hostPort": %s, "guestPort": %s, "static": true}`, hostPort, guestPort)
+					guestPort := strings.TrimSpace(parts[0])
+					hostPort := strings.TrimSpace(parts[1])
+					expr += fmt.Sprintf(`{"guestPort": %s, "hostPort": %s}`, guestPort, hostPort)
 					if i < len(ss)-1 {
 						expr += ","
 					}

hack/test-nonplain-static-port-forward.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -euxo pipefail
+
+INSTANCE=nonplain-static-port-forward
+TEMPLATE=hack/test-templates/nonplain-static-port-forward.yaml
+
+limactl delete -f $INSTANCE || true
+
+limactl start --name=$INSTANCE --tty=false $TEMPLATE
+
+limactl shell $INSTANCE -- bash -c 'until [ -e /run/nginx.pid ]; do sleep 1; done'
+
+curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'nginx port forwarding works!'
+
+limactl delete -f $INSTANCE 

hack/test-plain-static-port-forward.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -euxo pipefail
+
+INSTANCE=plain-static-port-forward
+TEMPLATE=hack/test-templates/plain-static-port-forward.yaml
+
+limactl delete -f $INSTANCE || true
+
+limactl start --name=$INSTANCE --tty=false $TEMPLATE
+
+limactl shell $INSTANCE -- bash -c 'until [ -e /run/nginx.pid ]; do sleep 1; done'
+
+curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'nginx port forwarding works!'
+
+if curl -sSf http://127.0.0.1:9080; then
+  echo 'ERROR: Port 9080 should not be forwarded in plain mode!'
+  exit 1
+else
+  echo 'Port 9080 is correctly NOT forwarded in plain mode.'
+fi
+
+limactl delete -f $INSTANCE 

hack/test-templates/nonplain-static-port-forward.yaml

@@ -0,0 +1,16 @@
+images:
+  - location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
+    arch: "x86_64"
+
+provision:
+  - mode: system
+    script: |
+      apt-get update
+      apt-get install -y nginx
+      systemctl enable nginx
+      systemctl start nginx
+
+portForwards:
+  - guestPort: 80
+    hostPort: 9090
+    static: true 

hack/test-templates/plain-static-port-forward.yaml

@@ -0,0 +1,21 @@
+images:
+  - location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
+    arch: "x86_64"
+
+plain: true
+
+provision:
+  - mode: system
+    script: |
+      apt-get update
+      apt-get install -y nginx
+      systemctl enable nginx
+      systemctl start nginx
+
+portForwards:
+  - guestPort: 80
+    hostPort: 9090
+    static: true
+  - guestPort: 9080
+    hostPort: 9080
+    static: false