Merge pull request #279 from Liujingfang1/quote

fix the double quotation problem in ConfigMapGenerator
This commit is contained in:
Jeff Regan
2018-08-23 10:35:34 -07:00
committed by GitHub
3 changed files with 7 additions and 4 deletions

View File

@@ -212,6 +212,5 @@ func parseLiteralSource(source string) (keyName, value string, err error) {
if len(items) != 2 {
return "", "", fmt.Errorf("invalid literal source %v, expected key=value", source)
}
return items[0], items[1], nil
return items[0], strings.Trim(items[1], "\"'"), nil
}

View File

@@ -90,6 +90,8 @@ func makeLiteralConfigMap(name string) *corev1.ConfigMap {
Data: map[string]string{
"a": "x",
"b": "y",
"c": "Hello World",
"d": "true",
},
}
}
@@ -127,7 +129,7 @@ func TestConstructConfigMap(t *testing.T) {
input: types.ConfigMapArgs{
Name: "literalConfigMap",
DataSources: types.DataSources{
LiteralSources: []string{"a=x", "b=y"},
LiteralSources: []string{"a=x", "b=y", "c=\"Hello World\"", "d='true'"},
},
},
expected: makeLiteralConfigMap("literalConfigMap"),

View File

@@ -104,7 +104,7 @@ BAR=baz
{
Name: "literalConfigMap",
DataSources: types.DataSources{
LiteralSources: []string{"a=x", "b=y"},
LiteralSources: []string{"a=x", "b=y", "c=\"Good Morning\"", "d=\"false\""},
},
},
},
@@ -120,6 +120,8 @@ BAR=baz
"data": map[string]interface{}{
"a": "x",
"b": "y",
"c": "Good Morning",
"d": "false",
},
}).SetBehavior(resource.BehaviorCreate),
},