Fix import order

All Go files should have exactly three import groups: - stdlib - 3rd-party / non-project imports - project imports (from inside canonical/pebble)
canonical · Jul 5, 2023 · a4b9c88 · a4b9c88
1 parent 8e96c74
commit a4b9c88
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 28 deletions.
diff --git a/internals/cli/cli.go b/internals/cli/cli.go
@@ -26,7 +26,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/canonical/go-flags"
-
 	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/canonical/pebble/client"

diff --git a/internals/cli/cli_test.go b/internals/cli/cli_test.go
@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"golang.org/x/crypto/ssh/terminal"
-
 	. "gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/cmd"

diff --git a/internals/cli/format_test.go b/internals/cli/format_test.go
@@ -18,9 +18,6 @@ import (
 	"os"
 	"runtime"
 
-	// "fmt"
-	// "net/http"
-
 	"gopkg.in/check.v1"
 
 	"github.com/canonical/pebble/internals/cli"

diff --git a/internals/daemon/api_changes_test.go b/internals/daemon/api_changes_test.go
@@ -23,9 +23,9 @@ import (
 	"net/http/httptest"
 	"time"
 
-	"github.com/canonical/pebble/internals/overlord/state"
-
 	"gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func setupChanges(st *state.State) []string {

diff --git a/internals/daemon/api_files_test.go b/internals/daemon/api_files_test.go
@@ -32,9 +32,10 @@ import (
 	"syscall"
 	"time"
 
+	. "gopkg.in/check.v1"
+
 	"github.com/canonical/pebble/internals/osutil"
 	"github.com/canonical/pebble/internals/osutil/sys"
-	. "gopkg.in/check.v1"
 )
 
 var _ = Suite(&filesSuite{})

diff --git a/internals/daemon/api_services_test.go b/internals/daemon/api_services_test.go
@@ -25,9 +25,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/pebble/internals/overlord/state"
-
 	. "gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 var servicesLayer = `

diff --git a/internals/daemon/api_warnings_test.go b/internals/daemon/api_warnings_test.go
@@ -21,9 +21,9 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/canonical/pebble/internals/overlord/state"
-
 	"gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 func (s *apiSuite) testWarnings(c *check.C, all bool, body io.Reader) (calls string, result interface{}) {

diff --git a/internals/daemon/daemon.go b/internals/daemon/daemon.go
@@ -31,9 +31,8 @@ import (
 	"syscall"
 	"time"
 
-	"gopkg.in/tomb.v2"
-
 	"github.com/gorilla/mux"
+	"gopkg.in/tomb.v2"
 
 	"github.com/canonical/pebble/internals/logger"
 	"github.com/canonical/pebble/internals/osutil"

diff --git a/internals/daemon/daemon_test.go b/internals/daemon/daemon_test.go
@@ -30,9 +30,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-
 	"gopkg.in/check.v1"
-
 	// XXX Delete import above and make this file like the other ones.
 	. "gopkg.in/check.v1"
 

diff --git a/internals/osutil/bootid_test.go b/internals/osutil/bootid_test.go
@@ -20,9 +20,9 @@
 package osutil_test
 
 import (
-	"github.com/canonical/pebble/internals/osutil"
-
 	. "gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type bootIdSuite struct{}

diff --git a/internals/osutil/env_test.go b/internals/osutil/env_test.go
@@ -15,8 +15,9 @@
 package osutil_test
 
 import (
-	"github.com/canonical/pebble/internals/osutil"
 	. "gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/osutil"
 )
 
 type envSuite struct{}

diff --git a/internals/overlord/patch/patch_test.go b/internals/overlord/patch/patch_test.go
@@ -24,10 +24,10 @@ import (
 	"sort"
 	"testing"
 
+	. "gopkg.in/check.v1"
+
 	"github.com/canonical/pebble/internals/overlord/patch"
 	"github.com/canonical/pebble/internals/overlord/state"
-
-	. "gopkg.in/check.v1"
 )
 
 func Test(t *testing.T) { TestingT(t) }

diff --git a/internals/overlord/servstate/request.go b/internals/overlord/servstate/request.go
@@ -1,9 +1,9 @@
 package servstate
 
 import (
-	"github.com/canonical/pebble/internals/overlord/state"
-
 	"fmt"
+
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 // ServiceRequest holds the details required to perform service tasks.

diff --git a/internals/overlord/state/change_test.go b/internals/overlord/state/change_test.go
@@ -26,9 +26,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/pebble/internals/overlord/state"
-
 	. "gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/overlord/state"
 )
 
 type changeSuite struct{}

diff --git a/internals/servicelog/ringbuffer_test.go b/internals/servicelog/ringbuffer_test.go
@@ -20,8 +20,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/canonical/pebble/internals/servicelog"
 	. "gopkg.in/check.v1"
+
+	"github.com/canonical/pebble/internals/servicelog"
 )
 
 type ringBufferSuite struct{}

diff --git a/internals/systemd/systemd_test.go b/internals/systemd/systemd_test.go
@@ -34,9 +34,8 @@ import (
 
 	"github.com/canonical/pebble/internals/osutil"
 	"github.com/canonical/pebble/internals/osutil/squashfs"
-	"github.com/canonical/pebble/internals/testutil"
-
 	"github.com/canonical/pebble/internals/systemd"
+	"github.com/canonical/pebble/internals/testutil"
 )
 
 type testreporter struct {