Replace goimports with gci (woodpecker-ci#3202)

`gci` seems to be much more strict.
quintoandar · Feb 1, 2024 · 5fbacf1 · 5fbacf1
1 parent 0b746a8
commit 5fbacf1
Show file tree

Hide file tree

Showing 43 changed files with 60 additions and 55 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"