added flag pkgs tets

Author: GrigoriyMikhalkin

cmdutils/switches/switches.go

@@ -127,7 +127,9 @@ func (s *Switches) setSettings(settings []string) {
 	}
 
 	if !isDefault {
-		s.settings = make(map[string]bool)
+		for k := range s.settings {
+			s.settings[k] = false
+		}
 	}
 
 	for _, v := range settings {

cmdutils/switches/switches_test.go

@@ -14,55 +14,125 @@
 package switches
 
 import (
+	"flag"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/spf13/pflag"
+	"sigs.k8s.io/kustomize/kyaml/sets"
 )
 
 var _ = Describe("CMD Switches", func() {
-	Context("Setting switches values", func() {
+	Context("Testing Switches interface", func() {
 		It("should disable runner", func() {
 			s := New([]string{"runner-a", Disable("runner-b")})
 			Expect(s.Enabled("runner-a")).To(BeTrue())
 			Expect(s.Enabled("runner-b")).To(BeFalse())
 		})
-		It("should reuse default settings", func() {
+		It("should return all items", func() {
 			s := New([]string{"runner-a", Disable("runner-b")})
-			defaults := make(map[string]bool, len(s.settings))
-			for k, v := range s.settings {
-				defaults[k] = v
-			}
-
-			By("updating settings with empty value")
-			Expect(s.Set("")).NotTo(HaveOccurred())
-			Expect(s.settings).To(Equal(defaults))
-
-			By("updating settings with *")
-			Expect(s.Set(DefaultValue)).NotTo(HaveOccurred())
-			Expect(s.settings).To(Equal(defaults))
+
+			expected := make(sets.String)
+			expected.Insert("runner-a", "runner-b")
+			Expect(s.All()).To(Equal(expected))
 		})
-		It("shouldn't reuse default settings", func() {
+		It("should return all disabled items", func() {
 			s := New([]string{"runner-a", Disable("runner-b")})
-			defaults := make(map[string]bool, len(s.settings))
-			for k, v := range s.settings {
-				defaults[k] = v
-			}
-
-			By("updating settings with new values")
-			Expect(s.Set("-runner-a,runner-b")).NotTo(HaveOccurred())
-			Expect(s.settings).ToNot(Equal(defaults))
+
+			expected := make(sets.String)
+			expected.Insert("runner-b")
+			Expect(s.DisabledByDefault()).To(Equal(expected))
 		})
-		It("overriding existing settings", func() {
+		It("should return string", func() {
 			s := New([]string{"runner-a", Disable("runner-b")})
-			defaults := make(map[string]bool, len(s.settings))
-			for k, v := range s.settings {
-				defaults[k] = v
-			}
-
-			By("overriding settings")
-			Expect(s.Set(DefaultValue + ",runner-b")).NotTo(HaveOccurred())
-			Expect(s.settings).ToNot(Equal(defaults))
-			defaults["runner-b"] = true
-			Expect(s.settings).To(Equal(defaults))
+
+			Expect(s.String()).To(Equal("map[runner-a:true runner-b:false]"))
+		})
+	})
+
+	Context("Testing flag package behavior", func() {
+		It("should keep default settings when no flag is passed", func() {
+			fs := flag.NewFlagSet("", flag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
+		})
+		It("should keep default settings when * is passed", func() {
+			fs := flag.NewFlagSet("", flag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=*"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
+		})
+		It("should override default settings", func() {
+			fs := flag.NewFlagSet("", flag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=runner-a,-runner-c"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeFalse())
+		})
+		It("should override some of default settings", func() {
+			fs := flag.NewFlagSet("", flag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=*,-runner-a"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeFalse())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
+		})
+	})
+
+	Context("Testing pflag package behavior", func() {
+		It("should keep default settings when no flag is passed", func() {
+			fs := pflag.NewFlagSet("", pflag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
+		})
+		It("should keep default settings when * is passed", func() {
+			fs := pflag.NewFlagSet("", pflag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=*"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
+		})
+		It("should override default settings", func() {
+			fs := pflag.NewFlagSet("", pflag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=runner-a,-runner-c"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeTrue())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeFalse())
+		})
+		It("should override some of default settings", func() {
+			fs := pflag.NewFlagSet("", pflag.ExitOnError)
+			controllers := New([]string{"runner-a", Disable("runner-b"), "runner-c"})
+			fs.Var(controllers, "controllers", "")
+
+			Expect(fs.Parse([]string{"--controllers=*,-runner-a"})).NotTo(HaveOccurred())
+			Expect(controllers.Enabled("runner-a")).To(BeFalse())
+			Expect(controllers.Enabled("runner-b")).To(BeFalse())
+			Expect(controllers.Enabled("runner-c")).To(BeTrue())
 		})
 	})
 })

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/google/addlicense v1.0.0
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.16.0
+	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.22.3
 	k8s.io/apimachinery v0.22.3
 	k8s.io/client-go v0.22.3