fix: string helper cleanup

Author: alexeldeib

pkg/controller/controllerutil/controllerutil.go

@@ -173,7 +173,7 @@ type MutateFn func() error
 // AddFinalizer accepts a metav1 object and adds the provided finalizer if not present.
 func AddFinalizer(o metav1.Object, finalizer string) {
 	newFinalizers := AddString(o.GetFinalizers(), finalizer)
-	o.SetFinalizers(append(newFinalizers, finalizer))
+	o.SetFinalizers(newFinalizers)
 }
 
 // AddFinalizerIfPossible tries to convert a runtime object to a metav1 object and add the provided finalizer.
@@ -206,24 +206,22 @@ func RemoveFinalizerIfPossible(o runtime.Object, finalizer string) error {
 
 // AddString returns a []string with s appended if it is not already found in the provided slice.
 func AddString(slice []string, s string) []string {
-	newSlice := make([]string, 0)
-	for i, item := range slice {
+	for _, item := range slice {
 		if item == s {
-			return append(newSlice, slice[i+1:]...)
+			return slice
 		}
-		newSlice = append(newSlice, item)
 	}
 	return append(slice, s)
 }
 
 // RemoveString returns a newly created []string that contains all items from slice that are not equal to s.
 func RemoveString(slice []string, s string) []string {
-	newSlice := make([]string, 0)
+	new := make([]string, 0)
 	for _, item := range slice {
 		if item == s {
 			continue
 		}
-		newSlice = append(newSlice, item)
+		new = append(new, item)
 	}
-	return newSlice
+	return new
 }

pkg/controller/controllerutil/controllerutil_test.go

@@ -308,20 +308,19 @@ var _ = Describe("Controllerutil", func() {
 		})
 
 		Describe("String Helpers", func() {
-			var testStrings []string
 			testString := "foobar"
 			It("should add the string when not present", func() {
-				testStrings = controllerutil.AddString(testStrings, testString)
+				testStrings := controllerutil.AddString(nil, testString)
 				Expect(testStrings).To(Equal([]string{testString}))
 			})
 
 			It("should not add the string when already present", func() {
-				testStrings = controllerutil.AddString(testStrings, testString)
+				testStrings := controllerutil.AddString([]string{testString}, testString)
 				Expect(testStrings).To(Equal([]string{testString}))
 			})
 
 			It("should remove string if present", func() {
-				testStrings = controllerutil.RemoveString(testStrings, testString)
+				testStrings := controllerutil.RemoveString([]string{testString}, testString)
 				Expect(testStrings).To(Equal([]string{}))
 			})
 		})