Skip to content

Commit c4cea4c

Browse files
HoriodinoHoriodino
committed
updated e2e tests
Signed-off-by: Praful Khanduri <holiodin@gmail.com> Skip static port forwards on gRPC because conflicts Signed-off-by: Praful Khanduri <holiodin@gmail.com> Revert unintended changes to templates/default.yaml Signed-off-by: Praful Khanduri <holiodin@gmail.com> fixed failing golangci lint err Signed-off-by: Praful Khanduri <holiodin@gmail.com>
1 parent d907638 commit c4cea4c

File tree

11 files changed

+339
-98
lines changed

11 files changed

+339
-98
lines changed

‎cmd/limactl/editflags/editflags.go‎

Lines changed: 51 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,9 @@ func RegisterCreate(cmd *cobra.Command, commentPrefix string) {
9797

9898
flags.Bool("plain", false, commentPrefix+"Plain mode. Disables mounts, port forwarding, containerd, etc.")
9999

100-
flags.StringSlice("port-forward", nil, commentPrefix+"Port forwards (host:guest), e.g., '8080:80,2222:22'")
100+
flags.StringArray("port-forward", nil, commentPrefix+"Port forwards (host:guest), e.g., '8080:80' or '9090:9090,static=true' for static port-forwards")
101101
_ = cmd.RegisterFlagCompletionFunc("port-forward", func(*cobra.Command, []string, string) ([]string, cobra.ShellCompDirective) {
102-
return []string{"8080:80", "3000:3000"}, cobra.ShellCompDirectiveNoFileComp
103-
})
104-
flags.StringSlice("static-port-forward", nil, commentPrefix+"Static port forwards (host:guest), works even in plain mode, e.g., '8080:80,2222:22'")
105-
_ = cmd.RegisterFlagCompletionFunc("static-port-forward", func(*cobra.Command, []string, string) ([]string, cobra.ShellCompDirective) {
106-
return []string{"8080:80", "3000:3000"}, cobra.ShellCompDirectiveNoFileComp
102+
return []string{"8080:80", "3000:3000", "8080:80,static=true"}, cobra.ShellCompDirectiveNoFileComp
107103
})
108104
}
109105

@@ -113,6 +109,52 @@ func defaultExprFunc(expr string) func(v *flag.Flag) (string, error) {
113109
}
114110
}
115111

112+
func ParsePortForward(spec string) (hostPort, guestPort string, isStatic bool, err error) {
113+
parts := strings.Split(spec, ",")
114+
if len(parts) > 2 {
115+
return "", "", false, fmt.Errorf("invalid port forward format %q, expected HOST:GUEST or HOST:GUEST,static=true", spec)
116+
}
117+
118+
portParts := strings.Split(strings.TrimSpace(parts[0]), ":")
119+
if len(portParts) != 2 {
120+
return "", "", false, fmt.Errorf("invalid port forward format %q, expected HOST:GUEST", parts[0])
121+
}
122+
123+
hostPort = strings.TrimSpace(portParts[0])
124+
guestPort = strings.TrimSpace(portParts[1])
125+
126+
if len(parts) == 2 {
127+
staticPart := strings.TrimSpace(parts[1])
128+
if staticPart == "static=true" {
129+
isStatic = true
130+
} else {
131+
return "", "", false, fmt.Errorf("invalid parameter %q, only 'static=true' is supported", staticPart)
132+
}
133+
}
134+
135+
return hostPort, guestPort, isStatic, nil
136+
}
137+
138+
func BuildPortForwardExpression(portForwards []string) (string, error) {
139+
if len(portForwards) == 0 {
140+
return "", nil
141+
}
142+
143+
expr := `.portForwards += [`
144+
for i, spec := range portForwards {
145+
hostPort, guestPort, isStatic, err := ParsePortForward(spec)
146+
if err != nil {
147+
return "", err
148+
}
149+
expr += fmt.Sprintf(`{"guestPort": %q, "hostPort": %q, "static": %v}`, guestPort, hostPort, isStatic)
150+
if i < len(portForwards)-1 {
151+
expr += ","
152+
}
153+
}
154+
expr += `]`
155+
return expr, nil
156+
}
157+
116158
// YQExpressions returns YQ expressions.
117159
func YQExpressions(flags *flag.FlagSet, newInstance bool) ([]string, error) {
118160
type def struct {
@@ -272,31 +314,13 @@ func YQExpressions(flags *flag.FlagSet, newInstance bool) ([]string, error) {
272314
{"vm-type", d(".vmType = %q"), true, false},
273315
{"plain", d(".plain = %s"), true, false},
274316
{
275-
"static-port-forward",
317+
"port-forward",
276318
func(_ *flag.Flag) (string, error) {
277-
ss, err := flags.GetStringSlice("static-port-forward")
319+
ss, err := flags.GetStringArray("port-forward")
278320
if err != nil {
279321
return "", err
280322
}
281-
if len(ss) == 0 {
282-
return "", nil
283-
}
284-
285-
expr := `.portForwards += [`
286-
for i, s := range ss {
287-
parts := strings.Split(s, ":")
288-
if len(parts) != 2 {
289-
return "", fmt.Errorf("invalid static port forward format %q, expected HOST:GUEST", s)
290-
}
291-
guestPort := strings.TrimSpace(parts[0])
292-
hostPort := strings.TrimSpace(parts[1])
293-
expr += fmt.Sprintf(`{"guestPort": %s, "hostPort": %s}`, guestPort, hostPort)
294-
if i < len(ss)-1 {
295-
expr += ","
296-
}
297-
}
298-
expr += `]`
299-
return expr, nil
323+
return BuildPortForwardExpression(ss)
300324
},
301325
false,
302326
false,

‎cmd/limactl/editflags/editflags_test.go‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,137 @@ func TestCompleteMemoryGiB(t *testing.T) {
2323
assert.DeepEqual(t, []float32{1, 2, 4}, completeMemoryGiB(8<<30))
2424
assert.DeepEqual(t, []float32{1, 2, 4, 8, 10}, completeMemoryGiB(20<<30))
2525
}
26+
27+
func TestBuildPortForwardExpression(t *testing.T) {
28+
tests := []struct {
29+
name string
30+
portForwards []string
31+
expected string
32+
expectError bool
33+
}{
34+
{
35+
name: "empty port forwards",
36+
portForwards: []string{},
37+
expected: "",
38+
},
39+
{
40+
name: "single dynamic port forward",
41+
portForwards: []string{"8080:80"},
42+
expected: `.portForwards += [{"guestPort": "80", "hostPort": "8080", "static": false}]`,
43+
},
44+
{
45+
name: "single static port forward",
46+
portForwards: []string{"8080:80,static=true"},
47+
expected: `.portForwards += [{"guestPort": "80", "hostPort": "8080", "static": true}]`,
48+
},
49+
{
50+
name: "multiple mixed port forwards",
51+
portForwards: []string{"8080:80", "2222:22,static=true", "3000:3000"},
52+
expected: `.portForwards += [{"guestPort": "80", "hostPort": "8080", "static": false},{"guestPort": "22", "hostPort": "2222", "static": true},{"guestPort": "3000", "hostPort": "3000", "static": false}]`,
53+
},
54+
{
55+
name: "invalid format - missing colon",
56+
portForwards: []string{"8080"},
57+
expectError: true,
58+
},
59+
{
60+
name: "invalid format - too many colons",
61+
portForwards: []string{"8080:80:extra"},
62+
expectError: true,
63+
},
64+
{
65+
name: "invalid static parameter",
66+
portForwards: []string{"8080:80,invalid=true"},
67+
expectError: true,
68+
},
69+
{
70+
name: "too many parameters",
71+
portForwards: []string{"8080:80,static=true,extra=value"},
72+
expectError: true,
73+
},
74+
{
75+
name: "whitespace handling",
76+
portForwards: []string{" 8080 : 80 , static=true "},
77+
expected: `.portForwards += [{"guestPort": "80", "hostPort": "8080", "static": true}]`,
78+
},
79+
}
80+
81+
for _, tt := range tests {
82+
t.Run(tt.name, func(t *testing.T) {
83+
result, err := BuildPortForwardExpression(tt.portForwards)
84+
if tt.expectError {
85+
assert.Check(t, err != nil)
86+
} else {
87+
assert.NilError(t, err)
88+
assert.Equal(t, tt.expected, result)
89+
}
90+
})
91+
}
92+
}
93+
94+
func TestParsePortForward(t *testing.T) {
95+
tests := []struct {
96+
name string
97+
spec string
98+
hostPort string
99+
guestPort string
100+
isStatic bool
101+
expectError bool
102+
}{
103+
{
104+
name: "dynamic port forward",
105+
spec: "8080:80",
106+
hostPort: "8080",
107+
guestPort: "80",
108+
isStatic: false,
109+
},
110+
{
111+
name: "static port forward",
112+
spec: "8080:80,static=true",
113+
hostPort: "8080",
114+
guestPort: "80",
115+
isStatic: true,
116+
},
117+
{
118+
name: "whitespace handling",
119+
spec: " 8080 : 80 , static=true ",
120+
hostPort: "8080",
121+
guestPort: "80",
122+
isStatic: true,
123+
},
124+
{
125+
name: "invalid format - missing colon",
126+
spec: "8080",
127+
expectError: true,
128+
},
129+
{
130+
name: "invalid format - too many colons",
131+
spec: "8080:80:extra",
132+
expectError: true,
133+
},
134+
{
135+
name: "invalid parameter",
136+
spec: "8080:80,invalid=true",
137+
expectError: true,
138+
},
139+
{
140+
name: "too many parameters",
141+
spec: "8080:80,static=true,extra=value",
142+
expectError: true,
143+
},
144+
}
145+
146+
for _, tt := range tests {
147+
t.Run(tt.name, func(t *testing.T) {
148+
hostPort, guestPort, isStatic, err := ParsePortForward(tt.spec)
149+
if tt.expectError {
150+
assert.Check(t, err != nil)
151+
} else {
152+
assert.NilError(t, err)
153+
assert.Equal(t, tt.hostPort, hostPort)
154+
assert.Equal(t, tt.guestPort, guestPort)
155+
assert.Equal(t, tt.isStatic, isStatic)
156+
}
157+
})
158+
}
159+
}

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

100644100755
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
set -euxo pipefail
33

44
INSTANCE=nonplain-static-port-forward
5-
TEMPLATE=hack/test-templates/nonplain-static-port-forward.yaml
5+
TEMPLATE=hack/test-templates/static-port-forward.yaml
66

77
limactl delete -f $INSTANCE || true
88

99
limactl start --name=$INSTANCE --tty=false $TEMPLATE
1010

1111
limactl shell $INSTANCE -- bash -c 'until [ -e /run/nginx.pid ]; do sleep 1; done'
1212

13-
curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'nginx port forwarding works!'
13+
limactl shell $INSTANCE -- bash -c 'until systemctl is-active --quiet test-server-9080; do sleep 1; done'
14+
limactl shell $INSTANCE -- bash -c 'until systemctl is-active --quiet test-server-9070; do sleep 1; done'
1415

15-
limactl delete -f $INSTANCE
16+
curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'Static port forwarding (9090) works in normal mode!'
17+
18+
curl -sSf http://127.0.0.1:9080 | grep -i 'Dynamic port 9080' && echo 'Dynamic port forwarding (9080) works in normal mode!'
19+
curl -sSf http://127.0.0.1:9070 | grep -i 'Dynamic port 9070' && echo 'Dynamic port forwarding (9070) works in normal mode!'
20+
21+
limactl delete -f $INSTANCE
22+
echo "All tests passed for normal mode - both static and dynamic ports work!"
23+
# EOF

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,30 @@
22
set -euxo pipefail
33

44
INSTANCE=plain-static-port-forward
5-
TEMPLATE=hack/test-templates/plain-static-port-forward.yaml
5+
TEMPLATE=hack/test-templates/static-port-forward.yaml
66

77
limactl delete -f $INSTANCE || true
88

9-
limactl start --name=$INSTANCE --tty=false $TEMPLATE
9+
limactl start --name=$INSTANCE --plain=true --tty=false $TEMPLATE
1010

1111
limactl shell $INSTANCE -- bash -c 'until [ -e /run/nginx.pid ]; do sleep 1; done'
1212

13-
curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'nginx port forwarding works!'
13+
curl -sSf http://127.0.0.1:9090 | grep -i 'nginx' && echo 'Static port forwarding (9090) works in plain mode!'
1414

15-
if curl -sSf http://127.0.0.1:9080; then
16-
echo 'ERROR: Port 9080 should not be forwarded in plain mode!'
17-
exit 1
15+
if curl -sSf http://127.0.0.1:9080 2>/dev/null; then
16+
echo 'ERROR: Dynamic port 9080 should not be forwarded in plain mode!'
17+
exit 1
1818
else
19-
echo 'Port 9080 is correctly NOT forwarded in plain mode.'
19+
echo 'Dynamic port 9080 is correctly NOT forwarded in plain mode.'
2020
fi
2121

22-
limactl delete -f $INSTANCE
22+
if curl -sSf http://127.0.0.1:9070 2>/dev/null; then
23+
echo 'ERROR: Dynamic port 9070 should not be forwarded in plain mode!'
24+
exit 1
25+
else
26+
echo 'Dynamic port 9070 is correctly NOT forwarded in plain mode.'
27+
fi
28+
29+
limactl delete -f $INSTANCE
30+
echo "All tests passed for plain mode - only static ports work!"
31+
# EOF

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)