remove nil check

[#140880833]

Signed-off-by: Zachary Gershman <[email protected]>

Author: Kevin Kelani

commands/errands.go

@@ -62,24 +62,18 @@ func (e Errands) Execute(args []string) error {
 	for _, errand := range errandsOutput.Errands {
 		var postDeploy, preDelete string
 
-		if errand.PreDelete != nil {
-			switch p := errand.PreDelete.(type) {
-			case string:
-				preDelete = p
-			case bool:
-				preDelete = strconv.FormatBool(p)
-			}
-		} else {
-			preDelete = ""
+		switch p := errand.PreDelete.(type) {
+		case string:
+			preDelete = p
+		case bool:
+			preDelete = strconv.FormatBool(p)
 		}
 
-		if errand.PostDeploy != nil {
-			switch p := errand.PostDeploy.(type) {
-			case string:
-				postDeploy = p
-			case bool:
-				postDeploy = strconv.FormatBool(p)
-			}
+		switch p := errand.PostDeploy.(type) {
+		case string:
+			postDeploy = p
+		case bool:
+			postDeploy = strconv.FormatBool(p)
 		}
 
 		e.tableWriter.Append([]string{errand.Name, postDeploy, preDelete})

commands/errands_test.go

@@ -33,6 +33,8 @@ var _ = Describe("Errands", func() {
 					{Name: "first-errand", PostDeploy: "true"},
 					{Name: "second-errand", PostDeploy: "false"},
 					{Name: "third-errand", PreDelete: true},
+					{Name: "will-not-appear", PreDelete: nil},
+					{Name: "also-bad", PostDeploy: nil},
 				},
 			}, nil)
 
@@ -55,10 +57,12 @@ var _ = Describe("Errands", func() {
 			Expect(tableWriter.SetHeaderCallCount()).To(Equal(1))
 			Expect(tableWriter.SetHeaderArgsForCall(0)).To(Equal([]string{"Name", "Post Deploy Enabled", "Pre Delete Enabled"}))
 
-			Expect(tableWriter.AppendCallCount()).To(Equal(3))
+			Expect(tableWriter.AppendCallCount()).To(Equal(5))
 			Expect(tableWriter.AppendArgsForCall(0)).To(Equal([]string{"first-errand", "true", ""}))
 			Expect(tableWriter.AppendArgsForCall(1)).To(Equal([]string{"second-errand", "false", ""}))
 			Expect(tableWriter.AppendArgsForCall(2)).To(Equal([]string{"third-errand", "", "true"}))
+			Expect(tableWriter.AppendArgsForCall(3)).To(Equal([]string{"will-not-appear", "", ""}))
+			Expect(tableWriter.AppendArgsForCall(4)).To(Equal([]string{"also-bad", "", ""}))
 
 			Expect(tableWriter.RenderCallCount()).To(Equal(1))
 		})