Skip to content

Commit

Permalink
Merge pull request #13658 from markylaing/4.0-gofmt
Browse files Browse the repository at this point in the history
*: Runs `gofmt -w -s ./`.
  • Loading branch information
tomponline authored Jun 24, 2024
2 parents 0194439 + 3631eb6 commit c2ce882
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion client/lxd_events.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lxd-agent/devlxd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lxd/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lxd/cluster/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion lxd/events/devlxdEvents.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lxd/events/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lxd/instance_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lxd/instance_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lxd/storage_volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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{
Expand Down

0 comments on commit c2ce882

Please sign in to comment.