Skip to content

Commit

Permalink
Move Kubernetes assests into subdirectories
Browse files Browse the repository at this point in the history
Move Kubernetes assetes into the respective subdirectories.
  • Loading branch information
HeavyWombat committed Oct 14, 2023
1 parent 2d431d4 commit e196bb1
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 6 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions assets/kubernetes/multi-docs-versioned-crds/from.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: v1beta1
kind: some-kind
metadata:
name: some-item

---
apiVersion: v1alpha1
kind: some-kind
metadata:
name: some-item
11 changes: 11 additions & 0 deletions assets/kubernetes/multi-docs-versioned-crds/to.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: v1alpha1
kind: some-kind
metadata:
name: some-item

---
apiVersion: v1beta1
kind: some-kind
metadata:
name: some-item
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/dyff/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,14 @@ listY: [ Yo, Yo, Yo ]
})

It("should return all differences between the files with multiple documents", func() {
results, err := dyff.CompareInputFiles(file("../../assets/kubernetes-yaml/from.yml"), file("../../assets/kubernetes-yaml/to.yml"))
expected := []dyff.Diff{
singleDiff("#0/spec/template/spec/containers/name=registry/resources/limits/cpu", dyff.MODIFICATION, "100m", "1000m"),
singleDiff("#0/spec/template/spec/containers/name=registry/resources/limits/memory", dyff.MODIFICATION, "100Mi", "10Gi"),
singleDiff("#0/spec/template/spec/containers/name=registry/ports", dyff.ADDITION, nil, list(`[ {containerPort: 5001, name: backdoor, protocol: TCP} ]`)),
singleDiff("#1/spec/ports", dyff.ADDITION, nil, list(`[ {name: backdoor, port: 5001, protocol: TCP} ]`)),
}

results, err := dyff.CompareInputFiles(file(assets("kubernetes/multi-docs/from.yml")), file(assets("kubernetes/multi-docs/to.yml")))
Expect(err).To(BeNil())
Expect(results).NotTo(BeNil())
Expect(results.Diffs).NotTo(BeNil())
Expand Down Expand Up @@ -821,8 +821,8 @@ b: bar
Context("two YAML structures with Kubernetes lists", func() {
It("should identify individual list entries based on the nested name field in the respective entry metadata", func() {
from, to := loadFiles(
assets("kubernetes-lists", "pods", "from.yml"),
assets("kubernetes-lists", "pods", "to.yml"),
assets("kubernetes", "lists", "from.yml"),
assets("kubernetes", "lists", "to.yml"),
)

results, err := dyff.CompareInputFiles(from, to, dyff.KubernetesEntityDetection(true))
Expand Down
6 changes: 3 additions & 3 deletions pkg/dyff/output_human_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ variables.ROUTER_TLS_PEM.options

It("should use human friendly compact diff of multiline text differences", func() {
compareAgainstExpected(
assets("kubernetes-configmaps/from.yml"),
assets("kubernetes-configmaps/to.yml"),
assets("kubernetes-configmaps/expected-dyff-spruce.human"),
assets("kubernetes/configmaps/from.yml"),
assets("kubernetes/configmaps/to.yml"),
assets("kubernetes/configmaps/expected-dyff-spruce.human"),
false,
)
})
Expand Down

0 comments on commit e196bb1

Please sign in to comment.