Merge pull request #2171 from jgkim/hotfix/post-processor-only-except

Fixes 'unknown configuration key' errors for 'only' and 'except'

template/parse.go

@@ -134,6 +134,8 @@ func (r *rawTemplate) Template() (*Template, error) {
 			}
 
 			// Set the configuration
+			delete(c, "except")
+			delete(c, "only")
 			delete(c, "keep_input_artifact")
 			delete(c, "type")
 			if len(c) > 0 {

template/parse_test.go

@@ -174,6 +174,40 @@ func TestParse(t *testing.T) {
 			false,
 		},
 
+		{
+			"parse-pp-only.json",
+			&Template{
+				PostProcessors: [][]*PostProcessor{
+					[]*PostProcessor{
+						&PostProcessor{
+							Type: "foo",
+							OnlyExcept: OnlyExcept{
+								Only: []string{"bar"},
+							},
+						},
+					},
+				},
+			},
+			false,
+		},
+
+		{
+			"parse-pp-except.json",
+			&Template{
+				PostProcessors: [][]*PostProcessor{
+					[]*PostProcessor{
+						&PostProcessor{
+							Type: "foo",
+							OnlyExcept: OnlyExcept{
+								Except: []string{"bar"},
+							},
+						},
+					},
+				},
+			},
+			false,
+		},
+
 		{
 			"parse-pp-string.json",
 			&Template{

template/test-fixtures/parse-pp-except.json

@@ -0,0 +1,8 @@
+{
+    "post-processors": [
+        {
+            "type": "foo",
+            "except": ["bar"]
+        }
+    ]
+}

template/test-fixtures/parse-pp-only.json

@@ -0,0 +1,8 @@
+{
+    "post-processors": [
+        {
+            "type": "foo",
+            "only": ["bar"]
+        }
+    ]
+}