feat: add sort goimports (#115)

ronething · web-flow · commit c6b9442fd579 · 2025-04-27T19:11:34.000+08:00
Signed-off-by: ashing &lt;axingfly@gmail.com&gt;
diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ conformance-test:
 	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance
 
 .PHONY: lint
-lint: golangci-lint ## Run golangci-lint linter
+lint: sort-import golangci-lint ## Run golangci-lint linter
 	$(GOLANGCI_LINT) run
 
 .PHONY: lint-fix
@@ -342,3 +342,7 @@ helm-build-crds:
 	$(KUSTOMIZE) build github.com/kubernetes-sigs/gateway-api/config/crd\?ref=${GATEAY_API_VERSION} > charts/crds/gwapi-crds.yaml
 	@echo "build apisix ic crds"
 	$(KUSTOMIZE) build config/crd > charts/crds/apisixic-crds.yaml
+
+sort-import:
+	@./scripts/goimports-reviser.sh >/dev/null 2>&1
+.PHONY: sort-import
diff --git a/go.mod b/go.mod
@@ -27,6 +27,7 @@ require (
 	go.etcd.io/etcd/client/v3 v3.5.15
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/net v0.28.0
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/gorm v1.25.11
@@ -194,7 +195,6 @@ require (
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	golang.org/x/arch v0.6.0 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.20.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
diff --git a/internal/controller/config/config.go b/internal/controller/config/config.go
@@ -9,8 +9,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/api7/api7-ingress-controller/internal/types"
 	"gopkg.in/yaml.v2"
+
+	"github.com/api7/api7-ingress-controller/internal/types"
 )
 
 var (
diff --git a/internal/controller/consumer_controller.go b/internal/controller/consumer_controller.go
@@ -3,9 +3,6 @@ package controller
 import (
 	"context"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
-	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -20,6 +17,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
+	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 // ConsumerReconciler  reconciles a Gateway object.
diff --git a/internal/controller/gateway_controller.go b/internal/controller/gateway_controller.go
@@ -5,9 +5,6 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
-	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -21,6 +18,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
+	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 // GatewayReconciler reconciles a Gateway object.
diff --git a/internal/controller/gatewayclass_congroller.go b/internal/controller/gatewayclass_congroller.go
@@ -4,14 +4,15 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/go-logr/logr"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/api7/api7-ingress-controller/internal/controller/config"
 )
 
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gatewayclasses,verbs=get;list;watch;update
diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress_controller.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/api7/gopkg/pkg/log"
 	"github.com/go-logr/logr"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
@@ -29,7 +30,6 @@ import (
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
 	"github.com/api7/api7-ingress-controller/internal/provider"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 // IngressReconciler reconciles a Ingress object.
diff --git a/internal/controller/label/label.go b/internal/controller/label/label.go
@@ -1,8 +1,9 @@
 package label
 
 import (
-	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/api7/api7-ingress-controller/internal/controller/config"
 )
 
 type Label map[string]string
diff --git a/internal/controller/status.go b/internal/controller/status.go
@@ -1,12 +1,13 @@
 package controller
 
 import (
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 const (
diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
@@ -24,7 +24,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -33,7 +32,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	gatewayapisixiov1alpha1 "github.com/api7/api7-ingress-controller/api/v1alpha1"
-	// +kubebuilder:scaffold:imports
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
diff --git a/internal/controller/utils.go b/internal/controller/utils.go
@@ -5,9 +5,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
-	"github.com/api7/api7-ingress-controller/internal/controller/config"
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
 	"github.com/samber/lo"
 	"go.uber.org/zap"
@@ -19,6 +16,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
+	"github.com/api7/api7-ingress-controller/internal/controller/config"
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 const (
diff --git a/internal/provider/adc/adc.go b/internal/provider/adc/adc.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 	networkingv1 "k8s.io/api/networking/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -21,7 +22,6 @@ import (
 	"github.com/api7/api7-ingress-controller/internal/controller/label"
 	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/api7-ingress-controller/internal/provider/adc/translator"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type adcConfig struct {
diff --git a/internal/provider/adc/config.go b/internal/provider/adc/config.go
@@ -4,11 +4,12 @@ import (
 	"errors"
 	"slices"
 
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, gatewayProxy *v1alpha1.GatewayProxy) (*adcConfig, error) {
diff --git a/internal/provider/adc/translator/consumer.go b/internal/provider/adc/translator/consumer.go
@@ -3,10 +3,11 @@ package translator
 import (
 	"encoding/json"
 
+	"k8s.io/apimachinery/pkg/types"
+
 	adctypes "github.com/api7/api7-ingress-controller/api/adc"
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"github.com/api7/api7-ingress-controller/internal/provider"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext, consumerV *v1alpha1.Consumer) (*TranslateResult, error) {
diff --git a/internal/provider/adc/translator/policies.go b/internal/provider/adc/translator/policies.go
@@ -1,11 +1,12 @@
 package translator
 
 import (
-	adctypes "github.com/api7/api7-ingress-controller/api/adc"
-	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	adctypes "github.com/api7/api7-ingress-controller/api/adc"
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 )
 
 func convertBackendRef(namespace, name, kind string) gatewayv1.BackendRef {
diff --git a/internal/provider/controlplane/controlplane.go b/internal/provider/controlplane/controlplane.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/api7/gopkg/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/api7-ingress-controller/internal/provider/controlplane/translator"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type dashboardProvider struct {
diff --git a/internal/provider/controlplane/translator/gateway.go b/internal/provider/controlplane/translator/gateway.go
@@ -5,15 +5,16 @@ import (
 	"encoding/pem"
 	"fmt"
 
-	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
-	"github.com/api7/api7-ingress-controller/internal/controller/label"
-	"github.com/api7/api7-ingress-controller/internal/id"
-	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
+	"github.com/api7/api7-ingress-controller/internal/controller/label"
+	"github.com/api7/api7-ingress-controller/internal/id"
+	"github.com/api7/api7-ingress-controller/internal/provider"
 )
 
 func (t *Translator) TranslateGateway(tctx *provider.TranslateContext, obj *gatewayv1.Gateway) (*TranslateResult, error) {
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -5,10 +5,9 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
-	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
-
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 )
diff --git a/pkg/dashboard/cache/schema.go b/pkg/dashboard/cache/schema.go
@@ -19,8 +19,9 @@ import (
 	"fmt"
 	"strings"
 
-	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/hashicorp/go-memdb"
+
+	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 )
 
 var (
diff --git a/pkg/dashboard/cluster.go b/pkg/dashboard/cluster.go
@@ -30,13 +30,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard/cache"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 const (
diff --git a/pkg/dashboard/consumer.go b/pkg/dashboard/consumer.go
@@ -18,12 +18,12 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/apache/apisix-ingress-controller/pkg/id"
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 
-	"github.com/apache/apisix-ingress-controller/pkg/id"
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard/cache"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type consumerClient struct {
diff --git a/pkg/dashboard/global_rule.go b/pkg/dashboard/global_rule.go
@@ -19,11 +19,11 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard/cache"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type globalRuleClient struct {
diff --git a/pkg/dashboard/plugin.go b/pkg/dashboard/plugin.go
@@ -18,9 +18,8 @@ package dashboard
 import (
 	"context"
 
-	"go.uber.org/zap"
-
 	"github.com/api7/gopkg/pkg/log"
+	"go.uber.org/zap"
 )
 
 type pluginClient struct {
diff --git a/pkg/dashboard/plugin_metadata.go b/pkg/dashboard/plugin_metadata.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type pluginMetadataClient struct {
diff --git a/pkg/dashboard/pluginconfig.go b/pkg/dashboard/pluginconfig.go
@@ -19,12 +19,12 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/apache/apisix-ingress-controller/pkg/id"
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 
-	"github.com/apache/apisix-ingress-controller/pkg/id"
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard/cache"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type pluginConfigClient struct {
diff --git a/pkg/dashboard/route.go b/pkg/dashboard/route.go
@@ -19,12 +19,12 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/apache/apisix-ingress-controller/pkg/id"
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 
-	"github.com/apache/apisix-ingress-controller/pkg/id"
 	v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
 	"github.com/api7/api7-ingress-controller/pkg/dashboard/cache"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 type routeClient struct {
diff --git a/pkg/dashboard/schema.go b/pkg/dashboard/schema.go
diff --git a/pkg/dashboard/service.go b/pkg/dashboard/service.go
diff --git a/pkg/dashboard/ssl.go b/pkg/dashboard/ssl.go
diff --git a/pkg/dashboard/stream_route.go b/pkg/dashboard/stream_route.go
diff --git a/scripts/goimports-reviser.sh b/scripts/goimports-reviser.sh
diff --git a/test/e2e/adminapi/dashboard_api.go b/test/e2e/adminapi/dashboard_api.go
diff --git a/test/e2e/framework/dashboard.go b/test/e2e/framework/dashboard.go
diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@ import (`
`9`	`9`	`"text/template"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "github.com/api7/api7-ingress-controller/internal/types"`
`13`	`12`	`"gopkg.in/yaml.v2"`
	`13`	`+`
	`14`	`+ "github.com/api7/api7-ingress-controller/internal/types"`
`14`	`15`	`)`
`15`	`16`
`16`	`17`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package label`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/api7/api7-ingress-controller/internal/controller/config"`
`5`	`4`	`"sigs.k8s.io/controller-runtime/pkg/client"`
	`5`	`+`
	`6`	`+ "github.com/api7/api7-ingress-controller/internal/controller/config"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`type Label map[string]string`