Merge pull request #909 from Scalingo/feat/901/run_attached_one_off_a…

…synchronously

feat(one-off): allow attached one-off to be run asynchronously

apps/operations.go

@@ -9,22 +9,26 @@ import (
 	"path/filepath"
 	"time"
 
-	"gopkg.in/errgo.v1"
-
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/go-scalingo/v6"
+	scalingo "github.com/Scalingo/go-scalingo/v6"
+	errors "github.com/Scalingo/go-utils/errors/v2"
 )
 
 func handleOperation(ctx context.Context, app string, res *http.Response) error {
-	opURL, err := url.Parse(res.Header.Get("Location"))
+	operationURL := res.Header.Get("Location")
+	return handleOperationWithURL(ctx, app, operationURL)
+}
+
+func handleOperationWithURL(ctx context.Context, app string, operationURL string, containerLabel ...string) error {
+	opURL, err := url.Parse(operationURL)
 	if err != nil {
-		return errgo.Mask(err)
+		return errors.Notef(ctx, err, "parse url of operation")
 	}
 
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errors.Notef(ctx, err, "get Scalingo client")
 	}
 
 	var op *scalingo.Operation
@@ -35,6 +39,11 @@ func handleOperation(ctx context.Context, app string, res *http.Response) error
 	defer close(done)
 	defer close(errs)
 
+	op, err = c.OperationsShow(ctx, app, opID)
+	if err != nil {
+		return errors.Notef(ctx, err, "get operation %v", opID)
+	}
+
 	go func() {
 		for {
 			op, err = c.OperationsShow(ctx, app, opID)
@@ -51,23 +60,48 @@ func handleOperation(ctx context.Context, app string, res *http.Response) error
 		}
 	}()
 
-	fmt.Print("Status:  ")
+	if op.Type == scalingo.OperationTypeStartOneOff {
+		fmt.Printf("-----> Starting container %v   ", containerLabel)
+	} else {
+		fmt.Print("Status:  ")
+	}
 	spinner := io.NewSpinner(os.Stderr)
 	go spinner.Start()
 	defer spinner.Stop()
 
 	for {
 		select {
 		case err := <-errs:
-			return errgo.Mask(err)
+			return errors.Notef(ctx, err, "get operation %v", op.ID)
 		case <-done:
 			if op.Status == "done" {
 				fmt.Printf("\bDone in %.3f seconds\n", op.ElapsedDuration())
 				return nil
 			} else if op.Status == "error" {
 				fmt.Printf("\bOperation '%s' failed, an error occurred: %v\n", op.Type, op.Error)
-				return nil
+				return errors.Newf(ctx, "operation %v failed", op.ID)
 			}
 		}
 	}
 }
+
+func GetAttachURLFromOperationWithURL(ctx context.Context, app string, operationURL string) (string, error) {
+	opURL, err := url.Parse(operationURL)
+	if err != nil {
+		return "", errors.Notef(ctx, err, "parse url of operation")
+	}
+
+	c, err := config.ScalingoClient(ctx)
+	if err != nil {
+		return "", errors.Notef(ctx, err, "get Scalingo client")
+	}
+
+	var operation *scalingo.Operation
+	opID := filepath.Base(opURL.Path)
+	operation, err = c.OperationsShow(ctx, app, opID)
+	if err != nil {
+		return "", errors.Notef(ctx, err, "get operation %v", opID)
+	}
+
+	return operation.StartOneOffData.AttachURL, nil
+}

apps/run.go

@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"strings"
 
-	"gopkg.in/errgo.v1"
+	errgo "gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/apps/run"
 	"github.com/Scalingo/cli/config"
@@ -37,6 +37,7 @@ type RunOpts struct {
 	DisplayCmd     string
 	Silent         bool
 	Detached       bool
+	Async          bool
 	Size           string
 	Type           string
 	Cmd            []string
@@ -58,7 +59,7 @@ type runContext struct {
 func Run(ctx context.Context, opts RunOpts) error {
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errgo.Notef(err, "get Scalingo client")
 	}
 
 	firstReadDone := make(chan struct{})
@@ -103,6 +104,9 @@ func Run(ctx context.Context, opts RunOpts) error {
 	if opts.StdoutCopyFunc != nil {
 		runCtx.stdoutCopyFunc = opts.StdoutCopyFunc
 	}
+	if opts.Detached {
+		opts.Async = false
+	}
 
 	env, err := runCtx.buildEnv(opts.CmdEnv)
 	if err != nil {
@@ -122,10 +126,13 @@ func Run(ctx context.Context, opts RunOpts) error {
 			Env:      env,
 			Size:     opts.Size,
 			Detached: opts.Detached,
-		})
+			Async:    opts.Async,
+		},
+	)
 	if err != nil {
 		return errgo.Mask(err, errgo.Any)
 	}
+
 	debug.Printf("%+v\n", runRes)
 
 	if opts.Detached {
@@ -138,7 +145,17 @@ func Run(ctx context.Context, opts RunOpts) error {
 		return nil
 	}
 
-	runCtx.attachURL = runRes.AttachURL
+	err = handleOperationWithURL(ctx, opts.App, runRes.OperationURL, runRes.Container.Label)
+	if err != nil {
+		return errgo.Mask(err, errgo.Any)
+	}
+
+	attachURL, err := GetAttachURLFromOperationWithURL(ctx, opts.App, runRes.OperationURL)
+	if err != nil {
+		return errgo.Mask(err, errgo.Any)
+	}
+
+	runCtx.attachURL = attachURL
 	debug.Println("Run Service URL is", runCtx.attachURL)
 
 	if len(opts.Files) > 0 {
@@ -221,6 +238,9 @@ func Run(ctx context.Context, opts RunOpts) error {
 	}()
 
 	_, err = runCtx.stdoutCopyFunc(os.Stdout, socket)
+	if err != nil {
+		return errgo.Mask(err, errgo.Any)
+	}
 
 	stopSignalsMonitoring <- true
 
@@ -235,11 +255,11 @@ func Run(ctx context.Context, opts RunOpts) error {
 		return errgo.Mask(err, errgo.Any)
 	}
 
-	os.Exit(exitCode)
+	defer os.Exit(exitCode)
 	return nil
 }
 
-func (ctx *runContext) buildEnv(cmdEnv []string) (map[string]string, error) {
+func (runCtx *runContext) buildEnv(cmdEnv []string) (map[string]string, error) {
 	env := map[string]string{
 		"TERM":      os.Getenv("TERM"),
 		"CLIENT_OS": runtime.GOOS,

cmd/run.go

@@ -87,6 +87,7 @@ var (
 				Files:    c.StringSlice("f"),
 				Silent:   c.Bool("silent"),
 				Detached: c.Bool("detached"),
+				Async:    true,
 			}
 			if (c.Args().Len() == 0 && c.String("t") == "") || (c.Args().Len() > 0 && c.String("t") != "") {
 				cli.ShowCommandHelp(c, "run")

go.mod

@@ -5,8 +5,9 @@ go 1.20
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/ScaleFT/sshkeys v1.2.0
-	github.com/Scalingo/go-scalingo/v6 v6.3.0
+	github.com/Scalingo/go-scalingo/v6 v6.4.0
 	github.com/Scalingo/go-utils/errors v1.1.1
+	github.com/Scalingo/go-utils/errors/v2 v2.2.0
 	github.com/Scalingo/go-utils/logger v1.2.0
 	github.com/Scalingo/go-utils/retry v1.1.1
 	github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2

go.sum

@@ -9,10 +9,12 @@ github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 h1:ra2OtmuW0A
 github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
 github.com/ScaleFT/sshkeys v1.2.0 h1:5BRp6rTVIhJzXT3VcUQrKgXR8zWA3sOsNeuyW15WUA8=
 github.com/ScaleFT/sshkeys v1.2.0/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
-github.com/Scalingo/go-scalingo/v6 v6.3.0 h1:ADtzCCEqx1pdI6VaiOh3u9l8L2tScPp6cIKzvo/lcgE=
-github.com/Scalingo/go-scalingo/v6 v6.3.0/go.mod h1:Y3QByF4s5i3lpJh87c5FEkSN07CWomN5FPt0X/Qzg0I=
+github.com/Scalingo/go-scalingo/v6 v6.4.0 h1:kkSJlPE0SavvO7yrH8dpdYIw2te8d0th5NzkAISS/BY=
+github.com/Scalingo/go-scalingo/v6 v6.4.0/go.mod h1:u3ROWLWw78ug4EQaunzOBzSPKy4ukNQTDrCFaKMG938=
 github.com/Scalingo/go-utils/errors v1.1.1 h1:G7zypaDBj0O6QFvX0xL5dMDXbiBgq+3KKuodldtOpg0=
 github.com/Scalingo/go-utils/errors v1.1.1/go.mod h1:gsnGOMma5x3CSgPb8i5eMuHcKi3RvTJ9dWPNRev161c=
+github.com/Scalingo/go-utils/errors/v2 v2.2.0 h1:n93hge0DzfZ3KbI/jdnxKDTRDD+PXsGwNPKyHRzQYEE=
+github.com/Scalingo/go-utils/errors/v2 v2.2.0/go.mod h1:pkLy6Qz9UNm6FpXtFJGZRC0W5lqbqHpPchrQV80gw5E=
 github.com/Scalingo/go-utils/logger v1.2.0 h1:E3jtaoRxpIsFcZu/jsvWew8ttUAwKUYQufdPqGYp7EU=
 github.com/Scalingo/go-utils/logger v1.2.0/go.mod h1:JArjD1gHdB/vwnlcVG7rYxuIY0tk8/VG4MtirnRwn8k=
 github.com/Scalingo/go-utils/retry v1.1.1 h1:zc5HbXbBzf0fo7zMvhEMvx75qaL2FH7SxDhCoBfS7jE=