synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-03-15 10:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fix(agent/agentcontainers): return host port instead of container port

Browse Source
This commit is contained in:
Cian Johnston
2025-03-10 16:05:47 +00:00
parent f52142f6e6
commit 077d5a9849
2 changed files with 8 additions and 32 deletions

7
agent/agentcontainers/containers_dockercli.go

@ -400,12 +400,13 @@ func convertDockerInspect(in dockerInspect) (codersdk.WorkspaceAgentDevcontainer
// Track host ports to avoid duplicates (same port on multiple interfaces)
seenHostPorts := make(map[string]bool)
// Get all port mappings
// Get port mappings in sorted order for deterministic output
portKeys := maps.Keys(in.NetworkSettings.Ports)
// Sort the ports for deterministic output
sort.Strings(portKeys)
for containerPortSpec, bindings := range in.NetworkSettings.Ports {
for _, containerPortSpec := range portKeys {
bindings := in.NetworkSettings.Ports[containerPortSpec]
// Skip if no bindings exist (don't expose the container port)
if len(bindings) == 0 {
continue

33
agent/agentcontainers/containers_internal_test.go

@ -4,7 +4,6 @@ import (
"fmt"
"os"
"slices"
"sort"
"strconv"
"strings"
"testing"
@ -12,6 +11,7 @@ import (
"go.uber.org/mock/gomock"
"github.com/google/go-cmp/cmp"
"github.com/google/uuid"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
@ -307,7 +307,6 @@ func TestContainersHandler(t *testing.T) {
})
}
// TestDockerPortBinding tests the port binding handling in convertDockerInspect
func TestDockerPortBinding(t *testing.T) {
t.Parallel()
@ -421,7 +420,6 @@ func TestDockerPortBinding(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
// Create a sample docker inspection result
dockerData := dockerInspect{
ID: "test-container",
Created: time.Now(),
@ -436,34 +434,11 @@ func TestDockerPortBinding(t *testing.T) {
},
}
// Process the docker data
container, warns := convertDockerInspect(dockerData)
// Verify the ports
assert.Len(t, container.Ports, len(tc.expectedPorts), "wrong number of ports")
assert.Len(t, warns, tc.expectedWarns, "wrong number of warnings")
// Sort ports for consistent comparison (order may vary)
sort.Slice(container.Ports, func(i, j int) bool {
if container.Ports[i].Network == container.Ports[j].Network {
return container.Ports[i].Port < container.Ports[j].Port
}
return container.Ports[i].Network < container.Ports[j].Network
})
sort.Slice(tc.expectedPorts, func(i, j int) bool {
if tc.expectedPorts[i].Network == tc.expectedPorts[j].Network {
return tc.expectedPorts[i].Port < tc.expectedPorts[j].Port
}
return tc.expectedPorts[i].Network < tc.expectedPorts[j].Network
})
// Compare ports
for i, expected := range tc.expectedPorts {
if i < len(container.Ports) {
assert.Equal(t, expected.Network, container.Ports[i].Network, "network mismatch")
assert.Equal(t, expected.Port, container.Ports[i].Port, "port mismatch")
}
if diff := cmp.Diff(tc.expectedPorts, container.Ports); diff != "" {
assert.Failf(t, "port mismatch", "(-want +got):\n%s", diff)
}
assert.Len(t, warns, tc.expectedWarns, "wrong number of warnings")
})
}
}