From cf54dcb68963e16fe9cdaa440a5605fafa8ea899 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 16 Jan 2015 15:02:36 -0800 Subject: [PATCH] Using switch in validatePullPolicyWithDefault --- pkg/api/validation/validation.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 1ac27118f64..97ff6468874 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -270,8 +270,9 @@ func validateLifecycle(lifecycle *api.Lifecycle) errs.ValidationErrorList { func validatePullPolicyWithDefault(ctr *api.Container) errs.ValidationErrorList { allErrors := errs.ValidationErrorList{} - // TODO(dchen1107): Move ParseImageName code to pkg/util - if len(ctr.ImagePullPolicy) == 0 { + switch ctr.ImagePullPolicy { + case "": + // TODO(dchen1107): Move ParseImageName code to pkg/util parts := strings.Split(ctr.Image, ":") // Check image tag if parts[len(parts)-1] == "latest" { @@ -279,10 +280,9 @@ func validatePullPolicyWithDefault(ctr *api.Container) errs.ValidationErrorList } else { ctr.ImagePullPolicy = api.PullIfNotPresent } - } - if ctr.ImagePullPolicy != api.PullAlways && - ctr.ImagePullPolicy != api.PullIfNotPresent && - ctr.ImagePullPolicy != api.PullNever { + case api.PullAlways, api.PullIfNotPresent, api.PullNever: + break + default: allErrors = append(allErrors, errs.NewFieldNotSupported("", ctr.ImagePullPolicy)) }