mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-14 10:30:59 +00:00
Merge pull request #4242 from natasha41575/configmapissue
fix issue with quotations being dropped in configmap generation
This commit is contained in:
@@ -549,3 +549,26 @@ metadata:
|
|||||||
name: testing-tt4769fb52
|
name: testing-tt4769fb52
|
||||||
`)
|
`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// regression test for https://github.com/kubernetes-sigs/kustomize/issues/4233
|
||||||
|
func TestDataEndsWithQuotes(t *testing.T) {
|
||||||
|
th := kusttest_test.MakeHarness(t)
|
||||||
|
th.WriteK(".", `
|
||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
configMapGenerator:
|
||||||
|
- name: test
|
||||||
|
literals:
|
||||||
|
- TEST=this is a 'test'
|
||||||
|
`)
|
||||||
|
|
||||||
|
m := th.Run(".", th.MakeDefaultOptions())
|
||||||
|
th.AssertActualEqualsExpected(
|
||||||
|
m, `apiVersion: v1
|
||||||
|
data:
|
||||||
|
TEST: this is a 'test'
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: test-k9cc55dfm5
|
||||||
|
`)
|
||||||
|
}
|
||||||
|
|||||||
14
api/kv/kv.go
14
api/kv/kv.go
@@ -209,5 +209,17 @@ func parseLiteralSource(source string) (keyName, value string, err error) {
|
|||||||
if len(items) != 2 {
|
if len(items) != 2 {
|
||||||
return "", "", fmt.Errorf("invalid literal source %v, expected key=value", source)
|
return "", "", fmt.Errorf("invalid literal source %v, expected key=value", source)
|
||||||
}
|
}
|
||||||
return items[0], strings.Trim(items[1], "\"'"), nil
|
return items[0], removeQuotes(items[1]), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// removeQuotes removes the surrounding quotes from the provided string only if it is surrounded on both sides
|
||||||
|
// rather than blindly trimming all quotation marks on either side.
|
||||||
|
func removeQuotes(str string) string {
|
||||||
|
if len(str) == 0 || str[0] != str[len(str)-1] {
|
||||||
|
return str
|
||||||
|
}
|
||||||
|
if str[0] == '"' || str[0] == '\'' {
|
||||||
|
return str[1 : len(str)-1]
|
||||||
|
}
|
||||||
|
return str
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user