Add conversion to properly parse query parameter propagationPolicy

roycaihw · roycaihw · commit 294e00c66908 · 2018-05-04T13:42:28.000-07:00
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/conversion.go
@@ -75,6 +75,8 @@ func AddConversionFuncs(scheme *runtime.Scheme) error {
 		Convert_unversioned_LabelSelector_to_map,
 
 		Convert_Slice_string_To_Slice_int32,
+
+		Convert_Slice_string_To_v1_DeletionPropagation,
 	)
 }
 
@@ -304,3 +306,13 @@ func Convert_Slice_string_To_Slice_int32(in *[]string, out *[]int32, s conversio
 	}
 	return nil
 }
+
+// Convert_Slice_string_To_v1_DeletionPropagation allows converting a URL query parameter propagationPolicy
+func Convert_Slice_string_To_v1_DeletionPropagation(input *[]string, out *DeletionPropagation, s conversion.Scope) error {
+	if len(*input) > 0 {
+		*out = DeletionPropagation((*input)[0])
+	} else {
+		*out = ""
+	}
+	return nil
+}
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/conversion_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/conversion_test.go
@@ -47,3 +47,38 @@ func TestMapToLabelSelectorRoundTrip(t *testing.T) {
 		}
 	}
 }
+
+func TestConvertSliceStringToDeletionPropagation(t *testing.T) {
+	tcs := []struct {
+		Input  []string
+		Output v1.DeletionPropagation
+	}{
+		{
+			Input:  nil,
+			Output: "",
+		},
+		{
+			Input:  []string{},
+			Output: "",
+		},
+		{
+			Input:  []string{"foo"},
+			Output: "foo",
+		},
+		{
+			Input:  []string{"bar", "foo"},
+			Output: "bar",
+		},
+	}
+
+	for _, tc := range tcs {
+		var dp v1.DeletionPropagation
+		if err := v1.Convert_Slice_string_To_v1_DeletionPropagation(&tc.Input, &dp, nil); err != nil {
+			t.Errorf("Convert_Slice_string_To_v1_DeletionPropagation(%#v): %v", tc.Input, err)
+			continue
+		}
+		if !apiequality.Semantic.DeepEqual(dp, tc.Output) {
+			t.Errorf("slice string to DeletionPropagation conversion failed: got %v; want %v", dp, tc.Output)
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,8 @@ func AddConversionFuncs(scheme *runtime.Scheme) error {`
`75`	`75`	`Convert_unversioned_LabelSelector_to_map,`
`76`	`76`
`77`	`77`	`Convert_Slice_string_To_Slice_int32,`
	`78`	`+`
	`79`	`+ Convert_Slice_string_To_v1_DeletionPropagation,`
`78`	`80`	`)`
`79`	`81`	`}`
`80`	`82`
`@@ -304,3 +306,13 @@ func Convert_Slice_string_To_Slice_int32(in []string, out []int32, s conversio`
`304`	`306`	`}`
`305`	`307`	`return nil`
`306`	`308`	`}`
	`309`	`+`
	`310`	`+// Convert_Slice_string_To_v1_DeletionPropagation allows converting a URL query parameter propagationPolicy`
	`311`	`+func Convert_Slice_string_To_v1_DeletionPropagation(input []string, out DeletionPropagation, s conversion.Scope) error {`
	`312`	`+ if len(*input) > 0 {`
	`313`	`+ out = DeletionPropagation((input)[0])`
	`314`	`+ } else {`
	`315`	`+ *out = ""`
	`316`	`+ }`
	`317`	`+ return nil`
	`318`	`+}`