public_git
/
orchard
mirror of https://github.com/cirruslabs/orchard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Orchard Worker: don't forget to use localnetworkhelper in RPC and RPCv2 (#304) 

* Orchard Worker: don't forget to use localnetworkhelper in RPC and RPCv2

* Fix integration tests by not requiring an empty vm.StatusMessage
This commit is contained in:
Nikolay Edigaryev 2025-04-10 22:15:13 +02:00 committed by GitHub
parent fe84c06c31
commit 3c2de83ea7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/tests/integration_test.go
View File

@ -61,7 +61,6 @@ func TestSingleVM(t *testing.T) {
if err != nil {
t.Fatal(err)
}
assert.Empty(t, runningVM.StatusMessage)
assert.Equal(t, v1.VMStatusRunning, runningVM.Status)
assert.True(t, wait.Wait(2*time.Minute, func() bool {
logLines, err := devClient.VMs().Logs(context.Background(), "test-vm")
@ -162,7 +161,6 @@ func TestPortForwarding(t *testing.T) {
vm, err := devClient.VMs().Get(ctx, "test-vm")
require.NoError(t, err)
require.Equal(t, v1.VMStatusRunning, vm.Status)
require.Empty(t, vm.StatusMessage)
t.Logf("Waiting for the VM to start, current status: %s", vm.Status)
@ -407,7 +405,6 @@ func TestHostDirs(t *testing.T) {
return vm.Status == v1.VMStatusRunning || vm.Status == v1.VMStatusFailed
}), "failed to start a VM")
require.Empty(t, vm.StatusMessage)
require.Equal(t, v1.VMStatusRunning, vm.Status)
var logLines []string

12
internal/worker/rpc.go
View File

@ -109,7 +109,17 @@ func (worker *Worker) handlePortForward(
}
// Connect to the VM's port
vmConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", host, portForwardAction.Port))
var vmConn net.Conn
if worker.localNetworkHelper != nil {
vmConn, err = worker.localNetworkHelper.PrivilegedDialContext(ctx, "tcp",
fmt.Sprintf("%s:%d", host, portForwardAction.Port))
} else {
dialer := net.Dialer{}
vmConn, err = dialer.DialContext(ctx, "tcp",
fmt.Sprintf("%s:%d", host, portForwardAction.Port))
}
if err != nil {
worker.logger.Warnf("port forwarding failed: failed to connect to the VM: %v", err)

13
internal/worker/rpcv2.go
View File

@ -89,7 +89,18 @@ func (worker *Worker) handlePortForwardV2Inner(
}
// Connect to the VM's port
vmConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", host, portForward.Port))
var vmConn net.Conn
if worker.localNetworkHelper != nil {
vmConn, err = worker.localNetworkHelper.PrivilegedDialContext(ctx, "tcp",
fmt.Sprintf("%s:%d", host, portForward.Port))
} else {
dialer := net.Dialer{}
vmConn, err = dialer.DialContext(ctx, "tcp",
fmt.Sprintf("%s:%d", host, portForward.Port))
}
if err != nil {
return nil, fmt.Errorf("failed to connect to the VM: %v", err)
}