Skip to content

Commit f01a605

Browse files
yafengioyafengio
authored
style: ✨ optimize import order and more readable. (#1220)
* style: ✨ optimize import order and more readable. * fix: 🐛 goimports check failed.
1 parent fc119ce commit f01a605

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+77
-28
lines changed

‎cmd/bbr/health.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"google.golang.org/grpc/codes"
2525
healthPb "google.golang.org/grpc/health/grpc_health_v1"
2626
"google.golang.org/grpc/status"
27+
2728
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2829
)
2930

‎cmd/epp/runner/health.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"google.golang.org/grpc/codes"
2525
healthPb "google.golang.org/grpc/health/grpc_health_v1"
2626
"google.golang.org/grpc/status"
27+
2728
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
2829
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2930
)

‎conformance/conformance.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ import (
3030
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3131
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
33-
"k8s.io/apimachinery/pkg/types"
34-
"k8s.io/apimachinery/pkg/util/wait"
35-
clientset "k8s.io/client-go/kubernetes"
36-
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
3733

3834
// Import runtime package for scheme creation
3935
"k8s.io/apimachinery/pkg/runtime"
36+
"k8s.io/apimachinery/pkg/types"
4037
"k8s.io/apimachinery/pkg/util/sets"
38+
"k8s.io/apimachinery/pkg/util/wait"
39+
clientset "k8s.io/client-go/kubernetes"
40+
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
4141
"sigs.k8s.io/controller-runtime/pkg/client"
4242
k8sconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
4343

@@ -50,21 +50,18 @@ import (
5050
"sigs.k8s.io/gateway-api/conformance/utils/tlog"
5151
"sigs.k8s.io/gateway-api/pkg/features"
5252

53+
// Import the Inference Extension API types
54+
inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
55+
inferencev1alpha2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2"
56+
5357
// Import the test definitions package to access the ConformanceTests slice
5458
"sigs.k8s.io/gateway-api-inference-extension/conformance/tests"
55-
"sigs.k8s.io/gateway-api-inference-extension/version"
56-
5759
// Import test packages using blank identifier
5860
// This triggers the init() functions in these packages, which register the tests
5961
// by appending them to the tests.ConformanceTests slice.
6062
_ "sigs.k8s.io/gateway-api-inference-extension/conformance/tests/basic"
61-
// TODO: Add blank imports for other test categories as they are created.
62-
// _ "sigs.k8s.io/gateway-api-inference-extension/conformance/tests/model_routing"
63-
64-
// Import the Inference Extension API types
65-
inferencev1 "sigs.k8s.io/gateway-api-inference-extension/api/v1"
66-
inferencev1alpha2 "sigs.k8s.io/gateway-api-inference-extension/apix/v1alpha2"
6763
inferenceconfig "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config"
64+
"sigs.k8s.io/gateway-api-inference-extension/version"
6865
)
6966

7067
const (

‎conformance/tests/basic/gateway_following_epp_routing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626
"github.com/stretchr/testify/require"
2727
"golang.org/x/sync/errgroup"
2828
"k8s.io/apimachinery/pkg/types"
29+
gwhttp "sigs.k8s.io/gateway-api/conformance/utils/http"
2930
"sigs.k8s.io/gateway-api/conformance/utils/suite"
3031
"sigs.k8s.io/gateway-api/pkg/features"
3132

3233
"sigs.k8s.io/gateway-api-inference-extension/conformance/tests"
3334
k8sutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes"
3435
"sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic"
3536
trafficutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic"
36-
gwhttp "sigs.k8s.io/gateway-api/conformance/utils/http"
3737
)
3838

3939
func init() {

‎conformance/tests/basic/inferencepool_invalid_epp_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121

2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
"k8s.io/apimachinery/pkg/types"
24-
inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1"
2524
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
2625
"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
2726
"sigs.k8s.io/gateway-api/conformance/utils/suite"
2827
"sigs.k8s.io/gateway-api/pkg/features"
2928

29+
inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1"
3030
"sigs.k8s.io/gateway-api-inference-extension/conformance/tests"
3131
k8sutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes"
3232
trafficutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic"

‎conformance/utils/config/timing.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ package config
1919
import (
2020
"time"
2121

22-
// Import the upstream Gateway API timeout config
23-
2422
gatewayconfig "sigs.k8s.io/gateway-api/conformance/utils/config"
2523
)
2624

‎conformance/utils/kubernetes/helpers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import (
3333
"k8s.io/apimachinery/pkg/types"
3434
"k8s.io/apimachinery/pkg/util/wait"
3535
"sigs.k8s.io/controller-runtime/pkg/client"
36-
37-
inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1"
38-
"sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config"
3936
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
4037
gatewayapiconfig "sigs.k8s.io/gateway-api/conformance/utils/config"
4138
gatewayk8sutils "sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
39+
40+
inferenceapi "sigs.k8s.io/gateway-api-inference-extension/api/v1"
41+
"sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config"
4242
)
4343

4444
// checkCondition is a helper function similar to findConditionInList or CheckCondition

‎pkg/bbr/handlers/request.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
eppb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2626
extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
2727
"sigs.k8s.io/controller-runtime/pkg/log"
28+
2829
"sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/metrics"
2930
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3031
)

‎pkg/bbr/handlers/request_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"google.golang.org/protobuf/testing/protocmp"
2929
metricsutils "k8s.io/component-base/metrics/testutil"
3030
crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
31+
3132
"sigs.k8s.io/gateway-api-inference-extension/pkg/bbr/metrics"
3233
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3334
)

‎pkg/bbr/handlers/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"google.golang.org/grpc/codes"
2727
"google.golang.org/grpc/status"
2828
"sigs.k8s.io/controller-runtime/pkg/log"
29+
2930
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3031
requtil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/request"
3132
)

0 commit comments

Comments
 (0)