Merge pull request #1017 from size12/linter5

enabled gci

Author: asmyasnikov

.github/scripts/format-go-code.sh

@@ -6,12 +6,15 @@ FILEPATH="$1"
 
 gofmt -s -w "$FILEPATH"
 
-# https://github.com/rinchsan/gosimports
+# https://github.com/daixiang0/gci
 if [[ "$FILEPATH" == *"tests/slo/"* ]]
 then
-  gosimports -local slo -w "$FILEPATH"
+  gci write --skip-generated -s standard -s default -s "prefix(slo)" "$FILEPATH"
+elif [[ "$FILEPATH" == *"examples/"* ]]
+then
+  gci write --skip-generated -s standard -s default -s "prefix(examples)" "$FILEPATH"
 else
-  gosimports -local github.com/ydb-platform/ydb-go-sdk/v3 -w "$FILEPATH"
+  gci write --skip-generated -s standard -s default -s "prefix(github.com/ydb-platform/ydb-go-sdk/v3)" "$FILEPATH"
 fi
 
 

.github/workflows/lint.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Install utilities
         run: |
           go install mvdan.cc/gofumpt@v0.3.1
-          go install github.com/rinchsan/gosimports/cmd/gosimports@v0.1.5
+          go install github.com/daixiang0/gci@v0.12.1
       - name: format all files with auto-formatter
         run: bash ./.github/scripts/format-all-go-code.sh "$PWD"
       - name: Check repository diff

.golangci.yml

@@ -64,6 +64,12 @@ linters-settings:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
     local-prefixes: github.com/ydb-platform/ydb-go-sdk/v3
+  gci:
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - prefix(github.com/ydb-platform/ydb-go-sdk/v3) # Custom section: groups all imports with the specified Prefix.
+    skip-generated: true
   goconst:
     # minimal length of string constant, 3 by default
     min-len: 2
@@ -220,7 +226,6 @@ linters:
     - forbidigo
     - forcetypeassert
     - funlen
-    - gci
     - gochecknoglobals
     - gocognit
     - godot

examples/auth/environ/main.go

@@ -6,7 +6,6 @@ import (
 	"os"
 
 	environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
-
 	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
 )
 

examples/auth/metadata_credentials/main.go

@@ -6,9 +6,8 @@ import (
 	"fmt"
 	"os"
 
-	yc "github.com/ydb-platform/ydb-go-yc"
-
 	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
+	yc "github.com/ydb-platform/ydb-go-yc"
 )
 
 var dsn string

examples/auth/service_account_credentials/main.go

@@ -6,9 +6,8 @@ import (
 	"fmt"
 	"os"
 
-	yc "github.com/ydb-platform/ydb-go-yc"
-
 	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
+	yc "github.com/ydb-platform/ydb-go-yc"
 )
 
 var (

examples/basic/database_sql/data.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
 )
 

examples/basic/database_sql/main.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
-
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/sugar"
 )

examples/basic/native/main.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
-
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/sugar"
 )

examples/basic/xorm/main.go

@@ -7,12 +7,11 @@ import (
 	"time"
 
 	_ "github.com/lib/pq"
+	_ "github.com/ydb-platform/ydb-go-sdk/v3"
 	_ "modernc.org/sqlite"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 	xormLog "xorm.io/xorm/log"
-
-	_ "github.com/ydb-platform/ydb-go-sdk/v3"
 )
 
 var envNotFoundMessage = `DSN environment variable not defined