Add support to list N deployments in 'osc deploy'

fabianofranz · fabianofranz · commit e243771ea97b · 2015-05-07T17:37:28.000-03:00
diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -402,6 +402,8 @@ osc get dc
 osc create -f test/integration/fixtures/test-deployment-config.json
 osc describe deploymentConfigs test-deployment-config
 osc deploy test-deployment-config
+osc deploy test-deployment-config -L
+osc deploy test-deployment-config -L 3
 osc delete deploymentConfigs test-deployment-config
 echo "deploymentConfigs: ok"
 
diff --git a/pkg/cmd/cli/cmd/deploy.go b/pkg/cmd/cli/cmd/deploy.go
@@ -26,6 +26,12 @@ NOTE: This command is still under active development and is subject to change.`
 	deploy_example = `  // Display the latest deployment for the 'database' deployment config
   $ %[1]s deploy database
 
+  // List the most recent deployments for the 'database' deployment config
+  $ %[1]s deploy database -L
+
+  // List the most recent deployments for the 'database' deployment config, limited to three
+  $ %[1]s deploy database -L 3
+
   // Start a new deployment based on the 'frontend' deployment config
   $ %[1]s deploy frontend --latest`
 )
@@ -34,6 +40,7 @@ NOTE: This command is still under active development and is subject to change.`
 func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {
 	var deployLatest bool
 	var retryDeploy bool
+	var listSize int
 
 	cmd := &cobra.Command{
 		Use:     "deploy DEPLOYMENTCONFIG",
@@ -45,10 +52,22 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C
 				fmt.Println(cmdutil.UsageError(cmd, "A deploymentConfig name is required."))
 				return
 			}
+			listFlag := cmd.Flags().Lookup("list")
+			if listFlag.Changed && (deployLatest || retryDeploy) {
+				fmt.Println(cmdutil.UsageError(cmd, "The -L|--list flag can't be used with --latest or --retry."))
+				return
+			}
 			if deployLatest && retryDeploy {
 				fmt.Println(cmdutil.UsageError(cmd, "Only one of --latest or --retry is allowed."))
 				return
 			}
+			if listSize < 1 {
+				fmt.Println(cmdutil.UsageError(cmd, "The -L|--list flag require a value greater than zero."))
+				return
+			}
+			if !listFlag.Changed {
+				listSize = 1
+			}
 
 			configName := args[0]
 
@@ -81,7 +100,7 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C
 				c := &retryDeploymentCommand{client: commandClient}
 				err = c.retry(config, out)
 			default:
-				describer := describe.NewLatestDeploymentDescriber(osClient, kubeClient)
+				describer := describe.NewLatestDeploymentsDescriber(osClient, kubeClient, listSize)
 				desc, err := describer.Describe(config.Namespace, config.Name)
 				cmdutil.CheckErr(err)
 				fmt.Fprintln(out, desc)
@@ -92,6 +111,8 @@ func NewCmdDeploy(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C
 
 	cmd.Flags().BoolVar(&deployLatest, "latest", false, "Start a new deployment now.")
 	cmd.Flags().BoolVar(&retryDeploy, "retry", false, "Retry the latest failed deployment.")
+	cmd.Flags().IntVarP(&listSize, "list", "L", 10, "Print a list of the latest deployments, limited to the amount provided.")
+	cmd.Flags().MarkOptional("list")
 
 	return cmd
 }
diff --git a/pkg/cmd/cli/describe/deployments.go b/pkg/cmd/cli/describe/deployments.go
@@ -29,13 +29,15 @@ type DeploymentConfigDescriber struct {
 type deploymentDescriberClient interface {
 	getDeploymentConfig(namespace, name string) (*deployapi.DeploymentConfig, error)
 	getDeployment(namespace, name string) (*kapi.ReplicationController, error)
+	listDeployments(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error)
 	listPods(namespace string, selector labels.Selector) (*kapi.PodList, error)
 	listEvents(deploymentConfig *deployapi.DeploymentConfig) (*kapi.EventList, error)
 }
 
 type genericDeploymentDescriberClient struct {
 	getDeploymentConfigFunc func(namespace, name string) (*deployapi.DeploymentConfig, error)
 	getDeploymentFunc       func(namespace, name string) (*kapi.ReplicationController, error)
+	listDeploymentsFunc     func(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error)
 	listPodsFunc            func(namespace string, selector labels.Selector) (*kapi.PodList, error)
 	listEventsFunc          func(deploymentConfig *deployapi.DeploymentConfig) (*kapi.EventList, error)
 }
@@ -48,6 +50,10 @@ func (c *genericDeploymentDescriberClient) getDeployment(namespace, name string)
 	return c.getDeploymentFunc(namespace, name)
 }
 
+func (c *genericDeploymentDescriberClient) listDeployments(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error) {
+	return c.listDeploymentsFunc(namespace, selector)
+}
+
 func (c *genericDeploymentDescriberClient) listPods(namespace string, selector labels.Selector) (*kapi.PodList, error) {
 	return c.listPodsFunc(namespace, selector)
 }
@@ -253,19 +259,24 @@ func getPodStatusForDeployment(deployment *kapi.ReplicationController, client de
 	return
 }
 
-type LatestDeploymentDescriber struct {
+type LatestDeploymentsDescriber struct {
+	size   int
 	client deploymentDescriberClient
 }
 
-func NewLatestDeploymentDescriber(client client.Interface, kclient kclient.Interface) *LatestDeploymentDescriber {
-	return &LatestDeploymentDescriber{
+func NewLatestDeploymentsDescriber(client client.Interface, kclient kclient.Interface, size int) *LatestDeploymentsDescriber {
+	return &LatestDeploymentsDescriber{
+		size: size,
 		client: &genericDeploymentDescriberClient{
 			getDeploymentConfigFunc: func(namespace, name string) (*deployapi.DeploymentConfig, error) {
 				return client.DeploymentConfigs(namespace).Get(name)
 			},
 			getDeploymentFunc: func(namespace, name string) (*kapi.ReplicationController, error) {
 				return kclient.ReplicationControllers(namespace).Get(name)
 			},
+			listDeploymentsFunc: func(namespace string, selector labels.Selector) (*kapi.ReplicationControllerList, error) {
+				return kclient.ReplicationControllers(namespace).List(selector)
+			},
 			listPodsFunc: func(namespace string, selector labels.Selector) (*kapi.PodList, error) {
 				return kclient.Pods(namespace).List(selector, fields.Everything())
 			},
@@ -276,66 +287,56 @@ func NewLatestDeploymentDescriber(client client.Interface, kclient kclient.Inter
 	}
 }
 
-func (d *LatestDeploymentDescriber) Describe(namespace, name string) (string, error) {
+func (d *LatestDeploymentsDescriber) Describe(namespace, name string) (string, error) {
 	config, err := d.client.getDeploymentConfig(namespace, name)
 	if err != nil {
 		return "", err
 	}
 
-	deploymentName := deployutil.LatestDeploymentNameForConfig(config)
-	deployment, err := d.client.getDeployment(config.Namespace, deploymentName)
-	if err != nil && !kerrors.IsNotFound(err) {
-		return "", err
+	var deployments []kapi.ReplicationController
+	if d.size > 1 {
+		list, err := d.client.listDeployments(namespace, labels.Everything())
+		if err != nil && !kerrors.IsNotFound(err) {
+			return "", err
+		}
+		deployments = list.Items
+	} else {
+		deploymentName := deployutil.LatestDeploymentNameForConfig(config)
+		deployment, err := d.client.getDeployment(config.Namespace, deploymentName)
+		if err != nil && !kerrors.IsNotFound(err) {
+			return "", err
+		}
+		if deployment != nil {
+			deployments = []kapi.ReplicationController{*deployment}
+		}
 	}
 
 	g := graph.New()
 	deploy := graph.DeploymentConfig(g, config)
-	if deployment != nil {
-		graph.JoinDeployments(deploy.(*graph.DeploymentConfigNode), []kapi.ReplicationController{*deployment})
+	if len(deployments) > 0 {
+		graph.JoinDeployments(deploy.(*graph.DeploymentConfigNode), deployments)
 	}
 
 	return tabbedString(func(out *tabwriter.Writer) error {
 		indent := "  "
-		fmt.Fprintf(out, "Latest deployment for %s/%s:\n", namespace, name)
-		printLines(out, indent, 1, d.describeDeployment(deploy.(*graph.DeploymentConfigNode))...)
+		node := deploy.(*graph.DeploymentConfigNode)
+		nDeployments := len(node.Deployments) + 1
+		var msg string
+		if d.size == 1 || nDeployments == 1 {
+			msg = fmt.Sprintf("Latest deployment for %s/%s:\n", namespace, name)
+		} else {
+			if nDeployments > d.size {
+				msg = fmt.Sprintf("Latest %v deployments for %s/%s:\n", d.size, namespace, name)
+			} else {
+				msg = fmt.Sprintf("All %v deployments for %s/%s:\n", nDeployments, namespace, name)
+			}
+		}
+		descriptions := describeDeployments(node, d.size)
+		printLines(out, indent, 0, append([]string{msg}, descriptions...)...)
 		return nil
 	})
 }
 
-func (d *LatestDeploymentDescriber) describeDeployment(node *graph.DeploymentConfigNode) []string {
-	if node == nil {
-		return nil
-	}
-	out := []string{}
-
-	if node.ActiveDeployment == nil {
-		on, auto := describeDeploymentConfigTriggers(node.DeploymentConfig)
-		if node.DeploymentConfig.LatestVersion == 0 {
-			out = append(out, fmt.Sprintf("#1 waiting %s. Run osc deploy --latest to deploy now.", on))
-		} else if auto {
-			out = append(out, fmt.Sprintf("#%d pending %s. Run osc deploy --latest to deploy now.", node.DeploymentConfig.LatestVersion, on))
-		}
-		// TODO: detect new image available?
-	} else {
-		out = append(out, d.describeDeploymentStatus(node.ActiveDeployment))
-	}
-	return out
-}
-
-func (d *LatestDeploymentDescriber) describeDeploymentStatus(deploy *kapi.ReplicationController) string {
-	timeAt := strings.ToLower(formatRelativeTime(deploy.CreationTimestamp.Time))
-	switch s := deploy.Annotations[deployapi.DeploymentStatusAnnotation]; deployapi.DeploymentStatus(s) {
-	case deployapi.DeploymentStatusFailed:
-		// TODO: encode fail time in the rc
-		return fmt.Sprintf("#%s failed %s ago. You can restart this deployment with osc deploy --retry.", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)
-	case deployapi.DeploymentStatusComplete:
-		// TODO: pod status output
-		return fmt.Sprintf("#%s deployed %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)
-	default:
-		return fmt.Sprintf("#%s deployment %s %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], strings.ToLower(s), timeAt)
-	}
-}
-
 // DeploymentDescriber generates information about a deployment
 // DEPRECATED.
 type DeploymentDescriber struct {
diff --git a/pkg/cmd/cli/describe/projectstatus.go b/pkg/cmd/cli/describe/projectstatus.go
@@ -357,9 +357,9 @@ func describeDeployments(node *graph.DeploymentConfigNode, count int) []string {
 	if node.ActiveDeployment == nil {
 		on, auto := describeDeploymentConfigTriggers(node.DeploymentConfig)
 		if node.DeploymentConfig.LatestVersion == 0 {
-			out = append(out, fmt.Sprintf("#1 deployment waiting %s", on))
+			out = append(out, fmt.Sprintf("#1 deployment waiting %s. Run osc deploy --latest to deploy now.", on))
 		} else if auto {
-			out = append(out, fmt.Sprintf("#%d deployment pending %s", node.DeploymentConfig.LatestVersion, on))
+			out = append(out, fmt.Sprintf("#%d deployment pending %s. Run osc deploy --latest to deploy now.", node.DeploymentConfig.LatestVersion, on))
 		}
 		// TODO: detect new image available?
 	} else {
@@ -380,7 +380,7 @@ func describeDeploymentStatus(deploy *kapi.ReplicationController) string {
 	switch s := deploy.Annotations[deployapi.DeploymentStatusAnnotation]; deployapi.DeploymentStatus(s) {
 	case deployapi.DeploymentStatusFailed:
 		// TODO: encode fail time in the rc
-		return fmt.Sprintf("#%s deployment failed %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)
+		return fmt.Sprintf("#%s deployment failed %s ago. You can restart this deployment with osc deploy --retry.", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)
 	case deployapi.DeploymentStatusComplete:
 		// TODO: pod status output
 		return fmt.Sprintf("#%s deployed %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], timeAt)
