asd

cmd/deployments/logs.go

@@ -68,19 +68,19 @@ func showLogsFollow(
 	ce *clienv.CliEnv,
 	cl *nhostclient.Client,
 	deploymentID string,
-) error {
+) (string, error) {
 	ticker := time.NewTicker(time.Second * 2) //nolint:mnd
 
 	printed := make(map[string]struct{})
 
 	for {
 		select {
 		case <-ctx.Done():
-			return nil
+			return "", nil
 		case <-ticker.C:
 			resp, err := cl.GetDeploymentLogs(ctx, deploymentID)
 			if err != nil {
-				return fmt.Errorf("failed to get deployments: %w", err)
+				return "", fmt.Errorf("failed to get deployments: %w", err)
 			}
 
 			for _, log := range resp.GetDeploymentLogs() {
@@ -95,7 +95,7 @@ func showLogsFollow(
 			}
 
 			if resp.Deployment.DeploymentEndedAt != nil {
-				return nil
+				return *resp.Deployment.DeploymentStatus, nil
 			}
 		}
 	}
@@ -118,7 +118,7 @@ func commandLogs(cCtx *cli.Context) error {
 		ctx, cancel := context.WithTimeout(cCtx.Context, cCtx.Duration(flagTimeout))
 		defer cancel()
 
-		if err := showLogsFollow(ctx, ce, cl, deploymentID); err != nil {
+		if _, err := showLogsFollow(ctx, ce, cl, deploymentID); err != nil {
 			return err
 		}
 	} else {

cmd/deployments/new.go

@@ -29,7 +29,7 @@ func CommandNew() *cli.Command {
 			[]cli.Flag{
 				&cli.BoolFlag{ //nolint:exhaustruct
 					Name:  flagFollow,
-					Usage: "Specify if the logs should be streamed",
+					Usage: "Specify if the logs should be streamed. If set, the command will wait for the deployment to finish and stream the logs. If the deployment fails the command will return an error.", //nolint:lll
 					Value: false,
 				},
 				&cli.DurationFlag{ //nolint:exhaustruct
@@ -103,7 +103,14 @@ func commandNew(cCtx *cli.Context) error {
 		ctx, cancel := context.WithTimeout(cCtx.Context, cCtx.Duration(flagTimeout))
 		defer cancel()
 
-		return showLogsFollow(ctx, ce, cl, resp.InsertDeployment.ID)
+		status, err := showLogsFollow(ctx, ce, cl, resp.InsertDeployment.ID)
+		if err != nil {
+			return fmt.Errorf("error streaming logs: %w", err)
+		}
+
+		if status != "DEPLOYED" {
+			return fmt.Errorf("deployment failed: %s", status) //nolint:goerr113
+		}
 	}
 
 	return nil

nhostclient/graphql/query/deployments.graphql

@@ -27,6 +27,7 @@ query GetDeploymentLogs($deploymentID: uuid!) {
     id: $deploymentID
   ) {
     deploymentEndedAt
+    deploymentStatus
   }
 }