Skip to content

incusd: Remove old routing logic #1947

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 1 commit into from
Apr 17, 2025
Merged

incusd: Remove old routing logic #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 6 deletions cmd/incusd/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,11 +1036,6 @@ func imagesPost(d *Daemon, r *http.Request) response.Response {
}
}

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

// create a directory under which we keep everything while building
builddir, err := os.MkdirTemp(internalUtil.VarPath("images"), "incus_build_")
if err != nil {
Expand Down Expand Up @@ -1131,7 +1126,7 @@ func imagesPost(d *Daemon, r *http.Request) response.Response {
}

r.Body = post
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
cleanup(builddir, post)
return response.SmartError(err)
Expand Down
4 changes: 2 additions & 2 deletions cmd/incusd/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,11 +526,11 @@ func instanceCreateAsCopy(s *state.State, opts instanceCreateAsCopyOpts, op *ope
}

// Load all instances of this nodes under the given project.
func instanceLoadNodeProjectAll(ctx context.Context, s *state.State, project string, instanceType instancetype.Type) ([]instance.Instance, error) {
func instanceLoadNodeProjectAll(ctx context.Context, s *state.State, projectName string) ([]instance.Instance, error) {
var err error
var instances []instance.Instance

filter := dbCluster.InstanceFilter{Type: instanceType.Filter(), Project: &project}
filter := dbCluster.InstanceFilter{Project: &projectName}
if s.ServerName != "" {
filter.Node = &s.ServerName
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ import (
func instanceAccess(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -73,7 +68,7 @@ func instanceAccess(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
42 changes: 6 additions & 36 deletions cmd/incusd/instance_backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ import (
func instanceBackupsGet(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
cname, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -138,7 +133,7 @@ func instanceBackupsGet(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, cname, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, cname)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -215,11 +210,6 @@ func instanceBackupsGet(d *Daemon, r *http.Request) response.Response {
func instanceBackupsPost(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -239,7 +229,7 @@ func instanceBackupsPost(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node.
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -393,11 +383,6 @@ func instanceBackupsPost(d *Daemon, r *http.Request) response.Response {
func instanceBackupGet(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -414,7 +399,7 @@ func instanceBackupGet(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -467,11 +452,6 @@ func instanceBackupGet(d *Daemon, r *http.Request) response.Response {
func instanceBackupPost(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -488,7 +468,7 @@ func instanceBackupPost(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -566,11 +546,6 @@ func instanceBackupPost(d *Daemon, r *http.Request) response.Response {
func instanceBackupDelete(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -587,7 +562,7 @@ func instanceBackupDelete(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -648,11 +623,6 @@ func instanceBackupDelete(d *Daemon, r *http.Request) response.Response {
func instanceBackupExportGet(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -669,7 +639,7 @@ func instanceBackupExportGet(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
14 changes: 2 additions & 12 deletions cmd/incusd/instance_console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,6 @@ func (s *consoleWs) Cancel(op *operations.Operation) error {
func instanceConsolePost(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -472,7 +467,7 @@ func instanceConsolePost(d *Daemon, r *http.Request) response.Response {
}

// Forward the request if the container is remote.
client, err := cluster.ConnectIfInstanceIsRemote(s, projectName, name, r, instanceType)
client, err := cluster.ConnectIfInstanceIsRemote(s, projectName, name, r)
if err != nil {
return response.SmartError(err)
}
Expand Down Expand Up @@ -631,11 +626,6 @@ func instanceConsolePost(d *Daemon, r *http.Request) response.Response {
func instanceConsoleLogGet(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -652,7 +642,7 @@ func instanceConsoleLogGet(d *Daemon, r *http.Request) response.Response {
}

// Forward the request if the container is remote.
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ func instanceDebugMemoryGet(d *Daemon, r *http.Request) response.Response {

format := request.QueryParam(r, "format")

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -72,7 +67,7 @@ func instanceDebugMemoryGet(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ func instanceDelete(d *Daemon, r *http.Request) response.Response {

s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -65,7 +60,7 @@ func instanceDelete(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,6 @@ func (s *execWs) Do(op *operations.Operation) error {
func instanceExecPost(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand Down Expand Up @@ -584,7 +579,7 @@ func instanceExecPost(d *Daemon, r *http.Request) response.Response {
}

// Forward the request if the container is remote.
client, err := cluster.ConnectIfInstanceIsRemote(s, projectName, name, r, instanceType)
client, err := cluster.ConnectIfInstanceIsRemote(s, projectName, name, r)
if err != nil {
return response.SmartError(err)
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,7 @@ func instanceFileHandler(d *Daemon, r *http.Request) response.Response {
}

// Redirect to correct server if needed.
instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
7 changes: 1 addition & 6 deletions cmd/incusd/instance_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,6 @@ import (
func instanceGet(d *Daemon, r *http.Request) response.Response {
s := d.State()

instanceType, err := urlInstanceTypeDetect(r)
if err != nil {
return response.SmartError(err)
}

projectName := request.ProjectParam(r)
name, err := url.PathUnescape(mux.Vars(r)["name"])
if err != nil {
Expand All @@ -125,7 +120,7 @@ func instanceGet(d *Daemon, r *http.Request) response.Response {
}

// Handle requests targeted to a container on a different node
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name, instanceType)
resp, err := forwardedResponseIfInstanceIsRemote(s, r, projectName, name)
if err != nil {
return response.SmartError(err)
}
Expand Down
Loading