Drop From field validation check #1464

0xmichalis · 2015-03-26T10:16:47Z

No description provided.

mfojtik · 2015-03-26T10:18:43Z

pkg/build/api/validation/validation.go

@@ -239,7 +240,8 @@ func validateImageChange(imageChange *buildapi.ImageChangeTrigger) errs.Validati
 	if len(imageChange.Image) == 0 {
 		allErrs = append(allErrs, errs.NewFieldRequired("image"))
 	}
-	if len(imageChange.From.Name) == 0 {
+	var emptyObject kapi.ObjectReference
+	if imageChange.From == emptyObject {


kapi.ObjectReference should be pointer and you should just check for nil here

I agree with you but it's not a pointer :/

@mfojtik I have changed it to a pointer though (you wouldn't guess :P)

@mfojtik I have changed it back to the original fix which I find more sane until someone decides that we have to change object references to pointers.

@bparees is there a reason why From is not (*kapi.ObjectReference) in types.go ?

So what's preferable here: &imageChange.From == nil or what I currently have in my PR ie. comparing against an empty object?

What was wrong with the initial if len(imageChange.From.Name) == 0 ?

@soltysh @Kargakis so in that case you need to check if the len(From.Name)>0 and the Kind (if set) is "imageRepository"

@soltysh we check for the From.Name twice (see following else if check). We should check for From and From.Name separately.

If from won't be set it'll be empty by default, so you need to check just the name, IMHO.

0xmichalis · 2015-03-26T12:52:57Z

@soltysh @mfojtik updated to check just the Name field.

soltysh · 2015-03-26T12:54:21Z

LGTM

smarterclayton · 2015-03-26T13:23:24Z

We didn't have an tests of this? We could use test... :)

0xmichalis · 2015-03-26T13:58:01Z

Added tests for validateImageChange

bparees · 2015-03-26T14:00:30Z

pkg/build/api/validation/validation_test.go

+			name: "Both missing refs",
+			ict: &buildapi.ImageChangeTrigger{
+				Image: "",
+				From: kapi.ObjectReference{


how about a test where you don't even define the From field? Just in case someone changes it to a ptr in the future and sets us up for a nil ptr error.

But even if they change it to a pointer, they would have to turn into a pointer every from field in the previous tests too

yup. i'm just paranoid and it seemed like an easy add. thanks for doing it! :)

Currently if From.Name is zero the validation wrongly reports that the From field is required. Drop the From field validation check as it's not so useful.

bparees · 2015-03-26T14:23:09Z

lgtm. [merge]

openshift-bot · 2015-03-26T14:25:46Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1307/) (Image: devenv-fedora_1140)

openshift-bot · 2015-03-26T14:25:46Z

Evaluated for origin up to d08fed8

Merged by openshift-bot

…service-catalog/' changes from aa27078754..510060232e 510060232e origin build: add origin tooling de45e94 v0.1.0 chart changes (openshift#1468) 0bb9982 Modify Makefile to only specify ldflags once (openshift#1471) 5d6afac Fixes openshift#735: Add repo-sync script for charts (openshift#1453) 630f13f fix lingering unversioned client API (openshift#1466) 6f49128 Fix several logging errors (openshift#1464) 2aece61 Delete removed serviceClasses when they have no instances left (openshift#1450) 179d302 Uncommenting UID field after updating to k8s 1.8 (openshift#1457) b70c076 Reorder class and plan creation; test plan conflict handling (openshift#1459) 4bea012 Use versioned client APIs (openshift#1458) ff4af30 clean up logic for 410 gone deprovision poll (openshift#1452) 3fddf27 clean up logic and fix message for failed poll (openshift#1451) 40926cd Fix typo from openshift#1354 (openshift#1456) ff86ef2 Delete removed serviceplans when they have no instances left (openshift#1444) 8411a16 tweak binding setAndUpdateOrphanMitigation function (openshift#1448) ce28252 Combine apiserver and controller-manager into a single service-catalog image (openshift#1343) 7bbc8ee Check service class / plan before allowing provisioning or plan changes. (openshift#1439) baf28de Create listers before adding event handlers in controller (openshift#1446) 294157d remove setServiceBindingCondition dependency on controller (openshift#1441) 118a0f7 Fix typo in validation (openshift#1447) 117bfbd clean up error logging (openshift#1443) dff470f Move "External" around in some resource names/properties (openshift#1354) 0885edb Adding expectedGot function and using it. (openshift#1440) a7d582e Pretty controller broker (openshift#1442) c5edfaf Set apimachinery build variables with semver info (openshift#1429) 0e90d82 Add a pretty formatter for ClusterService[Class|Plan] (openshift#1408) fb874df Remove deprecated basic auth config support (openshift#1431) f4cd181 Migrate to metav1 methods for manipulating controllerRefs (openshift#1433) 96b286e Make service/plan reference fields on instance spec selectable (openshift#1422) 33f2b04 First example using the pretty context builder. (openshift#1403) 7852917 Stop using corev1.ObjectReference and corev1.LocalObjectReference (openshift#1417) fcf9480 Add tests for plan updates (openshift#1412) 819332e Add root CAs (openshift#1419) b49a76a Clean Makefile a little (openshift#1399) d681da0 Use a separate etcd prefix for each integration test to keep tests isolated (openshift#1415) 314a622 Wire etcd prefix to storage and call complete with options (openshift#1394) REVERT: aa27078754 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 510060232e54eb64b294213bb5d7847e169a2fac

There were several problems with incorrect number of arguments, unnecessary quoting, and not using httpErr's error method.

mfojtik reviewed Mar 26, 2015
View reviewed changes

0xmichalis changed the title ~~Validate From field~~ Drop From field validation check Mar 26, 2015

bparees reviewed Mar 26, 2015
View reviewed changes

Drop From field validation check

d08fed8

Currently if From.Name is zero the validation wrongly reports that the From field is required. Drop the From field validation check as it's not so useful.

openshift-bot pushed a commit that referenced this pull request Mar 26, 2015

Merge pull request #1464 from kargakis/ict-validation-fix

6d56cdb

Merged by openshift-bot

openshift-bot merged commit 6d56cdb into openshift:master Mar 26, 2015

0xmichalis deleted the ict-validation-fix branch March 26, 2015 15:14

jpeeler pushed a commit to jpeeler/origin that referenced this pull request Feb 1, 2018

Fix several logging errors (openshift#1464)

6f49128

There were several problems with incorrect number of arguments, unnecessary quoting, and not using httpErr's error method.

Drop From field validation check #1464

Drop From field validation check #1464

Uh oh!

Conversation

0xmichalis commented Mar 26, 2015

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xmichalis commented Mar 26, 2015

Uh oh!

soltysh commented Mar 26, 2015

Uh oh!

smarterclayton commented Mar 26, 2015

Uh oh!

0xmichalis commented Mar 26, 2015

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bparees commented Mar 26, 2015

Uh oh!

openshift-bot commented Mar 26, 2015

Uh oh!

openshift-bot commented Mar 26, 2015

Uh oh!

Uh oh!