Merge pull request #14 from pusher/properly-deal-with-non-existent-ignored-paths

Properly deal with ignored paths in #getTemplateInput

Author: mthssdrbrg

pkg/quack/quack.go

@@ -212,9 +212,11 @@ func getTemplateInput(data []byte, ignoredPaths []string) ([]byte, error) {
 		patch := []byte(fmt.Sprintf(`[
 			{"op": "remove", "path": "%s"}
 		]`, path))
-		data, err = applyPatch(data, patch)
+		newData, err := applyPatch(data, patch)
 		if err != nil && !nonExistentPath(err) {
 			return nil, fmt.Errorf("error removing %s: %v", path, err)
+		} else if newData != nil {
+			data = newData
 		}
 	}
 

pkg/quack/quack_test.go

@@ -233,8 +233,9 @@ func TestGetTemplateInputRemovesIgnoredPaths(t *testing.T) {
 	object := testObject{
 		ObjectMeta: metav1.ObjectMeta{
 			Annotations: map[string]string{
-				"annotation":       "value",
-				"other/annotation": "bar",
+				"annotation":                "value",
+				"quack.pusher.com/template": "true",
+				"other/annotation":          "bar",
 			},
 		},
 		Foo: "bar",
@@ -253,18 +254,38 @@ func TestGetTemplateInputRemovesIgnoredPaths(t *testing.T) {
 	if err != nil {
 		assert.FailNowf(t, "jsonError", "Failed to marshal input: %v", err)
 	}
+	objectNoOtherRaw, err := json.Marshal(objectNoOtherAnnotation)
+	if err != nil {
+		assert.FailNowf(t, "jsonError", "Failed to marshal input: %v", err)
+	}
 
 	template, err := getTemplateInput(objectRaw, ignoredPaths)
 	if err != nil {
 		assert.FailNowf(t, "methodError", "Error in getTemplateInput: %v", err)
 	}
 
+	assert.NotNil(t, template, "template should not be nil")
+
 	templateObject := testObject{}
 	err = json.Unmarshal(template, &templateObject)
 	if err != nil {
 		assert.FailNowf(t, "jsonError", "Error in unmarshall: %v", err)
 	}
 	assert.Equal(t, objectNoOtherAnnotation, templateObject, "Object should have no ignored paths")
+
+	template, err = getTemplateInput(objectNoOtherRaw, ignoredPaths)
+	if err != nil {
+		assert.FailNowf(t, "methodError", "Error in getTemplateInput: %v", err)
+	}
+
+	assert.NotNil(t, template, "template should not be nil")
+
+	err = json.Unmarshal(template, &templateObject)
+	if err != nil {
+		assert.FailNowf(t, "jsonError", "Error in unmarshall: %v", err)
+	}
+
+	assert.Equal(t, objectNoOtherAnnotation, templateObject, "Object should have no ignored paths")
 }
 
 func TestGetTemplateInputRemovesStatus(t *testing.T) {