Isolate scalar quoting oddities to one test set.

The apimachinery code path, in its final marshalling
for output, calls Marshall

  https://github.com/go-yaml/yaml/blob/v2/yaml.go#L199

This code path (via apimachinery Unstructured types)
has no JSON schema tags

  https://yaml.org/spec/1.2/spec.html#id2803311

so it adds quotes to values that smell like
booleans and ints (e.g. `false` becomes `"false"`).

The kyaml code path, OTOH, uses such tags,
so generally does not quote ints and booleans.

This PR isolates this difference in behavior to
one set of tests (using data fields in configmaps
in api/krusty/configmaps_test.go) so that
they don't confuse other tests that cover
completely different behaviors.
This commit is contained in:
jregan
2020-12-23 16:23:45 -08:00
parent 1ffd790cfb
commit 1426137883
8 changed files with 172 additions and 76 deletions

View File

@@ -39,8 +39,8 @@ resources:
configMapGenerator:
- name: my-configmap
literals:
- testValue=1
- otherValue=10
- testValue=purple
- otherValue=green
`)
th.WriteF("/app/base/deploy.yaml", `
apiVersion: v1
@@ -64,8 +64,8 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- testValue=2
- compValue=5
- testValue=blue
- compValue=red
`)
th.WriteF("/app/comp/stub.yaml", `
apiVersion: v1
@@ -125,12 +125,12 @@ spec:
---
apiVersion: v1
data:
compValue: "5"
otherValue: "10"
testValue: "2"
compValue: red
otherValue: green
testValue: blue
kind: ConfigMap
metadata:
name: comp-my-configmap-kc6k2kmkh9
name: comp-my-configmap-97647ckcmg
---
apiVersion: v1
kind: Deployment
@@ -154,7 +154,7 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- otherValue=9
- otherValue=orange
`),
writeK("/app/prod", `
resources:
@@ -177,12 +177,12 @@ spec:
---
apiVersion: v1
data:
compValue: "5"
otherValue: "9"
testValue: "2"
compValue: red
otherValue: orange
testValue: blue
kind: ConfigMap
metadata:
name: comp-my-configmap-55249mf5kb
name: comp-my-configmap-g486mb229k
---
apiVersion: v1
kind: Deployment
@@ -208,7 +208,7 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- otherValue=9
- otherValue=orange
`),
writeK("/app/prod", `
resources:
@@ -230,12 +230,12 @@ spec:
---
apiVersion: v1
data:
compValue: "5"
otherValue: "9"
testValue: "2"
compValue: red
otherValue: orange
testValue: blue
kind: ConfigMap
metadata:
name: comp-my-configmap-55249mf5kb
name: comp-my-configmap-g486mb229k
---
apiVersion: v1
kind: Deployment
@@ -273,11 +273,11 @@ spec:
---
apiVersion: v1
data:
otherValue: "10"
testValue: "1"
otherValue: green
testValue: purple
kind: ConfigMap
metadata:
name: my-configmap-2g9c94mhb8
name: my-configmap-9cd648hm8f
---
apiVersion: v1
kind: Deployment
@@ -288,12 +288,12 @@ spec:
---
apiVersion: v1
data:
compValue: "5"
otherValue: "10"
testValue: "2"
compValue: red
otherValue: green
testValue: blue
kind: ConfigMap
metadata:
name: comp-my-configmap-kc6k2kmkh9
name: comp-my-configmap-97647ckcmg
---
apiVersion: v1
kind: Deployment
@@ -319,8 +319,8 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- compValue=5
- testValue=2
- compValue=red
- testValue=blue
`),
},
runPath: "/app/direct-component",
@@ -334,12 +334,12 @@ spec:
---
apiVersion: v1
data:
compValue: "5"
otherValue: "10"
testValue: "2"
compValue: red
otherValue: green
testValue: blue
kind: ConfigMap
metadata:
name: my-configmap-kc6k2kmkh9
name: my-configmap-97647ckcmg
`,
},
"missing-optional-component-api-version": {
@@ -350,7 +350,7 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- otherValue=9
- otherValue=orange
`),
},
runPath: "/app/prod",
@@ -364,11 +364,11 @@ spec:
---
apiVersion: v1
data:
otherValue: "9"
testValue: "1"
otherValue: orange
testValue: purple
kind: ConfigMap
metadata:
name: my-configmap-5g7gh5mgt5
name: my-configmap-6hhdg8gkdg
---
apiVersion: v1
kind: Deployment
@@ -411,11 +411,11 @@ spec:
---
apiVersion: v1
data:
otherValue: "10"
testValue: "1"
otherValue: green
testValue: purple
kind: ConfigMap
metadata:
name: my-configmap-a-b-2g9c94mhb8
name: my-configmap-a-b-9cd648hm8f
---
apiVersion: v1
kind: Deployment
@@ -426,11 +426,11 @@ spec:
---
apiVersion: v1
data:
otherValue: "10"
testValue: "1"
otherValue: green
testValue: purple
kind: ConfigMap
metadata:
name: my-configmap-b-2g9c94mhb8
name: my-configmap-b-9cd648hm8f
`,
},
@@ -562,7 +562,7 @@ configMapGenerator:
- name: my-configmap
behavior: merge
literals:
- otherValue=9
- otherValue=orange
`),
},
runPath: "/app/prod",