Used goimports to fix import order (#2682)

Keeps the list sorted and prevents future merge conflicts.

caddy/caddymain/run.go

@@ -29,12 +29,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/uuid"
-	"github.com/klauspost/cpuid"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/caddyfile"
 	"github.com/caddyserver/caddy/caddytls"
 	"github.com/caddyserver/caddy/telemetry"
+	"github.com/google/uuid"
+	"github.com/klauspost/cpuid"
 	"github.com/mholt/certmagic"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 

caddyhttp/basicauth/basicauth.go

@@ -33,8 +33,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/jimstudt/http-authentication/basic"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/jimstudt/http-authentication/basic"
 )
 
 // BasicAuth is middleware to protect resources with a username and password.

caddyhttp/browse/browse.go

@@ -29,9 +29,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/dustin/go-humanize"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/caddyserver/caddy/caddyhttp/staticfiles"
+	"github.com/dustin/go-humanize"
 )
 
 const (

caddyhttp/httpserver/logger.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync"
 
-	gsyslog "github.com/hashicorp/go-syslog"
 	"github.com/caddyserver/caddy"
+	gsyslog "github.com/hashicorp/go-syslog"
 )
 
 var remoteSyslogPrefixes = map[string]string{

caddyhttp/httpserver/server.go

@@ -31,11 +31,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lucas-clemente/quic-go/h2quic"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/caddyhttp/staticfiles"
 	"github.com/caddyserver/caddy/caddytls"
 	"github.com/caddyserver/caddy/telemetry"
+	"github.com/lucas-clemente/quic-go/h2quic"
 )
 
 // Server is the HTTP server implementation.

caddyhttp/proxy/reverseproxy.go

@@ -41,9 +41,9 @@ import (
 
 	"golang.org/x/net/http2"
 
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/lucas-clemente/quic-go"
 	"github.com/lucas-clemente/quic-go/h2quic"
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 )
 
 var (

caddyhttp/requestid/requestid.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/google/uuid"
 )
 
 // Handler is a middleware handler

caddyhttp/websocket/websocket.go

@@ -29,8 +29,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gorilla/websocket"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/gorilla/websocket"
 )
 
 const (

caddytls/config.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/go-acme/lego/challenge/tlsalpn01"
 
+	"github.com/caddyserver/caddy"
 	"github.com/go-acme/lego/certcrypto"
 	"github.com/klauspost/cpuid"
-	"github.com/caddyserver/caddy"
 	"github.com/mholt/certmagic"
 )
 

caddytls/setup_test.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/go-acme/lego/certcrypto"
 	"github.com/caddyserver/caddy"
+	"github.com/go-acme/lego/certcrypto"
 	"github.com/mholt/certmagic"
 )
 

caddytls/tls.go

@@ -29,8 +29,8 @@
 package caddytls
 
 import (
-	"github.com/go-acme/lego/challenge"
 	"github.com/caddyserver/caddy"
+	"github.com/go-acme/lego/challenge"
 	"github.com/mholt/certmagic"
 )
 

onevent/hook/hook_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy"
+	"github.com/google/uuid"
 )
 
 func TestHook(t *testing.T) {

onevent/on.go

@@ -3,9 +3,9 @@ package onevent
 import (
 	"strings"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/onevent/hook"
+	"github.com/google/uuid"
 )
 
 func init() {