Merge pull request #20399 from deads2k/build-01-switch

remove build helpers from api packages

Author: openshift-merge-robot

hack/import-restrictions.json

@@ -155,6 +155,7 @@
     "allowedImportPackages": [
       "vendor/k8s.io/kubernetes/pkg/apis/core",
       "vendor/k8s.io/kubernetes/pkg/apis/core/v1",
+      "github.com/openshift/origin/pkg/build/buildapihelpers",
       "github.com/openshift/origin/pkg/image/apis/image"
     ]
   },
@@ -480,6 +481,7 @@
       "github.com/openshift/origin/pkg/authorization/util",
       "github.com/openshift/origin/pkg/build/apis/build",
       "github.com/openshift/origin/pkg/build/apis/build/install",
+      "github.com/openshift/origin/pkg/build/buildapihelpers",
       "github.com/openshift/origin/pkg/build/client",
       "github.com/openshift/origin/pkg/build/client/internalversion",
       "github.com/openshift/origin/pkg/build/util",

pkg/build/apis/build/fields.go

@@ -3,6 +3,7 @@ package build
 import (
 	"fmt"
 
+	"github.com/openshift/origin/pkg/api/apihelpers"
 	"k8s.io/apimachinery/pkg/fields"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
@@ -13,7 +14,7 @@ func BuildFieldSelector(obj runtime.Object, fieldSet fields.Set) error {
 		return fmt.Errorf("%T not a Build", obj)
 	}
 	fieldSet["status"] = string(build.Status.Phase)
-	fieldSet["podName"] = GetBuildPodName(build)
+	fieldSet["podName"] = apihelpers.GetPodName(build.Name, "build")
 
 	return nil
 }

pkg/build/apis/build/helpers.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/openshift/api/build/v1"
 	newer "github.com/openshift/origin/pkg/build/apis/build"
+	"github.com/openshift/origin/pkg/build/buildapihelpers"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 )
 
@@ -18,7 +19,7 @@ func Convert_v1_BuildConfig_To_build_BuildConfig(in *v1.BuildConfig, out *newer.
 	// Strip off any default imagechange triggers where the buildconfig's
 	// "from" is not an ImageStreamTag, because those triggers
 	// will never be invoked.
-	imageRef := newer.GetInputReference(out.Spec.Strategy)
+	imageRef := buildapihelpers.GetInputReference(out.Spec.Strategy)
 	hasIST := imageRef != nil && imageRef.Kind == "ImageStreamTag"
 	for _, trigger := range out.Spec.Triggers {
 		if trigger.Type != newer.ImageChangeBuildTriggerType {

pkg/build/apis/build/util_test.go

@@ -20,6 +20,7 @@ import (
 
 	buildapiv1 "github.com/openshift/api/build/v1"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
+	"github.com/openshift/origin/pkg/build/buildapihelpers"
 	"github.com/openshift/origin/pkg/build/buildscheme"
 	buildutil "github.com/openshift/origin/pkg/build/util"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
@@ -84,7 +85,7 @@ func ValidateBuildConfig(config *buildapi.BuildConfig) field.ErrorList {
 	fromRefs := map[string]struct{}{}
 	specPath := field.NewPath("spec")
 	triggersPath := specPath.Child("triggers")
-	buildFrom := buildapi.GetInputReference(config.Spec.Strategy)
+	buildFrom := buildapihelpers.GetInputReference(config.Spec.Strategy)
 	for i, trg := range config.Spec.Triggers {
 		allErrs = append(allErrs, validateTrigger(&trg, buildFrom, triggersPath.Index(i))...)
 		if trg.Type != buildapi.ImageChangeBuildTriggerType || trg.ImageChange == nil {
@@ -664,7 +665,7 @@ func ValidateBuildLogOptions(opts *buildapi.BuildLogOptions) field.ErrorList {
 	allErrs := field.ErrorList{}
 
 	// TODO: Replace by validating PodLogOptions via BuildLogOptions once it's bundled in
-	popts := buildapi.BuildToPodLogOptions(opts)
+	popts := buildapihelpers.BuildToPodLogOptions(opts)
 	if errs := validation.ValidatePodLogOptions(popts); len(errs) > 0 {
 		allErrs = append(allErrs, errs...)
 	}

pkg/build/apis/build/v1/conversion.go

@@ -0,0 +1,52 @@
+package buildapihelpers
+
+import (
+	coreinternalapi "k8s.io/kubernetes/pkg/apis/core"
+
+	buildinternalapi "github.com/openshift/origin/pkg/build/apis/build"
+)
+
+// BuildToPodLogOptions builds a PodLogOptions object out of a BuildLogOptions.
+// Currently BuildLogOptions.Container and BuildLogOptions.Previous aren't used
+// so they won't be copied to PodLogOptions.
+func BuildToPodLogOptions(opts *buildinternalapi.BuildLogOptions) *coreinternalapi.PodLogOptions {
+	return &coreinternalapi.PodLogOptions{
+		Follow:       opts.Follow,
+		SinceSeconds: opts.SinceSeconds,
+		SinceTime:    opts.SinceTime,
+		Timestamps:   opts.Timestamps,
+		TailLines:    opts.TailLines,
+		LimitBytes:   opts.LimitBytes,
+	}
+}
+
+// FindTriggerPolicy retrieves the BuildTrigger(s) of a given type from a build configuration.
+// Returns nil if no matches are found.
+func FindTriggerPolicy(triggerType buildinternalapi.BuildTriggerType, config *buildinternalapi.BuildConfig) (buildTriggers []buildinternalapi.BuildTriggerPolicy) {
+	for _, specTrigger := range config.Spec.Triggers {
+		if specTrigger.Type == triggerType {
+			buildTriggers = append(buildTriggers, specTrigger)
+		}
+	}
+	return buildTriggers
+}
+
+func HasTriggerType(triggerType buildinternalapi.BuildTriggerType, bc *buildinternalapi.BuildConfig) bool {
+	matches := FindTriggerPolicy(triggerType, bc)
+	return len(matches) > 0
+}
+
+// GetInputReference returns the From ObjectReference associated with the
+// BuildStrategy.
+func GetInputReference(strategy buildinternalapi.BuildStrategy) *coreinternalapi.ObjectReference {
+	switch {
+	case strategy.SourceStrategy != nil:
+		return &strategy.SourceStrategy.From
+	case strategy.DockerStrategy != nil:
+		return strategy.DockerStrategy.From
+	case strategy.CustomStrategy != nil:
+		return &strategy.CustomStrategy.From
+	default:
+		return nil
+	}
+}

pkg/build/apis/build/validation/validation.go

@@ -0,0 +1,19 @@
+package buildapihelpers
+
+import buildinternalapi "github.com/openshift/origin/pkg/build/apis/build"
+
+// BuildSliceByCreationTimestamp implements sort.Interface for []Build
+// based on the CreationTimestamp field.
+type BuildSliceByCreationTimestamp []buildinternalapi.Build
+
+func (b BuildSliceByCreationTimestamp) Len() int {
+	return len(b)
+}
+
+func (b BuildSliceByCreationTimestamp) Less(i, j int) bool {
+	return b[i].CreationTimestamp.Before(&b[j].CreationTimestamp)
+}
+
+func (b BuildSliceByCreationTimestamp) Swap(i, j int) {
+	b[i], b[j] = b[j], b[i]
+}

pkg/build/apis/build/zz_generated.deepcopy.go

@@ -0,0 +1,34 @@
+package buildapihelpers
+
+import (
+	"sort"
+	"testing"
+	"time"
+
+	buildinternalapi "github.com/openshift/origin/pkg/build/apis/build"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestSortBuildSliceByCreationTimestamp(t *testing.T) {
+	present := metav1.Now()
+	past := metav1.NewTime(present.Add(-time.Minute))
+	builds := []buildinternalapi.Build{
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              "present",
+				CreationTimestamp: present,
+			},
+		},
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              "past",
+				CreationTimestamp: past,
+			},
+		},
+	}
+	sort.Sort(BuildSliceByCreationTimestamp(builds))
+	if [2]string{builds[0].Name, builds[1].Name} != [2]string{"past", "present"} {
+		t.Errorf("Unexpected sort order")
+	}
+}