chore(cobra): cleanup up leftover Cobra code (#6448)

Author: vflaux

internal/flags/binders.go

@@ -17,7 +17,6 @@ limitations under the License.
 package flags
 
 import (
-	"fmt"
 	"regexp"
 	"strconv"
 	"time"
@@ -108,37 +107,3 @@ func (b *KingpinBinder) RegexpVar(name, help string, def *regexp.Regexp, target
 	}
 	b.App.Flag(name, help).Default(defStr).RegexpVar(target)
 }
-
-type regexpValue struct {
-	target **regexp.Regexp
-}
-
-func (rv *regexpValue) String() string {
-	if rv == nil || rv.target == nil || *rv.target == nil {
-		return ""
-	}
-	return (*rv.target).String()
-}
-
-func (rv *regexpValue) Set(s string) error {
-	re, err := regexp.Compile(s)
-	if err != nil {
-		return err
-	}
-	*rv.target = re
-	return nil
-}
-
-func (rv *regexpValue) Type() string { return "regexp" }
-
-type regexpSetter interface {
-	Set(string) error
-}
-
-func setRegexpDefault(rs regexpSetter, def *regexp.Regexp, name string) {
-	if def != nil {
-		if err := rs.Set(def.String()); err != nil {
-			panic(fmt.Errorf("invalid default regexp for flag %s: %w", name, err))
-		}
-	}
-}

internal/flags/binders_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package flags
 
 import (
-	"errors"
 	"regexp"
 	"testing"
 	"time"
@@ -27,10 +26,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-type badSetter struct{}
-
-func (b *badSetter) Set(_ string) error { return errors.New("bad default") }
-
 func TestKingpinBinderParsesAllTypes(t *testing.T) {
 	app := kingpin.New("test", "")
 	b := NewKingpinBinder(app)
@@ -95,24 +90,20 @@ func TestKingpinBinderStringsVarNoDefaultAndBoolDefaultFalse(t *testing.T) {
 	assert.False(t, b2)
 }
 
-func TestCobraRegexValueSetStringType(t *testing.T) {
-	var r *regexp.Regexp
-	rv := &regexpValue{target: &r}
+func TestKingpinBinderStringMapVar(t *testing.T) {
+	app := kingpin.New("test", "")
+	b := NewKingpinBinder(app)
 
-	require.Equal(t, "regexp", rv.Type())
-	// empty when target nil
-	assert.Empty(t, rv.String())
+	labels := map[string]string{}
+	b.StringMapVar("label", "map flag", &labels)
 
-	// invalid pattern returns error
-	err := rv.Set("(")
-	require.Error(t, err)
-
-	// valid pattern sets target
-	err = rv.Set("^foo$")
+	_, err := app.Parse([]string{"--label=env=prod", "--label=team=dns"})
 	require.NoError(t, err)
-	require.NotNil(t, r)
-	assert.Equal(t, "^foo$", r.String())
-	assert.Equal(t, "^foo$", rv.String())
+
+	assert.Equal(t, map[string]string{
+		"env":  "prod",
+		"team": "dns",
+	}, labels)
 }
 
 func TestKingpinRegexpVarDefaultAndParse(t *testing.T) {
@@ -157,9 +148,3 @@ func TestKingpinStringsEnumVarWithAndWithoutDefault(t *testing.T) {
 	require.NoError(t, err)
 	assert.ElementsMatch(t, []string{"a", "c"}, vals2)
 }
-
-func TestSetRegexDefaultPanicsOnInvalidDefault(t *testing.T) {
-	bs := &badSetter{}
-	def := regexp.MustCompile("^")
-	require.Panics(t, func() { setRegexpDefault(bs, def, "flag") })
-}

pkg/apis/externaldns/types_test.go

@@ -569,12 +569,6 @@ func TestParseFlags(t *testing.T) {
 	}
 }
 
-func TestParseFlagsCobraExecuteError(t *testing.T) {
-	cfg := NewConfig()
-	err := cfg.ParseFlags([]string{"--cli-backend=cobra", "--unknown-flag"})
-	require.Error(t, err)
-}
-
 func TestParseFlagsKingpinParseError(t *testing.T) {
 	cfg := NewConfig()
 	err := cfg.ParseFlags([]string{"--unknown-flag"})
@@ -620,61 +614,7 @@ func TestParseFlagsDefaultKingpin(t *testing.T) {
 	assert.Equal(t, "default", cfg.OCPRouterName)
 }
 
-// When EXTERNAL_DNS_CLI=cobra is set, cobra path should parse the subset of
-// flags it currently binds, yielding parity with kingpin for those fields.
-func TestParseFlagsCobraSwitchParitySubset(t *testing.T) {
-	args := []string{
-		"--provider=aws",
-		"--source=service",
-		"--source=ingress",
-		"--server=http://127.0.0.1:8080",
-		"--kubeconfig=/some/path",
-		"--request-timeout=2s",
-		"--namespace=ns",
-		"--domain-filter=example.org",
-		"--domain-filter=company.com",
-		"--openshift-router-name=default",
-	}
-
-	// Kingpin baseline
-	cfgK := NewConfig()
-	require.NoError(t, cfgK.ParseFlags(args))
-
-	// Cobra path via env switch
-	t.Setenv("EXTERNAL_DNS_CLI", "cobra")
-	cfgC := NewConfig()
-	require.NoError(t, cfgC.ParseFlags(args))
-
-	// Compare selected fields bound in cobra
-	assert.Equal(t, cfgK.Provider, cfgC.Provider)
-	assert.ElementsMatch(t, cfgK.Sources, cfgC.Sources)
-	assert.Equal(t, cfgK.APIServerURL, cfgC.APIServerURL)
-	assert.Equal(t, cfgK.KubeConfig, cfgC.KubeConfig)
-	assert.Equal(t, cfgK.KubeAPIRequestTimeout, cfgC.KubeAPIRequestTimeout)
-	assert.Equal(t, cfgK.Namespace, cfgC.Namespace)
-	assert.ElementsMatch(t, cfgK.DomainFilter, cfgC.DomainFilter)
-	assert.Equal(t, cfgK.OCPRouterName, cfgC.OCPRouterName)
-}
-
-func TestParseFlagsCliFlagOverridesEnv(t *testing.T) {
-	// Env requests cobra; CLI flag forces kingpin.
-	t.Setenv("EXTERNAL_DNS_CLI", "cobra")
-	args := []string{
-		"--provider=aws",
-		"--source=service",
-		// Flag not bound in Cobra newCobraCommand path; will error if cobra is used.
-		"--log-format=json",
-	}
-
-	cfg := NewConfig()
-	require.NoError(t, cfg.ParseFlags(args))
-	assert.Equal(t, ProviderAWS, cfg.Provider)
-	assert.ElementsMatch(t, []string{"service"}, cfg.Sources)
-	assert.Equal(t, "json", cfg.LogFormat)
-}
-
 func TestParseFlagsCliFlagSeparatedValue(t *testing.T) {
-	// Support "--cli-backend", "cobra" form as well.
 	args := []string{
 		"--provider=aws",
 		"--source=service",