Skip to content

NO-JIRA: a new test for the jsonpatch library #29191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Oct 16, 2024
Merged

NO-JIRA: a new test for the jsonpatch library #29191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
031fdc0
a new test for the jsonpatch library
p0lyn0mial Oct 15, 2024
e4849f5
generated
p0lyn0mial Oct 15, 2024
49b8541
bump (library-go)
p0lyn0mial Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb
github.com/openshift/library-go v0.0.0-20241010221945-bd9dfdd95f7b
github.com/openshift/library-go v0.0.0-20241015130640-f9ecd211c68b
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.20.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,8 +720,8 @@ github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0
github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241002124647-1892e4deb967/go.mod h1:cmVAeH6nq/BICRHjs7alZYCGXGFzZapRDIoFsXXJSsw=
github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241002124647-1892e4deb967 h1:85E8kHrVptr6SeoFHxU/wplZweb+likneYpI4jdCBb4=
github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241002124647-1892e4deb967/go.mod h1:mtBTrqylZ7Lv0pmB5XpbDK1QCiovEdaUNo/u/vaK2Lo=
github.com/openshift/library-go v0.0.0-20241010221945-bd9dfdd95f7b h1:L2bj24+Fsoq8KzHTwoiYNW+K18O5MCsxThQhkvC9+r0=
github.com/openshift/library-go v0.0.0-20241010221945-bd9dfdd95f7b/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
github.com/openshift/library-go v0.0.0-20241015130640-f9ecd211c68b h1:NfHXfIpgWLoxhxOf9Ci/bm1xVp6T9RBgK1MfbVVzAvw=
github.com/openshift/library-go v0.0.0-20241015130640-f9ecd211c68b/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8 h1:HJvLw9nNfoqCs16h505eP8E1kVmq6KNdzGm5csPlYsQ=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
Expand Down
13 changes: 13 additions & 0 deletions test/extended/apiserver/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ var _ = g.Describe("[sig-api-machinery] JSON Patch [apigroup:operator.openshift.
{NodeName: "master-1"},
}))
})
g.It("should delete multiple entries from an array when multiple test precondition provided", func() {
g.By("Creating KubeAPIServerOperator CR for the test")
resourceClient := createResourceClient(oc.AdminConfig(), gvr)
kasOperator := createWellKnownKubeAPIServerOperatorResource(ctx, resourceClient)

g.By("Applying a JSON Patch to remove a node status at index 0 and 1")
jsonPatch := jsonpatch.New().
WithRemove("/status/nodeStatuses/0", jsonpatch.NewTestCondition("/status/nodeStatuses/0/nodeName", "master-1")).
WithRemove("/status/nodeStatuses/0", jsonpatch.NewTestCondition("/status/nodeStatuses/0/nodeName", "master-2"))
kasOperator, err := applyJSONPatch(ctx, kasOperator.Name, jsonPatch, resourceClient)
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(kasOperator.Status.NodeStatuses).To(o.HaveLen(0))
})
g.It("should error when the test precondition provided doesn't match", func() {
g.By("Creating KubeAPIServerOperator CR for the test")
resourceClient := createResourceClient(oc.AdminConfig(), gvr)
Expand Down
2 changes: 2 additions & 0 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions vendor/github.com/openshift/library-go/pkg/apiserver/jsonpatch/jsonpatch.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/operator/v1helpers/informers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ github.com/openshift/client-go/user/listers/user/v1
# github.com/openshift/cluster-network-operator v0.0.0-20240708200319-1cd8678b38fb
## explicit; go 1.22.0
github.com/openshift/cluster-network-operator/pkg/names
# github.com/openshift/library-go v0.0.0-20241010221945-bd9dfdd95f7b
# github.com/openshift/library-go v0.0.0-20241015130640-f9ecd211c68b
## explicit; go 1.22.0
github.com/openshift/library-go/pkg/apiserver/admission/admissionrestconfig
github.com/openshift/library-go/pkg/apiserver/admission/admissiontimeout
Expand Down