Merge pull request #563 from Scalingo/fix/562/deployment_fails

Send an non zero exit code when the deploy command fails
Scalingo · May 15, 2020 · d4ec4e9 · d4ec4e9
1 parent 22a315f
commit d4ec4e9
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Region Migration: Better output for the `migration-follow` command to explain what is happening [#549](https://github.com/Scalingo/cli/pull/549)
 * Region Migration: Retry if it fails to refresh the migration status [#550](https://github.com/Scalingo/cli/pull/550)
 * Region Migration: Add instructions to change local Git URL at the end of the migration [#551](https://github.com/Scalingo/cli/pull/551)
+* Deployment: Send a non 0 exit code when a deployment fails [#563](https://github.com/Scalingo/cli/pull/563)
 * Bugfix: fix support for `addon_updated` and `start_region_migration` event type [#558](https://github.com/Scalingo/cli/pull/558)
 * Bugfix: fix author of `restart` and `edit_variable` when it's an addon [#558](https://github.com/Scalingo/cli/pull/558)
 

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -26,8 +26,7 @@
 
 [[constraint]]
   name = "github.com/Scalingo/go-scalingo"
-  # version = "^4"
-  branch = "fix/cli/556/addon_updated"
+  version = "^4"
 
 [[constraint]]
   branch = "master"

diff --git a/deployments/deploy.go b/deployments/deploy.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/debug"
 	"github.com/Scalingo/go-scalingo"
+	"github.com/Scalingo/go-scalingo/debug"
 	scalingoio "github.com/Scalingo/go-scalingo/io"
 
 	"gopkg.in/errgo.v1"

diff --git a/deployments/follow.go b/deployments/follow.go
@@ -2,18 +2,21 @@ package deployments
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	stdio "io"
 	"strings"
 	"time"
 
 	"github.com/Scalingo/cli/config"
-	"github.com/Scalingo/go-scalingo/debug"
 	"github.com/Scalingo/go-scalingo"
+	"github.com/Scalingo/go-scalingo/debug"
 	"golang.org/x/net/websocket"
 	"gopkg.in/errgo.v1"
 )
 
+var ErrDeploymentFailed = errors.New("Deployment failed")
+
 type StreamOpts struct {
 	AppName      string
 	DeploymentID string
@@ -117,6 +120,9 @@ func Stream(opts *StreamOpts) error {
 				statuses[event.ID] = statusData.Content
 
 				if !anyDeployment && scalingo.IsFinishedString(scalingo.DeploymentStatus(statusData.Content)) {
+					if scalingo.HasFailedString(scalingo.DeploymentStatus(statusData.Content)) {
+						return ErrDeploymentFailed
+					}
 					return nil
 				}
 			case "new":

diff --git a/vendor/github.com/Scalingo/go-scalingo/client.go b/vendor/github.com/Scalingo/go-scalingo/client.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/deployments.go b/vendor/github.com/Scalingo/go-scalingo/deployments.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/events_structs.go b/vendor/github.com/Scalingo/go-scalingo/events_structs.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/log_drains.go b/vendor/github.com/Scalingo/go-scalingo/log_drains.go
diff --git a/vendor/github.com/Scalingo/go-scalingo/version.go b/vendor/github.com/Scalingo/go-scalingo/version.go