UPSTREAM: 31353: fix duplicate validation/field/errors #10613
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Related PR: openshift#10317 Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1257800#c3 PR openshift#10317 fixed duplicate errors for invalid aggregate errors in https://github.com/openshift/origin/blob/master/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/helpers.go. However, duplicate aggregate errors that went through https://github.com/openshift/origin/blob/master/vendor/k8s.io/kubernetes/pkg/util/validation/field/errors.go were not affected by that patch. This patch adds duplicate aggregate error checking to `pkg/util/validation/field/errors.go` \##### Before `$ oc set env rc/idling-echo-1 test-abc=1234` ``` error: ReplicationController "idling-echo-1" is invalid: [spec.template.spec.containers[0].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName", spec.template.spec.containers[1].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName", spec.template.spec.containers[0].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName", spec.template.spec.containers[1].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName"] ``` `$ oc set env rc/node-1 test-abc=1234` ``` error: ReplicationController "idling-echo-1" is invalid: [spec.template.spec.containers[0].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName", spec.template.spec.containers[1].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName"] ``` \##### After `$ oc set env rc/idling-echo-1 test-abc=1234` ``` error: ReplicationController "idling-echo-1" is invalid: [spec.template.spec.containers[0].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName", spec.template.spec.containers[1].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName"] ``` `$ oc set env rc/node-1 test-abc=1234` ``` error: ReplicationController "node-1" is invalid: spec.template.spec.containers[0].env[0].name: Invalid value: "test-abc": must be a C identifier (matching regex [A-Za-z_][A-Za-z0-9_]*): e.g. "my_name" or "MyName" ```
juanvallejo
force-pushed
the
jvallejo_fix-duplicate-errors-oc-set-env
branch
from
8e2de1f to
7d0ef9e
Compare
juanvallejo
changed the title
|
[test] |
| errs := make([]error, len(list)) | ||
| for i := range list { | ||
| errs[i] = list[i] | ||
| errs := make([]error, 0, len(list)) |
There was a problem hiding this comment.
Any reason for creating this with the same length of list? Because if there are any duplicates the length will be different anyway.
There was a problem hiding this comment.
0 length, len(list) capacity. normally, the length ends up being the same
|
Might be worth adding something to |
Will do! I went ahead and included a second related commit (4bc77e4) to this PR I was not sure whether it made more sense to leave it here or move it to a PR of its own, what do you think? cc @liggitt EDIT: Decided it might be easier to make a second PR for that commit: #10619 |
juanvallejo
force-pushed
the
jvallejo_fix-duplicate-errors-oc-set-env
branch
from
207feed to
c9e424b
Compare
juanvallejo
force-pushed
the
jvallejo_fix-duplicate-errors-oc-set-env
branch
from
c9e424b to
f6f8446
Compare
|
Evaluated for origin test up to f6f8446 |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8414/) |
|
LGTM [merge] |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8414/) (Image: devenv-rhel7_4929) |
|
Evaluated for origin merge up to f6f8446 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
UPSTREAM: kubernetes/kubernetes#31353
Related PR: #10317
Related BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1257800#c3
PR #10317 fixed duplicate errors for invalid aggregate errors in
https://github.com/openshift/origin/blob/master/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/helpers.go.
However, duplicate aggregate errors that went through
https://github.com/openshift/origin/blob/master/vendor/k8s.io/kubernetes/pkg/util/validation/field/errors.go
were not affected by that patch.
This patch adds duplicate aggregate error checking to
pkg/util/validation/field/errors.goBefore
$ oc set env rc/idling-echo-1 test-abc=1234 # rc with two containers$ oc set env rc/node-1 test-abc=1234 # rc with one containerAfter
$ oc set env rc/idling-echo-1 test-abc=1234$ oc set env rc/node-1 test-abc=1234cc @fabianofranz