fixup! refactor: Remove unused decoder property in meta generators

nutanix-cloud-native · Oct 11, 2023 · afce9b1 · afce9b1
1 parent ef44858
commit afce9b1
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 11 deletions.
diff --git a/common/pkg/capi/clustertopology/handlers/mutation/meta.go b/common/pkg/capi/clustertopology/handlers/mutation/meta.go
@@ -36,18 +36,15 @@ type MetaMutator interface {
 
 type metaGeneratePatches struct {
 	name     string
-	decoder  runtime.Decoder
 	mutators []MetaMutator
 }
 
 func NewMetaGeneratePatchesHandler(
 	name string,
-	decoder runtime.Decoder,
 	mutators ...MetaMutator,
 ) handlers.Named {
 	return metaGeneratePatches{
 		name:     name,
-		decoder:  decoder,
 		mutators: mutators,
 	}
 }

diff --git a/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go b/common/pkg/capi/clustertopology/handlers/mutation/meta_test.go
@@ -19,7 +19,6 @@ import (
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/apis"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
@@ -220,7 +219,7 @@ func TestMetaGeneratePatches(t *testing.T) {
 
 			g := gomega.NewWithT(t)
 
-			h := NewMetaGeneratePatchesHandler("", apis.CAPIDecoder(), tt.mutaters...).(GeneratePatches)
+			h := NewMetaGeneratePatchesHandler("", tt.mutaters...).(GeneratePatches)
 
 			resp := &runtimehooksv1.GeneratePatchesResponse{}
 			h.GeneratePatches(context.Background(), &runtimehooksv1.GeneratePatchesRequest{

diff --git a/pkg/handlers/aws/mutation/metapatch_handler.go b/pkg/handlers/aws/mutation/metapatch_handler.go
@@ -6,7 +6,6 @@ package mutation
 import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/apis"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation/cni/calico"
@@ -30,7 +29,6 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 
 	return mutation.NewMetaGeneratePatchesHandler(
 		"awsClusterConfigPatch",
-		apis.CAPADecoder(),
 		patchHandlers...,
 	)
 }
@@ -44,7 +42,6 @@ func MetaWorkerPatchHandler() handlers.Named {
 
 	return mutation.NewMetaGeneratePatchesHandler(
 		"awsWorkerConfigPatch",
-		apis.CAPADecoder(),
 		patchHandlers...,
 	)
 }
diff --git a/pkg/handlers/docker/mutation/metapatch_handler.go b/pkg/handlers/docker/mutation/metapatch_handler.go
@@ -6,7 +6,6 @@ package mutation
 import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/apis"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/mutation/customimage"
@@ -24,7 +23,6 @@ func MetaPatchHandler(mgr manager.Manager) handlers.Named {
 
 	return mutation.NewMetaGeneratePatchesHandler(
 		"dockerClusterConfigPatch",
-		apis.CAPDDecoder(),
 		patchHandlers...,
 	)
 }
@@ -37,7 +35,6 @@ func MetaWorkerPatchHandler() handlers.Named {
 
 	return mutation.NewMetaGeneratePatchesHandler(
 		"dockerWorkerConfigPatch",
-		apis.CAPDDecoder(),
 		patchHandlers...,
 	)
 }