Skip to content

[STORY-1663] Fix retrocompat for network#connect, use api_hostname if defined, otherwise fallback on hostname for old data #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

[STORY-1663] Fix retrocompat for network#connect, use api_hostname if defined, otherwise fallback on hostname for old data #304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa63d71
[STORY-1663] Fix retrocompat for network#connect, use api_hostname if…
leo-scalingo Jul 15, 2025
ee6ff50
Update api/types/endpoint.go
leo-scalingo Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions api/types/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ type Endpoint struct {
Active bool `json:"active"`
}

func (e Endpoint) GetAPIHostname() string {
if e.APIHostname != "" {
return e.APIHostname
}
return e.Hostname
}

func (e Endpoint) String() string {
return fmt.Sprintf("Endpoint[%s|%s|Network(%s)|Active(%v)]", e.ID, e.TargetNetnsPath, e.NetworkID, e.Active)
}
Expand Down
10 changes: 6 additions & 4 deletions web/networks_controller_connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ func (c NetworksController) Connect(w http.ResponseWriter, r *http.Request, urlp

if len(activeEndpoints) == 0 {
w.WriteHeader(400)
json.NewEncoder(w).Encode(map[string]string{"error": "no active endpoint in network " + network.ID})
jsonerr := json.NewEncoder(w).Encode(map[string]string{"error": "no active endpoint in network " + network.ID})
if jsonerr != nil {
log.WithError(jsonerr).Error("Fail to encode error response")
}
return nil
}

log.Infof("Hijacking http connection and forward to %v", localEndpoint.Hostname)
h, ok := w.(http.Hijacker)
if !ok {
return errors.New("invalid response writer")
Expand Down Expand Up @@ -116,11 +118,11 @@ func (c NetworksController) Connect(w http.ResponseWriter, r *http.Request, urlp
}
options = append(options, sand.WithTlsConfig(config))
}
url := fmt.Sprintf("%s://%s:%d", scheme, endpoint.APIHostname, c.Config.HTTPPort)
url := fmt.Sprintf("%s://%s:%d", scheme, endpoint.GetAPIHostname(), c.Config.HTTPPort)
options = append(options, sand.WithURL(url))
client := sand.NewClient(options...)

log.Infof("forwarding connection to %v", url)
log.Infof("Forwarding connection to %v", url)
dstConn, err := client.NetworkConnect(ctx, network.ID, params.NetworkConnect{IP: ip, Port: port})
if err != nil {
socket.Close()
Expand Down