Merge pull request #13658 from markylaing/4.0-gofmt

*: Runs `gofmt -w -s ./`.
canonical · Jun 24, 2024 · c2ce882 · c2ce882
2 parents 0194439 + 3631eb6
commit c2ce882
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/client/lxd_events.go b/client/lxd_events.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gorilla/websocket"
 	"github.com/canonical/lxd/shared"
 	"github.com/canonical/lxd/shared/api"
+	"github.com/gorilla/websocket"
 )
 
 // Event handling functions

diff --git a/lxd-agent/devlxd.go b/lxd-agent/devlxd.go
@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gorilla/mux"
 	"github.com/canonical/lxd/lxd/daemon"
 	"github.com/canonical/lxd/lxd/util"
 	"github.com/canonical/lxd/shared"
 	"github.com/canonical/lxd/shared/logger"
 	"github.com/canonical/lxd/shared/version"
+	"github.com/gorilla/mux"
 )
 
 // DevLxdServer creates an http.Server capable of handling requests against the

diff --git a/lxd/api.go b/lxd/api.go
@@ -7,14 +7,14 @@ import (
 
 	log "gopkg.in/inconshreveable/log15.v2"
 
-	"github.com/gorilla/mux"
 	"github.com/canonical/lxd/lxd/cluster"
 	"github.com/canonical/lxd/lxd/cluster/request"
 	"github.com/canonical/lxd/lxd/db"
 	"github.com/canonical/lxd/lxd/project"
 	lxdRequest "github.com/canonical/lxd/lxd/request"
 	"github.com/canonical/lxd/lxd/response"
 	"github.com/canonical/lxd/shared/logger"
+	"github.com/gorilla/mux"
 )
 
 // swagger:operation GET / server api_get

diff --git a/lxd/cluster/migrate.go b/lxd/cluster/migrate.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/canonical/lxd/lxd/cluster/raft"
 	"github.com/canonical/lxd/shared"
+	"github.com/hashicorp/go-msgpack/codec"
 	bolt "go.etcd.io/bbolt"
 )
 

diff --git a/lxd/events/devlxdEvents.go b/lxd/events/devlxdEvents.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/gorilla/websocket"
 	"github.com/canonical/lxd/shared"
 	"github.com/canonical/lxd/shared/api"
+	"github.com/gorilla/websocket"
 )
 
 // DevLXDServer represents an instance of an devlxd event server.

diff --git a/lxd/events/events.go b/lxd/events/events.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/gorilla/websocket"
 	"github.com/canonical/lxd/shared"
 	"github.com/canonical/lxd/shared/api"
 	"github.com/canonical/lxd/shared/logger"
+	"github.com/gorilla/websocket"
 )
 
 // EventSource indicates the source of an event.

diff --git a/lxd/instance_delete.go b/lxd/instance_delete.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gorilla/mux"
 	"github.com/canonical/lxd/lxd/db"
 	"github.com/canonical/lxd/lxd/instance"
 	"github.com/canonical/lxd/lxd/instance/instancetype"
 	"github.com/canonical/lxd/lxd/operations"
 	"github.com/canonical/lxd/lxd/response"
+	"github.com/gorilla/mux"
 )
 
 // swagger:operation DELETE /1.0/instances/{name} instances instance_delete

diff --git a/lxd/instance_get.go b/lxd/instance_get.go
@@ -3,9 +3,9 @@ package main
 import (
 	"net/http"
 
-	"github.com/gorilla/mux"
 	"github.com/canonical/lxd/lxd/instance"
 	"github.com/canonical/lxd/lxd/response"
+	"github.com/gorilla/mux"
 )
 
 // swagger:operation GET /1.0/instances/{name} instances instance_get

diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go
@@ -11,8 +11,6 @@ import (
 
 	log "gopkg.in/inconshreveable/log15.v2"
 
-	"github.com/gorilla/mux"
-	"github.com/gorilla/websocket"
 	"github.com/canonical/lxd/lxd/db"
 	"github.com/canonical/lxd/lxd/instance"
 	"github.com/canonical/lxd/lxd/operations"
@@ -26,6 +24,8 @@ import (
 	"github.com/canonical/lxd/shared/api"
 	"github.com/canonical/lxd/shared/logger"
 	"github.com/canonical/lxd/shared/version"
+	"github.com/gorilla/mux"
+	"github.com/gorilla/websocket"
 )
 
 var storagePoolVolumesCmd = APIEndpoint{