From b9f6f3f9fbcd925e98a38f4b0c7986e934742dd2 Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Sun, 14 Jan 2024 18:22:06 +0100
Subject: [PATCH] Replace `goimports` with `gci` (#3202)

`gci` seems to be much more strict.
---
 .golangci.yaml                                         |  3 ++-
 agent/rpc/auth_client_grpc.go                          |  4 ++--
 cli/pipeline/create.go                                 |  3 +--
 cmd/server/main.go                                     |  1 -
 cmd/server/server.go                                   |  4 ++--
 pipeline/backend/kubernetes/kubernetes.go              | 10 ++++------
 pipeline/backend/kubernetes/pod_test.go                |  1 +
 pipeline/backend/kubernetes/service_test.go            |  1 +
 pipeline/backend/local/clone.go                        |  1 +
 pipeline/frontend/metadata/drone_compatibility_test.go |  1 +
 pipeline/frontend/yaml/compiler/convert_test.go        |  1 +
 pipeline/frontend/yaml/compiler/dag_test.go            |  1 +
 pipeline/frontend/yaml/matrix/matrix.go                |  4 ++--
 pipeline/frontend/yaml/types/base/base_types_test.go   |  3 +--
 pipeline/frontend/yaml/types/network_test.go           |  3 +--
 pipeline/frontend/yaml/types/volume_test.go            |  3 +--
 server/api/global_secret.go                            |  3 +--
 server/api/org.go                                      |  3 +--
 server/api/org_secret.go                               |  3 +--
 server/api/signature_public_key.go                     |  1 +
 server/badges/badges_test.go                           |  1 +
 server/cache/membership.go                             |  4 ++--
 server/forge/bitbucket/internal/client.go              |  4 ++--
 server/grpc/rpc_test.go                                |  3 ++-
 server/logging/log_test.go                             |  1 +
 server/pipeline/stepbuilder/stepBuilder.go             |  5 ++---
 server/pipeline/topic.go                               |  1 +
 server/plugins/encryption/aes_encryption.go            |  4 ++--
 server/plugins/permissions/repo_owners_test.go         |  1 +
 server/plugins/secrets/builtin_test.go                 |  1 +
 server/plugins/utils/http_test.go                      |  1 +
 server/queue/fifo.go                                   |  4 ++--
 server/queue/fifo_test.go                              |  1 +
 server/router/middleware/session/pagination.go         |  1 +
 server/router/middleware/session/repo.go               |  1 -
 server/router/middleware/session/user.go               |  6 +++---
 server/store/datastore/cron.go                         |  4 ++--
 server/store/datastore/engine.go                       |  5 ++---
 server/store/datastore/engine_test.go                  |  3 +--
 server/store/datastore/helper_test.go                  |  1 +
 server/store/datastore/log_test.go                     |  1 +
 server/store/datastore/migration/migration_test.go     |  7 +++----
 server/web/web_test.go                                 |  1 +
 43 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 693030583..f3e00a706 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -103,6 +103,7 @@ linters-settings:
           - pkg: 'go.woodpecker-ci.org/woodpecker/v2/cmd/cli'
           - pkg: 'go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker'
   gci:
+    custom-order: true
     sections:
       - standard
       - default
@@ -127,7 +128,6 @@ linters:
     - bidichk
     - errcheck
     - gofmt
-    - goimports
     - gosimple
     - govet
     - ineffassign
@@ -165,6 +165,7 @@ linters:
     - stylecheck
     - contextcheck
     - forcetypeassert
+    - gci
 
 run:
   timeout: 15m
diff --git a/agent/rpc/auth_client_grpc.go b/agent/rpc/auth_client_grpc.go
index 5f31e2803..1ef645d43 100644
--- a/agent/rpc/auth_client_grpc.go
+++ b/agent/rpc/auth_client_grpc.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"time"
 
-	"go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto"
-
 	"google.golang.org/grpc"
+
+	"go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto"
 )
 
 type AuthClient struct {
diff --git a/cli/pipeline/create.go b/cli/pipeline/create.go
index b268622eb..c64362bf8 100644
--- a/cli/pipeline/create.go
+++ b/cli/pipeline/create.go
@@ -19,12 +19,11 @@ import (
 	"strings"
 	"text/template"
 
-	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
-
 	"github.com/urfave/cli/v2"
 
 	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
 	"go.woodpecker-ci.org/woodpecker/v2/cli/internal"
+	"go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker"
 )
 
 var pipelineCreateCmd = &cli.Command{
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 0a87d39ef..da7f986b4 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -22,7 +22,6 @@ import (
 	"github.com/urfave/cli/v2"
 
 	_ "go.woodpecker-ci.org/woodpecker/v2/cmd/server/docs"
-
 	"go.woodpecker-ci.org/woodpecker/v2/version"
 )
 
diff --git a/cmd/server/server.go b/cmd/server/server.go
index 1bff29f2d..956176af0 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -42,6 +42,8 @@ import (
 	woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v2/server/grpc"
 	"go.woodpecker-ci.org/woodpecker/v2/server/logging"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	// "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption"
+	// encryptedStore "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption/wrapper/store"
 	"go.woodpecker-ci.org/woodpecker/v2/server/plugins/permissions"
 	"go.woodpecker-ci.org/woodpecker/v2/server/pubsub"
 	"go.woodpecker-ci.org/woodpecker/v2/server/router"
@@ -51,8 +53,6 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 	"go.woodpecker-ci.org/woodpecker/v2/shared/logger"
 	"go.woodpecker-ci.org/woodpecker/v2/version"
-	// "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption"
-	// encryptedStore "go.woodpecker-ci.org/woodpecker/v2/server/plugins/encryption/wrapper/store"
 )
 
 func run(c *cli.Context) error {
diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go
index 152147074..fc152504f 100644
--- a/pipeline/backend/kubernetes/kubernetes.go
+++ b/pipeline/backend/kubernetes/kubernetes.go
@@ -23,21 +23,19 @@ import (
 	"time"
 
 	"github.com/rs/zerolog/log"
-	"gopkg.in/yaml.v3"
-
-	"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
-
 	"github.com/urfave/cli/v2"
+	"gopkg.in/yaml.v3"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
+	// To authenticate to GCP K8s clusters
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 
-	// To authenticate to GCP K8s clusters
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
+	"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
 const (
diff --git a/pipeline/backend/kubernetes/pod_test.go b/pipeline/backend/kubernetes/pod_test.go
index e719a9f5c..08d1c40b4 100644
--- a/pipeline/backend/kubernetes/pod_test.go
+++ b/pipeline/backend/kubernetes/pod_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/kinbiko/jsonassert"
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
diff --git a/pipeline/backend/kubernetes/service_test.go b/pipeline/backend/kubernetes/service_test.go
index fb7431b7e..a176ad1dc 100644
--- a/pipeline/backend/kubernetes/service_test.go
+++ b/pipeline/backend/kubernetes/service_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
diff --git a/pipeline/backend/local/clone.go b/pipeline/backend/local/clone.go
index 8dd2bc816..795b12b20 100644
--- a/pipeline/backend/local/clone.go
+++ b/pipeline/backend/local/clone.go
@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/rs/zerolog/log"
+
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go
index ff7713526..292d45e67 100644
--- a/pipeline/frontend/metadata/drone_compatibility_test.go
+++ b/pipeline/frontend/metadata/drone_compatibility_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata"
 )
 
diff --git a/pipeline/frontend/yaml/compiler/convert_test.go b/pipeline/frontend/yaml/compiler/convert_test.go
index 3103f3588..39f01e20b 100644
--- a/pipeline/frontend/yaml/compiler/convert_test.go
+++ b/pipeline/frontend/yaml/compiler/convert_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
diff --git a/pipeline/frontend/yaml/compiler/dag_test.go b/pipeline/frontend/yaml/compiler/dag_test.go
index 2ab5cd729..51dd3b5a6 100644
--- a/pipeline/frontend/yaml/compiler/dag_test.go
+++ b/pipeline/frontend/yaml/compiler/dag_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 )
 
diff --git a/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go
index d9c6729ee..b89dfc5d9 100644
--- a/pipeline/frontend/yaml/matrix/matrix.go
+++ b/pipeline/frontend/yaml/matrix/matrix.go
@@ -17,9 +17,9 @@ package matrix
 import (
 	"strings"
 
-	"go.woodpecker-ci.org/woodpecker/v2/pipeline/errors"
-
 	"codeberg.org/6543/xyaml"
+
+	"go.woodpecker-ci.org/woodpecker/v2/pipeline/errors"
 )
 
 const (
diff --git a/pipeline/frontend/yaml/types/base/base_types_test.go b/pipeline/frontend/yaml/types/base/base_types_test.go
index 428b44f06..676be9faf 100644
--- a/pipeline/frontend/yaml/types/base/base_types_test.go
+++ b/pipeline/frontend/yaml/types/base/base_types_test.go
@@ -18,9 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v3"
 )
 
 type StructStringorInt struct {
diff --git a/pipeline/frontend/yaml/types/network_test.go b/pipeline/frontend/yaml/types/network_test.go
index bdb09bf9e..2eb95ccda 100644
--- a/pipeline/frontend/yaml/types/network_test.go
+++ b/pipeline/frontend/yaml/types/network_test.go
@@ -17,9 +17,8 @@ package types
 import (
 	"testing"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v3"
 )
 
 func TestMarshalNetworks(t *testing.T) {
diff --git a/pipeline/frontend/yaml/types/volume_test.go b/pipeline/frontend/yaml/types/volume_test.go
index 07270b1a4..a6e27a0fe 100644
--- a/pipeline/frontend/yaml/types/volume_test.go
+++ b/pipeline/frontend/yaml/types/volume_test.go
@@ -17,9 +17,8 @@ package types
 import (
 	"testing"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/stretchr/testify/assert"
+	"gopkg.in/yaml.v3"
 )
 
 func TestMarshalVolumes(t *testing.T) {
diff --git a/server/api/global_secret.go b/server/api/global_secret.go
index b1082881e..e2322035b 100644
--- a/server/api/global_secret.go
+++ b/server/api/global_secret.go
@@ -19,10 +19,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session"
-
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session"
 )
 
 // GetGlobalSecretList
diff --git a/server/api/org.go b/server/api/org.go
index eaa81af1d..09d677221 100644
--- a/server/api/org.go
+++ b/server/api/org.go
@@ -19,9 +19,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
 
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
diff --git a/server/api/org_secret.go b/server/api/org_secret.go
index c8cc35c1d..b598ef378 100644
--- a/server/api/org_secret.go
+++ b/server/api/org_secret.go
@@ -20,10 +20,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session"
-
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session"
 )
 
 // GetOrgSecret
diff --git a/server/api/signature_public_key.go b/server/api/signature_public_key.go
index 0846f0c96..937f90024 100644
--- a/server/api/signature_public_key.go
+++ b/server/api/signature_public_key.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog/log"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 )
 
diff --git a/server/badges/badges_test.go b/server/badges/badges_test.go
index d8953c37d..fdbefe195 100644
--- a/server/badges/badges_test.go
+++ b/server/badges/badges_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/cache/membership.go b/server/cache/membership.go
index 233d7fd08..3c73c12e0 100644
--- a/server/cache/membership.go
+++ b/server/cache/membership.go
@@ -19,10 +19,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/jellydator/ttlcache/v3"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-
-	"github.com/jellydator/ttlcache/v3"
 )
 
 // MembershipService is a service to check for user membership.
diff --git a/server/forge/bitbucket/internal/client.go b/server/forge/bitbucket/internal/client.go
index 8d832e8c1..38028f0ab 100644
--- a/server/forge/bitbucket/internal/client.go
+++ b/server/forge/bitbucket/internal/client.go
@@ -23,10 +23,10 @@ import (
 	"net/http"
 	"net/url"
 
-	shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils"
-
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/bitbucket"
+
+	shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils"
 )
 
 const (
diff --git a/server/grpc/rpc_test.go b/server/grpc/rpc_test.go
index 9c23cb9fe..abef32d13 100644
--- a/server/grpc/rpc_test.go
+++ b/server/grpc/rpc_test.go
@@ -20,9 +20,10 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/grpc/metadata"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 	mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks"
-	"google.golang.org/grpc/metadata"
 )
 
 func TestRegisterAgent(t *testing.T) {
diff --git a/server/logging/log_test.go b/server/logging/log_test.go
index ffa4166d3..3ca442e2a 100644
--- a/server/logging/log_test.go
+++ b/server/logging/log_test.go
@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/pipeline/stepbuilder/stepBuilder.go b/server/pipeline/stepbuilder/stepBuilder.go
index 4c59cdd21..88c40363d 100644
--- a/server/pipeline/stepbuilder/stepBuilder.go
+++ b/server/pipeline/stepbuilder/stepBuilder.go
@@ -26,15 +26,14 @@ import (
 
 	backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types"
 	pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors"
-	yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types"
-	forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix"
+	yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types"
 	"go.woodpecker-ci.org/woodpecker/v2/server"
+	forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/pipeline/topic.go b/server/pipeline/topic.go
index f0c1d72f4..e5ca4d4c6 100644
--- a/server/pipeline/topic.go
+++ b/server/pipeline/topic.go
@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"github.com/rs/zerolog/log"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 	"go.woodpecker-ci.org/woodpecker/v2/server/pubsub"
diff --git a/server/plugins/encryption/aes_encryption.go b/server/plugins/encryption/aes_encryption.go
index 7bf2dae52..b7b5016ff 100644
--- a/server/plugins/encryption/aes_encryption.go
+++ b/server/plugins/encryption/aes_encryption.go
@@ -20,10 +20,10 @@ import (
 	"errors"
 	"fmt"
 
-	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
 	"golang.org/x/crypto/bcrypt"
-
 	"golang.org/x/crypto/sha3"
+
+	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
 )
 
 func (svc *aesEncryptionService) loadCipher(password string) error {
diff --git a/server/plugins/permissions/repo_owners_test.go b/server/plugins/permissions/repo_owners_test.go
index 4ecd36321..c34821255 100644
--- a/server/plugins/permissions/repo_owners_test.go
+++ b/server/plugins/permissions/repo_owners_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/plugins/secrets/builtin_test.go b/server/plugins/secrets/builtin_test.go
index c2f2509ac..6c35aebfd 100644
--- a/server/plugins/secrets/builtin_test.go
+++ b/server/plugins/secrets/builtin_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/stretchr/testify/mock"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 	"go.woodpecker-ci.org/woodpecker/v2/server/plugins/secrets"
 	mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks"
diff --git a/server/plugins/utils/http_test.go b/server/plugins/utils/http_test.go
index 4426e82ff..150538b56 100644
--- a/server/plugins/utils/http_test.go
+++ b/server/plugins/utils/http_test.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/go-ap/httpsig"
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/plugins/utils"
 )
 
diff --git a/server/queue/fifo.go b/server/queue/fifo.go
index 0111696fa..f66c69c6d 100644
--- a/server/queue/fifo.go
+++ b/server/queue/fifo.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-
 	"github.com/rs/zerolog/log"
+
+	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
 type entry struct {
diff --git a/server/queue/fifo_test.go b/server/queue/fifo_test.go
index 49d191e3a..873ffeffe 100644
--- a/server/queue/fifo_test.go
+++ b/server/queue/fifo_test.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/router/middleware/session/pagination.go b/server/router/middleware/session/pagination.go
index a9021100c..9bf4455c1 100644
--- a/server/router/middleware/session/pagination.go
+++ b/server/router/middleware/session/pagination.go
@@ -18,6 +18,7 @@ import (
 	"strconv"
 
 	"github.com/gin-gonic/gin"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go
index 285754d31..b89f163f8 100644
--- a/server/router/middleware/session/repo.go
+++ b/server/router/middleware/session/repo.go
@@ -25,7 +25,6 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"go.woodpecker-ci.org/woodpecker/v2/server"
-
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go
index b799cbd2c..3dd9735ba 100644
--- a/server/router/middleware/session/user.go
+++ b/server/router/middleware/session/user.go
@@ -18,13 +18,13 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store"
 	"go.woodpecker-ci.org/woodpecker/v2/shared/token"
-
-	"github.com/gin-gonic/gin"
-	"github.com/rs/zerolog/log"
 )
 
 func User(c *gin.Context) *model.User {
diff --git a/server/store/datastore/cron.go b/server/store/datastore/cron.go
index ed3e23f9b..c6c7713cb 100644
--- a/server/store/datastore/cron.go
+++ b/server/store/datastore/cron.go
@@ -15,9 +15,9 @@
 package datastore
 
 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-
 	"xorm.io/builder"
+
+	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
 func (s storage) CronCreate(cron *model.Cron) error {
diff --git a/server/store/datastore/engine.go b/server/store/datastore/engine.go
index fb5a5c082..20b1b9b54 100644
--- a/server/store/datastore/engine.go
+++ b/server/store/datastore/engine.go
@@ -16,12 +16,11 @@ package datastore
 
 import (
 	"github.com/rs/zerolog"
+	"xorm.io/xorm"
+	xlog "xorm.io/xorm/log"
 
 	"go.woodpecker-ci.org/woodpecker/v2/server/store"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store/datastore/migration"
-
-	"xorm.io/xorm"
-	xlog "xorm.io/xorm/log"
 )
 
 type storage struct {
diff --git a/server/store/datastore/engine_test.go b/server/store/datastore/engine_test.go
index a9f422224..b8e16fadb 100644
--- a/server/store/datastore/engine_test.go
+++ b/server/store/datastore/engine_test.go
@@ -19,10 +19,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func testDriverConfig() (driver, config string) {
diff --git a/server/store/datastore/helper_test.go b/server/store/datastore/helper_test.go
index 7beff99f3..be8b835e6 100644
--- a/server/store/datastore/helper_test.go
+++ b/server/store/datastore/helper_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
 )
 
diff --git a/server/store/datastore/log_test.go b/server/store/datastore/log_test.go
index 1aa02d285..3e6729844 100644
--- a/server/store/datastore/log_test.go
+++ b/server/store/datastore/log_test.go
@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server/model"
 )
 
diff --git a/server/store/datastore/migration/migration_test.go b/server/store/datastore/migration/migration_test.go
index d8985d590..858b5f7cd 100644
--- a/server/store/datastore/migration/migration_test.go
+++ b/server/store/datastore/migration/migration_test.go
@@ -19,14 +19,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/assert"
-	"xorm.io/xorm"
-	"xorm.io/xorm/schemas"
-
 	// blank imports to register the sql drivers
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/stretchr/testify/assert"
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
 )
 
 const (
diff --git a/server/web/web_test.go b/server/web/web_test.go
index e09df0e71..52e7b255e 100644
--- a/server/web/web_test.go
+++ b/server/web/web_test.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
+
 	"go.woodpecker-ci.org/woodpecker/v2/server"
 )