convert tests to exercise openapi and inference

This commit is contained in:
Khris Richardson
2020-03-03 16:54:47 -08:00
parent caa8fdc3cd
commit fcfe798b75
4 changed files with 727 additions and 337 deletions

View File

@@ -6,21 +6,33 @@ package merge2_test
var elementTestCases = []testCase{
{description: `merge Element -- keep field in dest`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v0
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
@@ -29,21 +41,33 @@ items:
{description: `merge Element -- add field to dest`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v0
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
@@ -52,19 +76,31 @@ items:
{description: `merge Element -- add list, empty in dest`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items: []
spec:
template:
spec:
containers: []
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
@@ -73,18 +109,27 @@ items:
{description: `merge Element -- add list, missing from dest`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
`,
dest: `
apiVersion: apps/v1
kind: Deployment
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
command: ['run.sh']
@@ -93,8 +138,12 @@ items:
{description: `merge Element -- add Element first`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: bar
image: bar:v1
command: ['run2.sh']
@@ -102,14 +151,22 @@ items:
image: foo:v1
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v0
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -120,8 +177,12 @@ items:
{description: `merge Element -- add Element second`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -129,14 +190,22 @@ items:
command: ['run2.sh']
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v0
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -150,11 +219,16 @@ items:
//
{description: `keep list -- list missing from src`,
source: `
apiVersion: apps/v1
kind: Deployment
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -162,8 +236,12 @@ items:
command: ['run2.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -177,14 +255,22 @@ items:
//
{description: `keep Element -- element missing in src`,
source: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v0
- name: bar
@@ -192,8 +278,12 @@ items:
command: ['run2.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -207,12 +297,20 @@ items:
//
{description: `keep element -- empty list in src`,
source: `
apiVersion: apps/v1
kind: Deployment
items: {}
spec:
template:
spec:
containers: {}
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -220,8 +318,12 @@ items:
command: ['run2.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -235,12 +337,20 @@ items:
//
{description: `remove Element -- null in src`,
source: `
apiVersion: apps/v1
kind: Deployment
items: null
spec:
template:
spec:
containers: null
`,
dest: `
apiVersion: apps/v1
kind: Deployment
items:
spec:
template:
spec:
containers:
- name: foo
image: foo:v1
- name: bar
@@ -248,33 +358,41 @@ items:
command: ['run2.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`,
},
//
// Test Case
//
{description: `no infer merge keys no merge'`,
{description: `infer merge keys merge'`,
source: `
apiVersion: custom
kind: Deployment
containers:
- name: foo
command: ['run2.sh']
`,
dest: `
apiVersion: custom
kind: Deployment
containers:
- name: foo
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
containers:
- name: foo
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: true,
},
//
@@ -282,8 +400,8 @@ containers:
//
{description: `no infer merge keys merge using schema`,
source: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -292,8 +410,8 @@ spec:
command: ['run2.sh']
`,
dest: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -302,8 +420,8 @@ spec:
image: foo:bar
`,
expected: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -312,7 +430,7 @@ spec:
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
//
@@ -320,24 +438,27 @@ spec:
//
{description: `no infer merge keys merge using explicit schema as line comment'`,
source: `
apiVersion: custom
kind: Deployment
containers:
- name: foo
command: ['run2.sh']
`,
dest: `
apiVersion: custom
kind: Deployment
containers: # {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
- name: foo # hell ow
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
containers: # {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
- name: foo
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
}

View File

@@ -20,7 +20,7 @@ func TestMerge(t *testing.T) {
for j := range testCases[i] {
tc := testCases[i][j]
t.Run(tc.description, func(t *testing.T) {
actual, err := MergeStrings(tc.source, tc.dest, !tc.noInfer)
actual, err := MergeStrings(tc.source, tc.dest, tc.infer)
if !assert.NoError(t, err, tc.description) {
t.FailNow()
}
@@ -47,5 +47,5 @@ type testCase struct {
source string
dest string
expected string
noInfer bool
infer bool
}

View File

@@ -3,19 +3,28 @@
package merge3_test
//nolint:lll
var elementTestCases = []testCase{
//
// Test Case
//
{description: `Add an element to an existing list`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:1
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:1
@@ -23,19 +32,26 @@ containers:
image: baz:2
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:1
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:1
- image: baz:2
name: baz
`},
//
@@ -43,18 +59,28 @@ containers:
//
{description: `Add an element to a non-existing list`,
origin: `
apiVersion: apps/v1
kind: Deployment`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
local: `
apiVersion: apps/v1
kind: Deployment
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- image: foo:bar
name: foo
@@ -62,21 +88,34 @@ containers:
{description: `Add an element to a non-existing list, existing in dest`,
origin: `
apiVersion: apps/v1
kind: Deployment`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: baz
image: baz:bar
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: baz
image: baz:bar
@@ -90,12 +129,20 @@ containers:
// This element is missing from the destination -- only the new fields are added
{description: `Add a field to the element, element missing from dest`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -103,10 +150,15 @@ containers:
- run.sh
`,
local: `
apiVersion: apps/v1
kind: Deployment
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- command:
- run.sh
@@ -118,7 +170,11 @@ containers:
//
{description: `Update a field on the elem, element missing from the dest`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -126,7 +182,11 @@ containers:
- run.sh
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -134,10 +194,15 @@ containers:
- run2.sh
`,
local: `
apiVersion: apps/v1
kind: Deployment
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- command:
- run2.sh
@@ -149,28 +214,44 @@ containers:
//
{description: `Update a field on the elem, element present in the dest`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run2.sh']
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -182,26 +263,42 @@ containers:
//
{description: `Add a field on the elem, element present in the dest`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run2.sh']
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -213,27 +310,43 @@ containers:
//
{description: `Add a field on the elem, element and field present in the dest`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run2.sh']
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -245,21 +358,37 @@ containers:
//
{description: `Ignore an element`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers: {}
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers: {}
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -270,18 +399,25 @@ containers:
//
{description: `Leave deleted`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
`,
local: `
apiVersion: apps/v1
kind: Deployment
`,
expected: `
apiVersion: apps/v1
kind: Deployment
`},
@@ -290,22 +426,38 @@ kind: Deployment
//
{description: `Remove an element -- matching`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`},
//
@@ -313,23 +465,39 @@ kind: Deployment
//
{description: `Remove an element -- field missing from update`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`},
//
@@ -337,7 +505,11 @@ kind: Deployment
//
{description: `Remove an element -- element missing`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -345,13 +517,21 @@ containers:
image: baz:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -360,7 +540,11 @@ containers:
image: baz:bar
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
@@ -372,24 +556,40 @@ containers:
//
{description: `Remove an element -- empty containers`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers: {}
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`},
//
@@ -397,53 +597,82 @@ kind: Deployment
//
{description: `Remove an element -- missing list field`,
origin: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
update: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`,
local: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run.sh']
`,
expected: `
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec: {}
`},
//
// Test Case
//
{description: `no infer merge keys no merge'`,
{description: `infer merge keys merge'`,
origin: `
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
`,
update: `
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
command: ['run2.sh']
`,
local: `
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
`,
expected: `
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: true,
},
//
@@ -451,8 +680,8 @@ containers:
//
{description: `no infer merge keys merge using schema`,
origin: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -460,8 +689,8 @@ spec:
- name: foo
`,
update: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -470,8 +699,8 @@ spec:
command: ['run2.sh']
`,
local: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -480,8 +709,8 @@ spec:
image: foo:bar
`,
expected: `
kind: Deployment
apiVersion: apps/v1
kind: Deployment
spec:
template:
spec:
@@ -490,7 +719,7 @@ spec:
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
//
@@ -498,30 +727,46 @@ spec:
//
{description: `no infer merge keys merge using explicit schema as line comment'`,
origin: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
`,
update: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
command: ['run2.sh']
`,
local: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers: # {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
- name: foo # hell ow
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers: # {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
- name: foo # hell ow
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
//
@@ -529,32 +774,48 @@ containers: # {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"t
//
{description: `no infer merge keys merge using explicit schema as head comment'`,
origin: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
`,
update: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
containers:
- name: foo
command: ['run2.sh']
`,
local: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
# {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
containers:
- name: foo # hell ow
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
spec:
template:
spec:
# {"items":{"$ref": "#/definitions/io.k8s.api.core.v1.Container"},"type":"array","x-kubernetes-patch-merge-key":"name","x-kubernetes-patch-strategy": "merge"}
containers:
- name: foo # hell ow
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
//
@@ -562,12 +823,14 @@ containers:
//
{description: `no infer merge keys merge using explicit schema to parent field'`,
origin: `
apiVersion: custom
kind: Deployment
spec:
containers:
- name: foo
`,
update: `
apiVersion: custom
kind: Deployment
spec:
containers:
@@ -575,6 +838,7 @@ spec:
command: ['run2.sh']
`,
local: `
apiVersion: custom
kind: Deployment
spec: # {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
containers:
@@ -582,6 +846,7 @@ spec: # {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
spec: # {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
containers:
@@ -589,7 +854,7 @@ spec: # {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
//
@@ -597,12 +862,14 @@ spec: # {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
//
{description: `no infer merge keys merge using explicit schema to parent field header'`,
origin: `
apiVersion: custom
kind: Deployment
spec:
containers:
- name: foo
`,
update: `
apiVersion: custom
kind: Deployment
spec:
containers:
@@ -610,6 +877,7 @@ spec:
command: ['run2.sh']
`,
local: `
apiVersion: custom
kind: Deployment
# {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
spec:
@@ -618,6 +886,7 @@ spec:
image: foo:bar
`,
expected: `
apiVersion: custom
kind: Deployment
# {"$ref":"#/definitions/io.k8s.api.core.v1.PodSpec"}
spec:
@@ -626,6 +895,6 @@ spec:
image: foo:bar
command: ['run2.sh']
`,
noInfer: true,
infer: false,
},
}

View File

@@ -18,7 +18,7 @@ func TestMerge(t *testing.T) {
for j := range testCases[i] {
tc := testCases[i][j]
t.Run(tc.description, func(t *testing.T) {
actual, err := MergeStrings(tc.local, tc.origin, tc.update, !tc.noInfer)
actual, err := MergeStrings(tc.local, tc.origin, tc.update, tc.infer)
if tc.err == nil {
if !assert.NoError(t, err, tc.description) {
t.FailNow()
@@ -47,5 +47,5 @@ type testCase struct {
local string
expected string
err error
noInfer bool
infer bool
}