df5fc7a2df
Major changes: - Don't generate a patch, instead generate the merged object so it can be used with PUT - Separate tree parsing logic to collate items in a list from the delete / merge / replace / add logic when merging - Use openapi for merge strategy metadata so it works with extensions and version skew - Support multi-field mergekeys when merging lists - Support replace strategy for maps - Reduce complexity of generating order when merging lists - keep the locally defined order and append remote only-items Continue to support: - Explicitly setting fields to null - Merging lists of primitives - Don't randomize ordering when merging lists TODO: - Retain keys - Conflict detection
71 lines
2.4 KiB
Go
71 lines
2.4 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package strategy_test
|
|
|
|
import (
|
|
. "github.com/onsi/gomega"
|
|
|
|
"fmt"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/ghodss/yaml"
|
|
|
|
"k8s.io/apimachinery/pkg/util/diff"
|
|
"k8s.io/kubernetes/pkg/kubectl/apply"
|
|
"k8s.io/kubernetes/pkg/kubectl/apply/parse"
|
|
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
|
|
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
|
|
)
|
|
|
|
// run parses the openapi and runs the tests
|
|
func run(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}) {
|
|
runWith(instance, recorded, local, remote, expected,
|
|
filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json"))
|
|
}
|
|
|
|
func runWith(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}, swaggerPath string) {
|
|
fakeSchema := tst.Fake{Path: swaggerPath}
|
|
s, err := fakeSchema.OpenAPISchema()
|
|
Expect(err).To(BeNil())
|
|
resources, err := openapi.NewOpenAPIData(s)
|
|
Expect(err).To(BeNil())
|
|
parseFactory := parse.Factory{resources}
|
|
|
|
parsed, err := parseFactory.CreateElement(recorded, local, remote)
|
|
Expect(err).Should(Not(HaveOccurred()))
|
|
|
|
merged, err := parsed.Merge(instance)
|
|
Expect(err).ShouldNot(HaveOccurred())
|
|
Expect(merged.Operation).Should(Equal(apply.SET))
|
|
Expect(merged.MergedResult).Should(Equal(expected), diff.ObjectDiff(merged.MergedResult, expected))
|
|
}
|
|
|
|
// create parses the yaml string into a map[string]interface{}. Verifies that the string does not have
|
|
// any tab characters.
|
|
func create(config string) map[string]interface{} {
|
|
result := map[string]interface{}{}
|
|
|
|
// The yaml parser will throw an obscure error if there are tabs in the yaml. Check for this
|
|
Expect(strings.Contains(config, "\t")).To(
|
|
BeFalse(), fmt.Sprintf("Yaml %s cannot contain tabs", config))
|
|
Expect(yaml.Unmarshal([]byte(config), &result)).Should(
|
|
Not(HaveOccurred()), fmt.Sprintf("Could not parse config:\n\n%s\n", config))
|
|
|
|
return result
|
|
}
|