simplify Convert func

Author: lantoli

internal/cli/adv2new/adv2new.go

@@ -10,8 +10,8 @@ import (
 
 func Builder() *cobra.Command {
 	o := &cli.BaseOpts{
-		Fs:        afero.NewOsFs(),
-		Converter: cli.ConvertFunc(convert.AdvancedClusterToNew),
+		Fs:      afero.NewOsFs(),
+		Convert: convert.AdvancedClusterToNew,
 	}
 	cmd := &cobra.Command{
 		Use:   "advancedClusterToNew",

internal/cli/clu2adv/clu2adv.go

@@ -17,9 +17,9 @@ func Builder() *cobra.Command {
 			Fs: afero.NewOsFs(),
 		},
 	}
-	o.Converter = cli.ConvertFunc(func(config []byte) ([]byte, error) {
+	o.Convert = func(config []byte) ([]byte, error) {
 		return convert.ClusterToAdvancedCluster(config, o.includeMoved)
-	})
+	}
 	cmd := &cobra.Command{
 		Use:   "clusterToAdvancedCluster",
 		Short: "Convert cluster to advanced_cluster preview provider 2.0.0",

internal/cli/common.go

@@ -9,22 +9,12 @@ import (
 	"github.com/spf13/afero"
 )
 
-// Converter defines the interface for different conversion functions.
-type Converter interface {
-	Convert(config []byte) ([]byte, error)
-}
-
-// ConvertFunc is a function type that implements the Converter interface.
-type ConvertFunc func(config []byte) ([]byte, error)
-
-func (f ConvertFunc) Convert(config []byte) ([]byte, error) {
-	return f(config)
-}
+type ConvertFn func(config []byte) ([]byte, error)
 
 // BaseOpts contains common functionality for CLI commands that convert files.
 type BaseOpts struct {
 	Fs            afero.Fs
-	Converter     Converter
+	Convert       ConvertFn
 	File          string
 	Output        string
 	ReplaceOutput bool
@@ -60,7 +50,7 @@ func (o *BaseOpts) generateFile(allowParseErrors bool) error {
 		return fmt.Errorf("failed to read file %s: %w", o.File, err)
 	}
 
-	outConfig, err := o.Converter.Convert(inConfig)
+	outConfig, err := o.Convert(inConfig)
 	if err != nil {
 		if allowParseErrors {
 			outConfig = []byte("# CONVERT ERROR: " + err.Error() + "\n\n")