Merge pull request #447 from rramkumar1/master

Export getPatchBytes in pkg/util

pkg/utils/finalizer.go

@@ -40,9 +40,9 @@ func hasFinalizer(m meta_v1.ObjectMeta, key string) bool {
 	return slice.ContainsString(m.Finalizers, key, nil)
 }
 
-// getPatchBytes returns a patch which is the difference between the old and new objects.
+// GetPatchBytes returns a patch which is the difference between the old and new objects.
 // Note: refStruct is a empty struct of the type which the patch is being generated for.
-func getPatchBytes(old interface{}, cur interface{}, refStruct interface{}) ([]byte, error) {
+func GetPatchBytes(old interface{}, cur interface{}, refStruct interface{}) ([]byte, error) {
 	oldBytes, err := json.Marshal(old)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal old object: %v", err)

pkg/utils/finalizer_test.go

@@ -28,24 +28,24 @@ func TestGetPatchBytes(t *testing.T) {
 			Finalizers: []string{"foo"},
 		},
 	}
-	b, err := getPatchBytes(ing, updated, extensions.Ingress{})
+	b, err := GetPatchBytes(ing, updated, extensions.Ingress{})
 	if err != nil {
 		t.Fatal(err)
 	}
 	expected := `{"metadata":{"finalizers":["foo"]}}`
 	if string(b) != expected {
-		t.Errorf("getPatchBytes(%+v, %+v) = %s ; want %s", ing, updated, string(b), expected)
+		t.Errorf("GetPatchBytes(%+v, %+v) = %s ; want %s", ing, updated, string(b), expected)
 	}
 
 	// Patch an Ingress with the finalizer removed
 	ing = updated
 	updated = &extensions.Ingress{}
-	b, err = getPatchBytes(ing, updated, extensions.Ingress{})
+	b, err = GetPatchBytes(ing, updated, extensions.Ingress{})
 	if err != nil {
 		t.Fatal(err)
 	}
 	expected = `{"metadata":{"finalizers":null}}`
 	if string(b) != expected {
-		t.Errorf("getPatchBytes(%+v, %+v) = %s ; want %s", ing, updated, string(b), expected)
+		t.Errorf("GetPatchBytes(%+v, %+v) = %s ; want %s", ing, updated, string(b), expected)
 	}
 }