diff options
| author | Jacob Gadikian <[email protected]> | 2023-08-14 23:41:15 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-14 09:41:15 -0600 |
| commit | d6f86cccf5fa5b4eb30141da390cf2439746c5da (patch) | |
| tree | cd8ad7aa2175259534b572d3a1b6c4852ef11343 /cmd | |
| parent | 2d7d806fcf91402eb15ae3ffd916bf0b2c6508df (diff) | |
| download | caddy-d6f86cccf5fa5b4eb30141da390cf2439746c5da.tar.gz caddy-d6f86cccf5fa5b4eb30141da390cf2439746c5da.zip | |
ci: use gci linter (#5708)
* use gofmput to format code
* use gci to format imports
* reconfigure gci
* linter autofixes
* rearrange imports a little
* export GOOS=windows golangci-lint run ./... --fix
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commandfuncs.go | 3 | ||||
| -rw-r--r-- | cmd/commands.go | 3 | ||||
| -rw-r--r-- | cmd/main.go | 5 | ||||
| -rw-r--r-- | cmd/packagesfuncs.go | 3 | ||||
| -rw-r--r-- | cmd/storagefuncs.go | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index f997f069e..f284b89b9 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -33,11 +33,12 @@ import ( "strings" "github.com/aryann/difflib" + "go.uber.org/zap" + "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/internal" - "go.uber.org/zap" ) func cmdStart(fl Flags) (int, error) { diff --git a/cmd/commands.go b/cmd/commands.go index 3bf47df4e..0885577ea 100644 --- a/cmd/commands.go +++ b/cmd/commands.go @@ -21,9 +21,10 @@ import ( "regexp" "strings" - "github.com/caddyserver/caddy/v2" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" + + "github.com/caddyserver/caddy/v2" ) // Command represents a subcommand. Name, Func, diff --git a/cmd/main.go b/cmd/main.go index 53b8d6752..1d6478a47 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -30,11 +30,12 @@ import ( "strings" "time" - "github.com/caddyserver/caddy/v2" - "github.com/caddyserver/caddy/v2/caddyconfig" "github.com/caddyserver/certmagic" "github.com/spf13/pflag" "go.uber.org/zap" + + "github.com/caddyserver/caddy/v2" + "github.com/caddyserver/caddy/v2/caddyconfig" ) func init() { diff --git a/cmd/packagesfuncs.go b/cmd/packagesfuncs.go index 3aed0e8c8..5d77e4d54 100644 --- a/cmd/packagesfuncs.go +++ b/cmd/packagesfuncs.go @@ -27,8 +27,9 @@ import ( "runtime/debug" "strings" - "github.com/caddyserver/caddy/v2" "go.uber.org/zap" + + "github.com/caddyserver/caddy/v2" ) func cmdUpgrade(fl Flags) (int, error) { diff --git a/cmd/storagefuncs.go b/cmd/storagefuncs.go index a9f1bcac8..6a6daec76 100644 --- a/cmd/storagefuncs.go +++ b/cmd/storagefuncs.go @@ -23,8 +23,9 @@ import ( "io" "os" - "github.com/caddyserver/caddy/v2" "github.com/caddyserver/certmagic" + + "github.com/caddyserver/caddy/v2" ) type storVal struct { |