commonize bc input across strategies; better insure bc ouput is set

Author: gabemontero

pkg/api/graph/graphview/image_pipeline.go

@@ -75,6 +75,7 @@ func NewImagePipelineFromBuildConfigNode(g osgraph.Graph, bcNode *buildgraph.Bui
 	flow.Source = src
 	flow.Build = bcNode
 	flow.LastSuccessfulBuild, flow.LastUnsuccessfulBuild, flow.ActiveBuilds = buildedges.RelevantBuilds(g, flow.Build)
+	flow.Image = findBuildOutput(g, bcNode)
 
 	// we should have at most one
 	for _, buildOutputNode := range g.SuccessorNodesByEdgeKind(bcNode, buildedges.BuildOutputEdgeKind) {
@@ -162,6 +163,14 @@ func findBuildInputs(g osgraph.Graph, bcNode *buildgraph.BuildConfigNode) (base
 	return
 }
 
+func findBuildOutput(g osgraph.Graph, bcNode *buildgraph.BuildConfigNode) (result ImageTagLocation) {
+	for _, output := range g.SuccessorNodesByEdgeKind(bcNode, buildedges.BuildOutputEdgeKind) {
+		result = output.(ImageTagLocation)
+		return
+	}
+	return
+}
+
 type SortedImagePipelines []ImagePipeline
 
 func (m SortedImagePipelines) Len() int      { return len(m) }

pkg/cmd/cli/describe/projectstatus.go

@@ -672,9 +672,9 @@ func describeDeploymentConfigTrigger(dc *deployapi.DeploymentConfig) string {
 func describeStandaloneBuildGroup(f formatter, pipeline graphview.ImagePipeline, namespace string) []string {
 	switch {
 	case pipeline.Build != nil:
-		lines := []string{describeBuildInPipeline(f, pipeline.Build.BuildConfig, pipeline.BaseImage)}
+		lines := []string{describeBuildInPipeline(f, pipeline, namespace)}
 		if pipeline.Image != nil {
-			lines = append(lines, fmt.Sprintf("pushes to %s", describeImageTagInPipeline(f, pipeline.Image, namespace)))
+			lines = append(lines, fmt.Sprintf("-> %s", describeImageTagInPipeline(f, pipeline.Image, namespace)))
 		}
 		return lines
 	case pipeline.Image != nil:
@@ -687,11 +687,11 @@ func describeStandaloneBuildGroup(f formatter, pipeline graphview.ImagePipeline,
 func describeImageInPipeline(f formatter, pipeline graphview.ImagePipeline, namespace string) string {
 	switch {
 	case pipeline.Image != nil && pipeline.Build != nil:
-		return fmt.Sprintf("%s <- %s", describeImageTagInPipeline(f, pipeline.Image, namespace), describeBuildInPipeline(f, pipeline.Build.BuildConfig, pipeline.BaseImage))
+		return fmt.Sprintf("%s <- %s", describeImageTagInPipeline(f, pipeline.Image, namespace), describeBuildInPipeline(f, pipeline, namespace))
 	case pipeline.Image != nil:
 		return describeImageTagInPipeline(f, pipeline.Image, namespace)
 	case pipeline.Build != nil:
-		return describeBuildInPipeline(f, pipeline.Build.BuildConfig, pipeline.BaseImage)
+		return describeBuildInPipeline(f, pipeline, namespace)
 	default:
 		return "<unknown>"
 	}
@@ -709,33 +709,31 @@ func describeImageTagInPipeline(f formatter, image graphview.ImageTagLocation, n
 	}
 }
 
-func describeBuildInPipeline(f formatter, build *buildapi.BuildConfig, baseImage graphview.ImageTagLocation) string {
+func describeBuildInPipeline(f formatter, pipeline graphview.ImagePipeline, namespace string) string {
+	bldType := ""
 	switch {
-	case build.Spec.Strategy.DockerStrategy != nil:
-		// TODO: handle case where no source repo
-		source, ok := describeSourceInPipeline(&build.Spec.Source)
-		if !ok {
-			return fmt.Sprintf("bc/%s unconfigured docker build - no source set", build.Name)
-		}
-		return fmt.Sprintf("bc/%s docker build of %s", build.Name, source)
-	case build.Spec.Strategy.SourceStrategy != nil:
-		source, ok := describeSourceInPipeline(&build.Spec.Source)
-		if !ok {
-			return fmt.Sprintf("bc/%s unconfigured source build", build.Name)
-		}
-		if baseImage == nil {
-			return fmt.Sprintf("bc/%s %s; no image set", build.Name, source)
-		}
-		return fmt.Sprintf("bc/%s builds %s with %s", build.Name, source, baseImage.ImageSpec())
-	case build.Spec.Strategy.CustomStrategy != nil:
-		source, ok := describeSourceInPipeline(&build.Spec.Source)
-		if !ok {
-			return fmt.Sprintf("bc/%s custom build ", build.Name)
-		}
-		return fmt.Sprintf("bc/%s custom build of %s", build.Name, source)
+	case pipeline.Build.BuildConfig.Spec.Strategy.DockerStrategy != nil:
+		bldType = "docker"
+	case pipeline.Build.BuildConfig.Spec.Strategy.SourceStrategy != nil:
+		bldType = "source"
+	case pipeline.Build.BuildConfig.Spec.Strategy.CustomStrategy != nil:
+		bldType = "custom"
+	case pipeline.Build.BuildConfig.Spec.Strategy.JenkinsPipelineStrategy != nil:
+		return fmt.Sprintf("bc/%s is a Jenkins Pipeline", pipeline.Build.BuildConfig.Name)
 	default:
-		return fmt.Sprintf("bc/%s unrecognized build", build.Name)
+		return fmt.Sprintf("bc/%s unrecognized build", pipeline.Build.BuildConfig.Name)
+	}
+
+	source, ok := describeSourceInPipeline(&pipeline.Build.BuildConfig.Spec.Source)
+	if !ok {
+		return fmt.Sprintf("bc/%s unconfigured %s build", pipeline.Build.BuildConfig.Name, bldType)
+	}
+
+	retStr := fmt.Sprintf("bc/%s %s builds %s", pipeline.Build.BuildConfig.Name, bldType, source)
+	if pipeline.BaseImage != nil {
+		retStr = retStr + fmt.Sprintf(" on %s", describeImageTagInPipeline(f, pipeline.BaseImage, namespace))
 	}
+	return retStr
 }
 
 func describeAdditionalBuildDetail(build *buildgraph.BuildConfigNode, lastSuccessfulBuild *buildgraph.BuildNode, lastUnsuccessfulBuild *buildgraph.BuildNode, activeBuilds []*buildgraph.BuildNode, pushTargetResolved bool, includeSuccess bool) []string {

pkg/cmd/cli/describe/projectstatus_test.go

@@ -150,8 +150,9 @@ func TestProjectStatus(t *testing.T) {
 			Contains: []string{
 				"In project example on server https://example.com:8443\n",
 				"svc/sinatra-example-2 - 172.30.17.48:8080",
+				"deploys istag/sinatra-example-2:latest <-",
 				"builds git://github.com",
-				"with docker.io/centos/ruby-22-centos7:latest",
+				"on docker.io/centos/ruby-22-centos7:latest",
 				"not built yet",
 				"deployment #1 waiting on image or update",
 				"View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.",
@@ -180,6 +181,8 @@ func TestProjectStatus(t *testing.T) {
 			Contains: []string{
 				// this makes sure that status knows this can push.  If it fails, there's a "(can't push image)" next to like #8
 				" hours\n  build #7",
+				"on fedora:23",
+				"-> repo-base:latest",
 			},
 			Time: mustParseTime("2015-12-17T20:36:15Z"),
 		},
@@ -193,6 +196,8 @@ func TestProjectStatus(t *testing.T) {
 			ErrFn: func(err error) bool { return err == nil },
 			Contains: []string{
 				"Cycle detected in build configurations:",
+				"on istag/ruby-22-centos7:latest",
+				"-> istag/ruby-hello-world:latest",
 			},
 		},
 		"running build": {
@@ -207,7 +212,7 @@ func TestProjectStatus(t *testing.T) {
 				"In project example on server https://example.com:8443\n",
 				"svc/sinatra-example-1 - 172.30.17.47:8080",
 				"builds git://github.com",
-				"with docker.io/centos/ruby-22-centos7:latest",
+				"on docker.io/centos/ruby-22-centos7:latest",
 				"build #1 running for about a minute",
 				"deployment #1 waiting on image or update",
 				"View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.",
@@ -227,7 +232,7 @@ func TestProjectStatus(t *testing.T) {
 				"svc/sinatra-app-example - 172.30.17.49:8080",
 				"sinatra-app-example-a deploys",
 				"sinatra-app-example-b deploys",
-				"with docker.io/centos/ruby-22-centos7:latest",
+				"on docker.io/centos/ruby-22-centos7:latest",
 				"build #1 running for about a minute",
 				"- 7a4f354: Prepare v1beta3 Template types (Roy Programmer <[email protected]>)",
 				"View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.",
@@ -250,7 +255,8 @@ func TestProjectStatus(t *testing.T) {
 				"svc/database-external (all nodes):31000 -> 3306",
 				"database test deploys",
 				"frontend deploys",
-				"with docker.io/centos/ruby-22-centos7:latest",
+				"istag/origin-ruby-sample:latest <-",
+				"on docker.io/centos/ruby-22-centos7:latest",
 				"deployment #3 pending on image",
 				"deployment #2 failed less than a second ago: unable to contact server - 0/1 pods",
 				"deployment #1 deployed less than a second ago",