From 363d6554ae6c6f39c21faef8d77e3b77de5f3943 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 7 Oct 2014 10:24:40 -0400 Subject: [PATCH] Move Policy test helpers into their own file Since types.go should always be equal to latest API types.go, this makes future cut and paste refactors easier. --- pkg/api/helpers.go | 41 +++++++++++++++++++++++++++++++++++++++++ pkg/api/types.go | 21 --------------------- 2 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 pkg/api/helpers.go diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go new file mode 100644 index 0000000000..ac11833b19 --- /dev/null +++ b/pkg/api/helpers.go @@ -0,0 +1,41 @@ +/* +Copyright 2014 Google Inc. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package api + +import ( + "strings" +) + +func IsPullAlways(p PullPolicy) bool { + // Default to pull always + if len(p) == 0 { + return true + } + return pullPoliciesEqual(p, PullAlways) +} + +func IsPullNever(p PullPolicy) bool { + return pullPoliciesEqual(p, PullNever) +} + +func IsPullIfNotPresent(p PullPolicy) bool { + return pullPoliciesEqual(p, PullIfNotPresent) +} + +func pullPoliciesEqual(p1, p2 PullPolicy) bool { + return strings.ToLower(string(p1)) == strings.ToLower(string(p2)) +} diff --git a/pkg/api/types.go b/pkg/api/types.go index d504e51adc..68ce0f3dd3 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -17,7 +17,6 @@ limitations under the License. package api import ( - "strings" "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" @@ -195,26 +194,6 @@ const ( PullIfNotPresent PullPolicy = "PullIfNotPresent" ) -func IsPullAlways(p PullPolicy) bool { - // Default to pull always - if len(p) == 0 { - return true - } - return pullPoliciesEqual(p, PullAlways) -} - -func IsPullNever(p PullPolicy) bool { - return pullPoliciesEqual(p, PullNever) -} - -func IsPullIfNotPresent(p PullPolicy) bool { - return pullPoliciesEqual(p, PullIfNotPresent) -} - -func pullPoliciesEqual(p1, p2 PullPolicy) bool { - return strings.ToLower(string(p1)) == strings.ToLower(string(p2)) -} - // Container represents a single container that is expected to be run on the host. type Container struct { // Required: This must be a DNS_LABEL. Each container in a pod must