You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/05/22 12:40:32 UTC

[dubbo-admin] 02/02: gofumpt

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch refactor-with-go
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git

commit e3357c70f5dac1f7a7d8a059ae0ddc86baa8acdb
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon May 22 20:39:03 2023 +0800

    gofumpt
---
 pkg/admin/config/config.go                 | 1 -
 pkg/admin/config/governance_config.go      | 1 +
 pkg/admin/handlers/condition_route.go      | 3 ++-
 pkg/admin/handlers/overrides.go            | 3 ++-
 pkg/admin/handlers/service.go              | 6 ++++--
 pkg/admin/handlers/tag_route.go            | 5 +++--
 pkg/admin/router/router.go                 | 3 ++-
 pkg/admin/services/route_service_impl.go   | 3 +--
 pkg/dubboctl/cmd/manifest_test.go          | 3 ++-
 pkg/dubboctl/cmd/subcmd/manifest_diff.go   | 7 ++++---
 pkg/dubboctl/cmd/subcmd/profile_diff.go    | 1 +
 pkg/dubboctl/cmd/subcmd/profile_list.go    | 3 ++-
 pkg/dubboctl/internal/kube/client_test.go  | 5 +++--
 pkg/dubboctl/internal/kube/object.go       | 3 ++-
 pkg/dubboctl/internal/operator/operator.go | 1 +
 15 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkg/admin/config/config.go b/pkg/admin/config/config.go
index f21d0fa9..a25da29a 100644
--- a/pkg/admin/config/config.go
+++ b/pkg/admin/config/config.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 
 	"dubbo.apache.org/dubbo-go/v3/common"
-
 	"dubbo.apache.org/dubbo-go/v3/common/extension"
 	"dubbo.apache.org/dubbo-go/v3/config_center"
 	"dubbo.apache.org/dubbo-go/v3/metadata/report"
diff --git a/pkg/admin/config/governance_config.go b/pkg/admin/config/governance_config.go
index 45c4362a..0e309f0c 100644
--- a/pkg/admin/config/governance_config.go
+++ b/pkg/admin/config/governance_config.go
@@ -19,6 +19,7 @@ package config
 
 import (
 	"errors"
+
 	perrors "github.com/pkg/errors"
 
 	gozk "github.com/dubbogo/go-zookeeper/zk"
diff --git a/pkg/admin/handlers/condition_route.go b/pkg/admin/handlers/condition_route.go
index 3a0493e8..2fecdf16 100644
--- a/pkg/admin/handlers/condition_route.go
+++ b/pkg/admin/handlers/condition_route.go
@@ -18,9 +18,10 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/apache/dubbo-admin/pkg/admin/config"
 	"github.com/apache/dubbo-admin/pkg/logger"
-	"net/http"
 
 	"github.com/apache/dubbo-admin/pkg/admin/model"
 	"github.com/gin-gonic/gin"
diff --git a/pkg/admin/handlers/overrides.go b/pkg/admin/handlers/overrides.go
index e1af20af..8850a4df 100644
--- a/pkg/admin/handlers/overrides.go
+++ b/pkg/admin/handlers/overrides.go
@@ -16,9 +16,10 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/apache/dubbo-admin/pkg/admin/config"
 	"github.com/apache/dubbo-admin/pkg/logger"
-	"net/http"
 
 	"github.com/apache/dubbo-admin/pkg/admin/model"
 	"github.com/apache/dubbo-admin/pkg/admin/services"
diff --git a/pkg/admin/handlers/service.go b/pkg/admin/handlers/service.go
index 704da4b9..47b728c5 100644
--- a/pkg/admin/handlers/service.go
+++ b/pkg/admin/handlers/service.go
@@ -18,12 +18,14 @@
 package handlers
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/metadata/definition"
 	"encoding/json"
-	"github.com/apache/dubbo-admin/pkg/logger"
 	"net/http"
 	"strconv"
 
+	"dubbo.apache.org/dubbo-go/v3/metadata/definition"
+
+	"github.com/apache/dubbo-admin/pkg/logger"
+
 	"github.com/apache/dubbo-admin/pkg/admin/constant"
 	"github.com/vcraescu/go-paginator"
 	"github.com/vcraescu/go-paginator/adapter"
diff --git a/pkg/admin/handlers/tag_route.go b/pkg/admin/handlers/tag_route.go
index aee4e719..ae671fc3 100644
--- a/pkg/admin/handlers/tag_route.go
+++ b/pkg/admin/handlers/tag_route.go
@@ -18,11 +18,12 @@
 package handlers
 
 import (
-	"github.com/apache/dubbo-admin/pkg/admin/config"
-	"github.com/apache/dubbo-admin/pkg/logger"
 	"net/http"
 	"strings"
 
+	"github.com/apache/dubbo-admin/pkg/admin/config"
+	"github.com/apache/dubbo-admin/pkg/logger"
+
 	"github.com/apache/dubbo-admin/pkg/admin/model"
 	"github.com/apache/dubbo-admin/pkg/admin/services"
 	"github.com/gin-gonic/gin"
diff --git a/pkg/admin/router/router.go b/pkg/admin/router/router.go
index adb7e5b3..69e71fb2 100644
--- a/pkg/admin/router/router.go
+++ b/pkg/admin/router/router.go
@@ -18,10 +18,11 @@
 package router
 
 import (
+	"net/http"
+
 	"github.com/apache/dubbo-admin/cmd/ui"
 	"github.com/apache/dubbo-admin/pkg/admin/handlers"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 func InitRouter() *gin.Engine {
diff --git a/pkg/admin/services/route_service_impl.go b/pkg/admin/services/route_service_impl.go
index c23fbea4..2dd55425 100644
--- a/pkg/admin/services/route_service_impl.go
+++ b/pkg/admin/services/route_service_impl.go
@@ -27,8 +27,7 @@ import (
 	"github.com/apache/dubbo-admin/pkg/admin/util"
 )
 
-type RouteServiceImpl struct {
-}
+type RouteServiceImpl struct{}
 
 func (t *RouteServiceImpl) CreateTagRoute(tagRoute model.TagRouteDto) error {
 	id := util.BuildServiceKey(tagRoute.Base)
diff --git a/pkg/dubboctl/cmd/manifest_test.go b/pkg/dubboctl/cmd/manifest_test.go
index 0a9d941e..e3574916 100644
--- a/pkg/dubboctl/cmd/manifest_test.go
+++ b/pkg/dubboctl/cmd/manifest_test.go
@@ -17,11 +17,12 @@ package cmd
 
 import (
 	"bytes"
-	"github.com/apache/dubbo-admin/pkg/dubboctl/cmd/subcmd"
 	"os"
 	"strings"
 	"testing"
 
+	"github.com/apache/dubbo-admin/pkg/dubboctl/cmd/subcmd"
+
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
diff --git a/pkg/dubboctl/cmd/subcmd/manifest_diff.go b/pkg/dubboctl/cmd/subcmd/manifest_diff.go
index 254dde93..b1dbd6d2 100644
--- a/pkg/dubboctl/cmd/subcmd/manifest_diff.go
+++ b/pkg/dubboctl/cmd/subcmd/manifest_diff.go
@@ -18,13 +18,14 @@ package subcmd
 import (
 	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/kube"
 	"github.com/apache/dubbo-admin/pkg/logger"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap/zapcore"
-	"os"
-	"path/filepath"
-	"strings"
 )
 
 type ManifestDiffArgs struct {
diff --git a/pkg/dubboctl/cmd/subcmd/profile_diff.go b/pkg/dubboctl/cmd/subcmd/profile_diff.go
index b093da9a..1a864387 100644
--- a/pkg/dubboctl/cmd/subcmd/profile_diff.go
+++ b/pkg/dubboctl/cmd/subcmd/profile_diff.go
@@ -18,6 +18,7 @@ package subcmd
 import (
 	"errors"
 	"fmt"
+
 	"github.com/apache/dubbo-admin/pkg/dubboctl/identifier"
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/kube"
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/manifest"
diff --git a/pkg/dubboctl/cmd/subcmd/profile_list.go b/pkg/dubboctl/cmd/subcmd/profile_list.go
index 5c0ce938..dd170172 100644
--- a/pkg/dubboctl/cmd/subcmd/profile_list.go
+++ b/pkg/dubboctl/cmd/subcmd/profile_list.go
@@ -17,13 +17,14 @@ package subcmd
 
 import (
 	"errors"
+	"strings"
+
 	"github.com/apache/dubbo-admin/pkg/dubboctl/identifier"
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/manifest"
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/util"
 	"github.com/apache/dubbo-admin/pkg/logger"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap/zapcore"
-	"strings"
 )
 
 type ProfileListArgs struct {
diff --git a/pkg/dubboctl/internal/kube/client_test.go b/pkg/dubboctl/internal/kube/client_test.go
index 729b0738..49c867e1 100644
--- a/pkg/dubboctl/internal/kube/client_test.go
+++ b/pkg/dubboctl/internal/kube/client_test.go
@@ -17,12 +17,13 @@ package kube
 
 import (
 	"context"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"os"
 	"path"
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/dubboctl/internal/kube/object.go b/pkg/dubboctl/internal/kube/object.go
index 2f0fab11..e78bee93 100644
--- a/pkg/dubboctl/internal/kube/object.go
+++ b/pkg/dubboctl/internal/kube/object.go
@@ -18,10 +18,11 @@ package kube
 import (
 	"bytes"
 	"fmt"
-	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/util"
 	"sort"
 	"strings"
 
+	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/util"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
diff --git a/pkg/dubboctl/internal/operator/operator.go b/pkg/dubboctl/internal/operator/operator.go
index 8bb34f86..38ed6c99 100644
--- a/pkg/dubboctl/internal/operator/operator.go
+++ b/pkg/dubboctl/internal/operator/operator.go
@@ -18,6 +18,7 @@ package operator
 import (
 	"errors"
 	"fmt"
+
 	"github.com/apache/dubbo-admin/pkg/logger"
 
 	"github.com/apache/dubbo-admin/pkg/dubboctl/internal/kube"