Merge pull request #11316 from kargakis/make-deploy-latest-suggest-ro…

…llout Merged by openshift-bot
openshift · Oct 14, 2016 · dbdc2f8 · dbdc2f8
2 parents ebcc568 + 02a2d62
commit dbdc2f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/cmd/cli/cmd/deploy.go b/pkg/cmd/cli/cmd/deploy.go
@@ -259,6 +259,9 @@ func (o DeployOptions) deploy(config *deployapi.DeploymentConfig) error {
 		dc, err = o.osClient.DeploymentConfigs(config.Namespace).Update(config)
 	}
 	if err != nil {
+		if kerrors.IsBadRequest(err) {
+			err = fmt.Errorf("%v - try 'oc rollout latest dc/%s'", err, config.Name)
+		}
 		return err
 	}
 	fmt.Fprintf(o.out, "Started deployment #%d\n", dc.Status.LatestVersion)

diff --git a/pkg/deploy/registry/instantiate/rest.go b/pkg/deploy/registry/instantiate/rest.go
@@ -47,7 +47,7 @@ func (s *REST) New() runtime.Object {
 func (r *REST) Create(ctx kapi.Context, obj runtime.Object) (runtime.Object, error) {
 	req, ok := obj.(*deployapi.DeploymentRequest)
 	if !ok {
-		return nil, errors.NewBadRequest(fmt.Sprintf("wrong object passed for requesting a new deployment: %#v", obj))
+		return nil, errors.NewInternalError(fmt.Errorf("wrong object passed for requesting a new rollout: %#v", obj))
 	}
 
 	configObj, err := r.store.Get(ctx, req.Name)
@@ -266,7 +266,7 @@ func decodeFromLatestDeployment(config *deployapi.DeploymentConfig, rn kclient.R
 	}
 	decoded, err := deployutil.DecodeDeploymentConfig(deployment, decoder)
 	if err != nil {
-		return nil, errors.NewBadRequest(err.Error())
+		return nil, errors.NewInternalError(err)
 	}
 	return decoded, nil
 }