Skip to content

Commit cda2724

Browse files
committed
chore(imports): reorganize imports in multiple files and update golangci configuration to include local prefixes for goimports
1 parent 01b0633 commit cda2724

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ linters:
4444
generated: disable
4545
formatters:
4646
enable:
47-
- gci
4847
- gofmt
4948
- gofumpt
5049
- goimports
@@ -59,3 +58,6 @@ formatters:
5958
shorten-comments: true
6059
reformat-tags: true
6160
chain-split-dots: true
61+
goimports:
62+
local-prefixes:
63+
- git.maronato.dev/maronato/finger

cmd/cmd.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import (
88
"os/signal"
99
"syscall"
1010

11-
"git.maronato.dev/maronato/finger/internal/config"
1211
"github.com/peterbourgon/ff/v4"
1312
"github.com/peterbourgon/ff/v4/ffhelp"
13+
14+
"git.maronato.dev/maronato/finger/internal/config"
1415
)
1516

1617
func Run(version string) error {

cmd/healthcheck.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import (
77
"net/url"
88
"time"
99

10-
"git.maronato.dev/maronato/finger/internal/config"
1110
"github.com/peterbourgon/ff/v4"
11+
12+
"git.maronato.dev/maronato/finger/internal/config"
1213
)
1314

1415
func newHealthcheckCmd(cfg *config.Config) *ff.Command {

cmd/serve.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"fmt"
66
"os"
77

8+
"github.com/peterbourgon/ff/v4"
9+
810
"git.maronato.dev/maronato/finger/internal/config"
911
"git.maronato.dev/maronato/finger/internal/fingerreader"
1012
"git.maronato.dev/maronato/finger/internal/log"
1113
"git.maronato.dev/maronato/finger/internal/server"
12-
"github.com/peterbourgon/ff/v4"
1314
)
1415

1516
const appName = "finger"

internal/fingerreader/fingerreader.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import (
77
"net/url"
88
"os"
99

10+
"go.yaml.in/yaml/v3"
11+
1012
"git.maronato.dev/maronato/finger/internal/config"
1113
"git.maronato.dev/maronato/finger/internal/log"
1214
"git.maronato.dev/maronato/finger/webfingers"
13-
"go.yaml.in/yaml/v3"
1415
)
1516

1617
type FingerReader struct {

internal/server/server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import (
88
"net/http"
99
"time"
1010

11+
"golang.org/x/sync/errgroup"
12+
1113
"git.maronato.dev/maronato/finger/handler"
1214
"git.maronato.dev/maronato/finger/internal/config"
1315
"git.maronato.dev/maronato/finger/internal/log"
1416
"git.maronato.dev/maronato/finger/internal/middleware"
1517
"git.maronato.dev/maronato/finger/webfingers"
16-
"golang.org/x/sync/errgroup"
1718
)
1819

1920
const (

0 commit comments

Comments
 (0)