Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 4f1a4a1

Browse files
committed
test: fix linting errors
1 parent fb1fb65 commit 4f1a4a1

File tree

10 files changed

+12
-16
lines changed

10 files changed

+12
-16
lines changed

pkg/handlers/aws/mutation/ami/inject_suite_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package ami
25

36
import (

pkg/handlers/aws/mutation/ami/inject_worker_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package ami
66
import (
77
. "github.com/onsi/ginkgo/v2"
88
"github.com/onsi/gomega"
9-
109
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1110
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1211

pkg/handlers/aws/mutation/cni/calico/inject_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ package calico
66
import (
77
"testing"
88

9-
capav1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
109
. "github.com/onsi/ginkgo/v2"
1110
"github.com/onsi/gomega"
12-
1311
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1412

13+
capav1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1514
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
1615
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1716
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest"

pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
. "github.com/onsi/ginkgo/v2"
1010
"github.com/onsi/gomega"
11-
. "github.com/onsi/gomega"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312

1413
capav1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
@@ -20,7 +19,7 @@ import (
2019
)
2120

2221
func TestControlPlaneLoadBalancerPatch(t *testing.T) {
23-
RegisterFailHandler(Fail)
22+
gomega.RegisterFailHandler(Fail)
2423
RunSpecs(t, "AWS ControlPlane LoadBalancer mutator suite")
2524
}
2625

pkg/handlers/aws/mutation/iaminstanceprofile/inject_suite_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package iaminstanceprofile
25

36
import (

pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package iaminstanceprofile
66
import (
77
. "github.com/onsi/ginkgo/v2"
88
"github.com/onsi/gomega"
9-
109
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1110
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1211

pkg/handlers/aws/mutation/instancetype/inject_suite_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package instancetype
25

36
import (

pkg/handlers/aws/mutation/instancetype/inject_worker_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package instancetype
66
import (
77
. "github.com/onsi/ginkgo/v2"
88
"github.com/onsi/gomega"
9-
109
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1110
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1211

pkg/handlers/aws/mutation/metapatch_handler_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"sigs.k8s.io/controller-runtime/pkg/manager"
1010

1111
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
12-
1312
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig"
1413
auditpolicytests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/auditpolicy/tests"
1514
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/etcd"
@@ -32,12 +31,6 @@ func metaPatchGeneratorFunc(mgr manager.Manager) func() mutation.GeneratePatches
3231
}
3332
}
3433

35-
func workerPatchGeneratorFunc() func() mutation.GeneratePatches {
36-
return func() mutation.GeneratePatches {
37-
return MetaWorkerPatchHandler().(mutation.GeneratePatches)
38-
}
39-
}
40-
4134
func TestGeneratePatches(t *testing.T) {
4235
t.Parallel()
4336

pkg/handlers/aws/mutation/network/inject_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
. "github.com/onsi/ginkgo/v2"
1010
"github.com/onsi/gomega"
11-
. "github.com/onsi/gomega"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312

1413
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
@@ -19,7 +18,7 @@ import (
1918
)
2019

2120
func TestNetworkPatch(t *testing.T) {
22-
RegisterFailHandler(Fail)
21+
gomega.RegisterFailHandler(Fail)
2322
RunSpecs(t, "AWS Network mutator suite")
2423
}
2524

0 commit comments

Comments
 (0)