Improve oc cancel-build command

Author: mfojtik

contrib/completions/bash/oc

@@ -850,6 +850,7 @@ _oc_cancel-build()
 
     flags+=("--dump-logs")
     flags+=("--restart")
+    flags+=("--state=")
     flags+=("--api-version=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/bash/openshift

@@ -4368,6 +4368,7 @@ _openshift_cli_cancel-build()
 
     flags+=("--dump-logs")
     flags+=("--restart")
+    flags+=("--state=")
     flags+=("--api-version=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

docs/generated/oc_by_example_content.adoc

@@ -627,20 +627,26 @@ Autoscale a deployment config or replication controller
 
 
 == oc cancel-build
-Cancel a pending or running build
+Cancel running, pending, or new builds
 
 ====
 
 [options="nowrap"]
 ----
   # Cancel the build with the given name
-  $ oc cancel-build 1da32cvq
+  $ oc cancel-build ruby-build-2
 
   # Cancel the named build and print the build logs
-  $ oc cancel-build 1da32cvq --dump-logs
+  $ oc cancel-build ruby-build-2 --dump-logs
 
   # Cancel the named build and create a new one with the same parameters
-  $ oc cancel-build 1da32cvq --restart
+  $ oc cancel-build ruby-build-2 --restart
+
+  # Cancel multiple builds
+  $ oc cancel-build ruby-build-1 ruby-build-2 ruby-build-3
+
+  # Cancel all builds created from 'ruby-build' build configuration that are in 'new' state
+  $ oc cancel-build bc/ruby-build --state=new
 ----
 ====
 

pkg/build/util/util.go

@@ -9,6 +9,7 @@ import (
 	"k8s.io/kubernetes/pkg/labels"
 
 	buildapi "github.com/openshift/origin/pkg/build/api"
+	"github.com/openshift/origin/pkg/client"
 )
 
 const (
@@ -90,6 +91,30 @@ func BuildConfigSelectorDeprecated(name string) labels.Selector {
 	return labels.Set{buildapi.BuildConfigLabelDeprecated: name}.AsSelector()
 }
 
+type buildFilter func(buildapi.Build) bool
+
+// BuildConfigBuilds return a list of builds for the given build config.
+// Optionally you can specify a filter function to select only builds that
+// matches your criteria.
+func BuildConfigBuilds(c client.BuildInterface, name string, filterFunc buildFilter) (*buildapi.BuildList, error) {
+	result, err := c.List(kapi.ListOptions{
+		LabelSelector: BuildConfigSelector(name),
+	})
+	if err != nil {
+		return nil, err
+	}
+	if filterFunc == nil {
+		return result, nil
+	}
+	filteredList := &buildapi.BuildList{TypeMeta: result.TypeMeta, ListMeta: result.ListMeta}
+	for _, b := range result.Items {
+		if filterFunc(b) {
+			filteredList.Items = append(filteredList.Items, b)
+		}
+	}
+	return filteredList, nil
+}
+
 // ConfigNameForBuild returns the name of the build config from a
 // build name.
 func ConfigNameForBuild(build *buildapi.Build) string {

pkg/cmd/cli/cli.go

@@ -104,7 +104,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 				cmd.NewCmdRollback(fullName, f, out),
 				cmd.NewCmdNewBuild(fullName, f, in, out),
 				cmd.NewCmdStartBuild(fullName, f, in, out),
-				cmd.NewCmdCancelBuild(fullName, f, out),
+				cmd.NewCmdCancelBuild(fullName, f, in, out),
 				cmd.NewCmdImportImage(fullName, f, out),
 				cmd.NewCmdTag(fullName, f, out),
 			},