[ISSUE polarismesh#741] Fix import style (polarismesh#740)

chuntaojun · web-flow · commit 9e4769bbd0af · 2022-10-13T20:10:40.000+08:00
* fix issue polarismesh#629 (polarismesh#693) * docs:优化错误信息描述 * Update zh.toml * fix:修复eureka心跳协议错误码不兼容问题 * fix:修复eureka心跳协议错误码不兼容问题 * unit:添加单元测试 * test:调整测试配置文件位置 * fix:issue polarismesh#692 * fix:issue polarismesh#692 * fix:issue polarismesh#692 * fix:issue polarismesh#692 * docs:add error code desc * fix:修复polaris-limiter 容器部署失败问题 (polarismesh#722) * fix:修复polaris-console.yaml问题 * fix:code style * style:fix import order
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ __debug_bin
 /vendor
 .codecc
 *.log
+
+style_tool/
+goimports-reviser
diff --git a/apiserver/eurekaserver/eureka_suit_test.go b/apiserver/eurekaserver/eureka_suit_test.go
@@ -25,22 +25,14 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
+	"gopkg.in/yaml.v2"
+
 	"github.com/polarismesh/polaris/auth"
 	"github.com/polarismesh/polaris/cache"
 	commonlog "github.com/polarismesh/polaris/common/log"
 	"github.com/polarismesh/polaris/common/utils"
 	"github.com/polarismesh/polaris/namespace"
 	"github.com/polarismesh/polaris/plugin"
-	"github.com/polarismesh/polaris/service"
-	"github.com/polarismesh/polaris/service/batch"
-	"github.com/polarismesh/polaris/service/healthcheck"
-	"github.com/polarismesh/polaris/store"
-	storemock "github.com/polarismesh/polaris/store/mock"
-	"gopkg.in/yaml.v2"
-
-	"github.com/polarismesh/polaris/testdata"
-
-	// 注册相关默认插件
 	_ "github.com/polarismesh/polaris/plugin/auth/defaultauth"
 	_ "github.com/polarismesh/polaris/plugin/auth/platform"
 	_ "github.com/polarismesh/polaris/plugin/cmdb/memory"
@@ -53,8 +45,14 @@ import (
 	_ "github.com/polarismesh/polaris/plugin/ratelimit/lrurate"
 	_ "github.com/polarismesh/polaris/plugin/ratelimit/token"
 	_ "github.com/polarismesh/polaris/plugin/statis/local"
+	"github.com/polarismesh/polaris/service"
+	"github.com/polarismesh/polaris/service/batch"
+	"github.com/polarismesh/polaris/service/healthcheck"
+	"github.com/polarismesh/polaris/store"
 	_ "github.com/polarismesh/polaris/store/boltdb"
+	storemock "github.com/polarismesh/polaris/store/mock"
 	_ "github.com/polarismesh/polaris/store/sqldb"
+	"github.com/polarismesh/polaris/testdata"
 )
 
 type Bootstrap struct {
diff --git a/apiserver/eurekaserver/write_test.go b/apiserver/eurekaserver/write_test.go
@@ -23,12 +23,13 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/types/known/wrapperspb"
+
 	api "github.com/polarismesh/polaris/common/api/v1"
 	"github.com/polarismesh/polaris/common/model"
 	"github.com/polarismesh/polaris/common/utils"
 	"github.com/polarismesh/polaris/store/mock"
-	"github.com/stretchr/testify/assert"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func TestEurekaServer_renew(t *testing.T) {
diff --git a/apiserver/grpcserver/discover/v2/client_access_v2.go b/apiserver/grpcserver/discover/v2/client_access_v2.go
@@ -21,13 +21,14 @@ import (
 	"fmt"
 	"io"
 
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+
 	"github.com/polarismesh/polaris/apiserver/grpcserver"
 	apiv1 "github.com/polarismesh/polaris/common/api/v1"
 	apiv2 "github.com/polarismesh/polaris/common/api/v2"
 	commonlog "github.com/polarismesh/polaris/common/log"
 	"github.com/polarismesh/polaris/common/utils"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
 )
 
 var (
diff --git a/apiserver/grpcserver/stream.go b/apiserver/grpcserver/stream.go
@@ -23,11 +23,12 @@ import (
 	"strings"
 	"time"
 
-	commonlog "github.com/polarismesh/polaris/common/log"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+
+	commonlog "github.com/polarismesh/polaris/common/log"
 )
 
 // initVirtualStream 对 VirtualStream 的一些初始化动作
diff --git a/apiserver/httpserver/client.go b/apiserver/httpserver/client.go
@@ -19,6 +19,7 @@ package httpserver
 
 import (
 	"github.com/emicklei/go-restful/v3"
+
 	httpcommon "github.com/polarismesh/polaris/apiserver/httpserver/http"
 )
 
diff --git a/apiserver/httpserver/i18n/en.toml b/apiserver/httpserver/i18n/en.toml
@@ -155,4 +155,4 @@
 500007 = "heartbeat execute exception" #HeartbeatException
 500008 = "instance async regist timeout" #InstanceRegisTimeout
 500100 = "token verify exception" #AuthTokenVerifyException
-500101 = "operation role exception" #OperationRoleException
+500101 = "operation role exception" #OperationRoleException
diff --git a/apiserver/httpserver/i18n/messages.genearate.go b/apiserver/httpserver/i18n/messages.genearate.go
diff --git a/apiserver/httpserver/swagger_access.go b/apiserver/httpserver/swagger_access.go
@@ -21,6 +21,7 @@ import (
 	"github.com/emicklei/go-restful/v3"
 	"github.com/go-openapi/spec"
 	restfulspec "github.com/polarismesh/go-restful-openapi/v2"
+
 	"github.com/polarismesh/polaris/common/version"
 )
 
diff --git a/apiserver/xdsserverv3/callback.go b/apiserver/xdsserverv3/callback.go
@@ -22,6 +22,7 @@ import (
 
 	discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	"github.com/gogo/protobuf/jsonpb"
+
 	commonlog "github.com/polarismesh/polaris/common/log"
 )
 
diff --git a/auth/defaultauth/main_test.go b/auth/defaultauth/main_test.go
@@ -26,6 +26,8 @@ import (
 
 	"github.com/boltdb/bolt"
 	_ "github.com/go-sql-driver/mysql"
+	"gopkg.in/yaml.v2"
+
 	"github.com/polarismesh/polaris/auth"
 	"github.com/polarismesh/polaris/cache"
 	_ "github.com/polarismesh/polaris/cache"
@@ -55,7 +57,6 @@ import (
 	"github.com/polarismesh/polaris/store/sqldb"
 	_ "github.com/polarismesh/polaris/store/sqldb"
 	"github.com/polarismesh/polaris/testdata"
-	"gopkg.in/yaml.v2"
 )
 
 const (
@@ -291,7 +292,6 @@ func (d *AuthTestSuit) cleanAllUserGroup() {
 	}
 }
 
-
 func (d *AuthTestSuit) cleanAllAuthStrategy() {
 	if d.storage.Name() == sqldb.STORENAME {
 		func() {
diff --git a/cache/client_test.go b/cache/client_test.go
@@ -23,11 +23,12 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+
 	apiv1 "github.com/polarismesh/polaris/common/api/v1"
 	"github.com/polarismesh/polaris/common/model"
 	"github.com/polarismesh/polaris/common/utils"
 	"github.com/polarismesh/polaris/store/mock"
-	"github.com/stretchr/testify/assert"
 )
 
 func newTestClientCache(t *testing.T) (*gomock.Controller, *mock.MockStore, *clientCache) {
diff --git a/cache/config_file_bucket.go b/cache/config_file_bucket.go
@@ -43,11 +43,11 @@ func newConfigFileGroupBucket() *configFileGroupBucket {
 }
 
 type configFileGroupBucket struct {
-	lock sync.RWMutex
+	lock        sync.RWMutex
 	name2groups map[string]*subConfigFileGroupBucket
 
-	idlock      sync.RWMutex
-	id2groups   map[uint64]*configGroupEntry
+	idlock    sync.RWMutex
+	id2groups map[uint64]*configGroupEntry
 }
 
 func (b *configFileGroupBucket) saveGroupById(id uint64, item *model.ConfigFileGroup) {
diff --git a/cache/routing_config.go b/cache/routing_config.go
@@ -21,6 +21,9 @@ import (
 	"sort"
 	"time"
 
+	"go.uber.org/zap"
+	"golang.org/x/sync/singleflight"
+
 	apiv1 "github.com/polarismesh/polaris/common/api/v1"
 	apiv2 "github.com/polarismesh/polaris/common/api/v2"
 	"github.com/polarismesh/polaris/common/log"
@@ -29,8 +32,6 @@ import (
 	routingcommon "github.com/polarismesh/polaris/common/routing"
 	"github.com/polarismesh/polaris/common/utils"
 	"github.com/polarismesh/polaris/store"
-	"go.uber.org/zap"
-	"golang.org/x/sync/singleflight"
 )
 
 const (
diff --git a/common/api/v2/response.go b/common/api/v2/response.go
@@ -20,6 +20,7 @@ package v2
 import (
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
+
 	v1 "github.com/polarismesh/polaris/common/api/v1"
 )
 
diff --git a/common/model/v2/routing.go b/common/model/v2/routing.go
@@ -21,9 +21,10 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/ptypes"
+	"google.golang.org/protobuf/types/known/anypb"
+
 	apiv2 "github.com/polarismesh/polaris/common/api/v2"
 	commontime "github.com/polarismesh/polaris/common/time"
-	"google.golang.org/protobuf/types/known/anypb"
 )
 
 const (
diff --git a/common/routing/routing.go b/common/routing/routing.go
@@ -23,6 +23,7 @@ import (
 	"sort"
 
 	"github.com/golang/protobuf/ptypes"
+
 	apiv1 "github.com/polarismesh/polaris/common/api/v1"
 	apiv2 "github.com/polarismesh/polaris/common/api/v2"
 	"github.com/polarismesh/polaris/common/model"
diff --git a/config/config_file_template_test.go b/config/config_file_template_test.go
@@ -20,9 +20,10 @@ package config
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	api "github.com/polarismesh/polaris/common/api/v1"
 	"github.com/polarismesh/polaris/common/utils"
-	"github.com/stretchr/testify/assert"
 )
 
 // TestConfigFileTemplateCRUD the base test for config file template
diff --git a/config/server_authability.go b/config/server_authability.go
@@ -21,12 +21,13 @@ import (
 	"context"
 	"strconv"
 
+	"go.uber.org/zap"
+
 	"github.com/polarismesh/polaris/auth"
 	api "github.com/polarismesh/polaris/common/api/v1"
 	commonlog "github.com/polarismesh/polaris/common/log"
 	"github.com/polarismesh/polaris/common/model"
 	"github.com/polarismesh/polaris/common/utils"
-	"go.uber.org/zap"
 )
 
 var _ ConfigCenterServer = (*serverAuthability)(nil)
diff --git a/deploy/helm/templates/polaris-console-config.yaml b/deploy/helm/templates/polaris-console-config.yaml
@@ -15,7 +15,8 @@ data:
       mode: "release"
       listenIP: "0.0.0.0"
       listenPort: {{ .Values.service.webPort }}
-      namingURL: "/naming/v1"
+      namingV1URL: "/naming/v1"
+      namingV2URL: "/naming/v2"
       authURL: "/core/v1"
       requestURL: "/naming/v1"
       configURL: "/config/v1"
diff --git a/deploy/helm/templates/polaris-server-config.yaml b/deploy/helm/templates/polaris-server-config.yaml
@@ -64,6 +64,28 @@ data:
             - stdout
           errorOutputPaths:
             - stderr
+        healthcheck:
+          rotateOutputPath: log/polaris-healthcheck.log
+          errorRotateOutputPath: log/polaris-healthcheck-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        xdsv3:
+          rotateOutputPath: log/polaris-xdsv3.log
+          errorRotateOutputPath: log/polaris-xdsv3-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
         default:
           rotateOutputPath: log/polaris-default.log
           errorRotateOutputPath: log/polaris-default-error.log
diff --git a/deploy/standalone/docker-compose/console/polaris-console.yaml b/deploy/standalone/docker-compose/console/polaris-console.yaml
@@ -8,7 +8,8 @@ webServer:
   mode: "release"
   listenIP: "0.0.0.0"
   listenPort: 8080
-  namingURL: "/naming/v1"
+  namingV1URL: "/naming/v1"
+  namingV2URL: "/naming/v2"
   authURL: "/core/v1"
   requestURL: "/naming/v1"
   configURL: "/config/v1"
diff --git a/deploy/standalone/k8s/02-polaris-server-config.yaml b/deploy/standalone/k8s/02-polaris-server-config.yaml
@@ -60,6 +60,28 @@ data:
             - stdout
           errorOutputPaths:
             - stderr
+        healthcheck:
+          rotateOutputPath: log/polaris-healthcheck.log
+          errorRotateOutputPath: log/polaris-healthcheck-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        xdsv3:
+          rotateOutputPath: log/polaris-xdsv3.log
+          errorRotateOutputPath: log/polaris-xdsv3-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
         default:
           rotateOutputPath: log/polaris-default.log
           errorRotateOutputPath: log/polaris-default-error.log
diff --git a/deploy/standalone/k8s/05-polaris-limiter.yaml b/deploy/standalone/k8s/05-polaris-limiter.yaml
@@ -34,7 +34,7 @@ spec:
       restartPolicy: Always
       volumes:
         - configMap:
-            defaultMode: 640
+            defaultMode: 0640
             name: polaris-limiter-config
           name: polaris-limiter-config
   updateStrategy:
diff --git a/import-format.sh b/import-format.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+rm -rf style_tool
+rm -rf goimports-reviser
+
+mkdir -p style_tool
+
+cd style_tool
+
+wget https://github.com/incu6us/goimports-reviser/releases/download/v3.1.1/goimports-reviser_3.1.1_linux_amd64.tar.gz
+tar -zxvf goimports-reviser_3.1.1_linux_amd64.tar.gz
+mv goimports-reviser ../
+
+cd ../
+
+find . -name "*.go" -type f | grep -v .pb.go|grep -v test/tools/tools.go | grep -v ./plugin.go | xargs -I {} goimports-reviser -rm-unused -format {} -project-name github.com/polarismesh/polaris
+
+go fmt ./...
diff --git a/plugin/discoverevent/loki/event_loki_test.go b/plugin/discoverevent/loki/event_loki_test.go
@@ -20,8 +20,9 @@ package loki
 import (
 	"testing"
 
-	"github.com/polarismesh/polaris/plugin"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/polarismesh/polaris/plugin"
 )
 
 func Test_discoverEventLoki_Name(t *testing.T) {
diff --git a/plugin/discoverevent/loki/logger.go b/plugin/discoverevent/loki/logger.go
@@ -31,6 +31,7 @@ import (
 	"github.com/golang/snappy"
 	"github.com/grafana/loki/pkg/logproto"
 	json "github.com/json-iterator/go"
+
 	"github.com/polarismesh/polaris/common/log"
 	"github.com/polarismesh/polaris/common/model"
 	"github.com/polarismesh/polaris/common/utils"
diff --git a/plugin/history/loki/history_loki_test.go b/plugin/history/loki/history_loki_test.go
@@ -20,9 +20,10 @@ package loki
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/polarismesh/polaris/common/model"
 	"github.com/polarismesh/polaris/plugin"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestHistoryLoki_Name(t *testing.T) {
diff --git a/plugin/history/loki/logger.go b/plugin/history/loki/logger.go
diff --git a/service/client_v1.go b/service/client_v1.go
diff --git a/service/client_v1_test.go b/service/client_v1_test.go
diff --git a/service/client_v2.go b/service/client_v2.go
diff --git a/service/routing_config_v1tov2.go b/service/routing_config_v1tov2.go
diff --git a/service/routing_config_v2.go b/service/routing_config_v2.go
diff --git a/store/boltdb/routing.go b/store/boltdb/routing.go
diff --git a/store/boltdb/routing_config_v2.go b/store/boltdb/routing_config_v2.go
diff --git a/store/mock/api_mock.go b/store/mock/api_mock.go
diff --git a/store/sqldb/default.go b/store/sqldb/default.go
diff --git a/store/sqldb/routing_config_v2.go b/store/sqldb/routing_config_v2.go

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package httpserver`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"github.com/emicklei/go-restful/v3"`
	`22`	`+`
`22`	`23`	`httpcommon "github.com/polarismesh/polaris/apiserver/httpserver/http"`
`23`	`24`	`)`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"github.com/emicklei/go-restful/v3"`
`22`	`22`	`"github.com/go-openapi/spec"`
`23`	`23`	`restfulspec "github.com/polarismesh/go-restful-openapi/v2"`
	`24`	`+`
`24`	`25`	`"github.com/polarismesh/polaris/common/version"`
`25`	`26`	`)`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"`
`24`	`24`	`"github.com/gogo/protobuf/jsonpb"`
	`25`	`+`
`25`	`26`	`commonlog "github.com/polarismesh/polaris/common/log"`
`26`	`27`	`)`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ func newConfigFileGroupBucket() *configFileGroupBucket {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`type configFileGroupBucket struct {`
`46`		`- lock sync.RWMutex`
	`46`	`+ lock sync.RWMutex`
`47`	`47`	`name2groups map[string]*subConfigFileGroupBucket`
`48`	`48`
`49`		`- idlock sync.RWMutex`
`50`		`- id2groups map[uint64]*configGroupEntry`
	`49`	`+ idlock sync.RWMutex`
	`50`	`+ id2groups map[uint64]*configGroupEntry`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func (b configFileGroupBucket) saveGroupById(id uint64, item model.ConfigFileGroup) {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ package v2`
`20`	`20`	`import (`
`21`	`21`	`"github.com/golang/protobuf/proto"`
`22`	`22`	`"github.com/golang/protobuf/ptypes"`
	`23`	`+`
`23`	`24`	`v1 "github.com/polarismesh/polaris/common/api/v1"`
`24`	`25`	`)`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@ package loki`
`20`	`20`	`import (`
`21`	`21`	`"testing"`
`22`	`22`
`23`		`- "github.com/polarismesh/polaris/plugin"`
`24`	`23`	`"github.com/stretchr/testify/assert"`
	`24`	`+`
	`25`	`+ "github.com/polarismesh/polaris/plugin"`
`25`	`26`	`)`
`26`	`27`
`27`	`28`	`func Test_discoverEventLoki_Name(t *testing.T) {`