cli: Increase default execution timeout in async-await commands

Some CLI commands like `container create` are async-await. Previously,
default execution timeout was 15s for such commands. Since more than one
RPC is needed for theses commands (e.g. creation request and polling),
there is a need to increase default timeout in waiting mode.

Add `GetCommandContextWithAwait` and use it in `create`, `delete` and
`set-eacl` commands of `container` section. Make command to time out
after 1m if `--await` flag is set while `--timeout` one is omitted.

Closes nspcc-dev#2124.

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>

cmd/neofs-cli/internal/commonflags/flags.go

@@ -84,6 +84,19 @@ func Bind(cmd *cobra.Command) {
 	_ = viper.BindPFlag(Timeout, ff.Lookup(Timeout))
 }
 
+// GetCommandContextWithAwait works like GetCommandContext but uses specified
+// await timeout if 'timeout' flag is omitted and given boolean await flag is
+// set.
+func GetCommandContextWithAwait(cmd *cobra.Command, awaitFlag string, awaitTimeout time.Duration) (context.Context, context.CancelFunc) {
+	if !viper.IsSet(Timeout) {
+		if await, _ := cmd.Flags().GetBool(awaitFlag); await {
+			return getCommandContext(cmd, awaitTimeout)
+		}
+	}
+
+	return GetCommandContext(cmd)
+}
+
 // GetCommandContext returns cmd context with timeout specified in 'timeout' flag
 // if the flag is set.
 func GetCommandContext(cmd *cobra.Command) (context.Context, context.CancelFunc) {

cmd/neofs-cli/modules/container/create.go

@@ -38,7 +38,7 @@ var createContainerCmd = &cobra.Command{
 	Long: `Create new container and register it in the NeoFS. 
 It will be stored in sidechain when inner ring will accepts it.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		ctx, cancel := commonflags.GetCommandContext(cmd)
+		ctx, cancel := getAwaitContext(cmd)
 		defer cancel()
 
 		placementPolicy, err := parseContainerPolicy(cmd, containerPolicy)
@@ -134,17 +134,21 @@ It will be stored in sidechain when inner ring will accepts it.`,
 			getPrm.SetClient(cli)
 			getPrm.SetContainer(id)
 
-			for i := 0; i < awaitTimeout; i++ {
+			for {
 				time.Sleep(1 * time.Second)
 
+				select {
+				case <-ctx.Done():
+					common.ExitOnErr(cmd, "", errCreateTimeout)
+				default:
+				}
+
 				_, err := internalclient.GetContainer(ctx, getPrm)
 				if err == nil {
 					cmd.Println("container has been persisted on sidechain")
 					return
 				}
 			}
-
-			common.ExitOnErr(cmd, "", errCreateTimeout)
 		}
 	},
 }

cmd/neofs-cli/modules/container/delete.go

@@ -20,7 +20,7 @@ var deleteContainerCmd = &cobra.Command{
 	Long: `Delete existing container. 
 Only owner of the container has a permission to remove container.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		ctx, cancel := commonflags.GetCommandContext(cmd)
+		ctx, cancel := getAwaitContext(cmd)
 		defer cancel()
 
 		id := parseContainerID(cmd)
@@ -107,17 +107,21 @@ Only owner of the container has a permission to remove container.`,
 			getPrm.SetClient(cli)
 			getPrm.SetContainer(id)
 
-			for i := 0; i < awaitTimeout; i++ {
+			for {
 				time.Sleep(1 * time.Second)
 
+				select {
+				case <-ctx.Done():
+					common.ExitOnErr(cmd, "", errDeleteTimeout)
+				default:
+				}
+
 				_, err := internalclient.GetContainer(ctx, getPrm)
 				if err != nil {
 					cmd.Println("container has been removed:", containerID)
 					return
 				}
 			}
-
-			common.ExitOnErr(cmd, "", errDeleteTimeout)
 		}
 	},
 }

cmd/neofs-cli/modules/container/set_eacl.go

@@ -24,7 +24,7 @@ var setExtendedACLCmd = &cobra.Command{
 	Long: `Set new extended ACL table for container.
 Container ID in EACL table will be substituted with ID from the CLI.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		ctx, cancel := commonflags.GetCommandContext(cmd)
+		ctx, cancel := getAwaitContext(cmd)
 		defer cancel()
 
 		id := parseContainerID(cmd)
@@ -71,9 +71,15 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
 			getEACLPrm.SetClient(cli)
 			getEACLPrm.SetContainer(id)
 
-			for i := 0; i < awaitTimeout; i++ {
+			for {
 				time.Sleep(1 * time.Second)
 
+				select {
+				case <-ctx.Done():
+					common.ExitOnErr(cmd, "", errSetEACLTimeout)
+				default:
+				}
+
 				res, err := internalclient.EACL(ctx, getEACLPrm)
 				if err == nil {
 					// compare binary values because EACL could have been set already
@@ -90,7 +96,6 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
 				}
 			}
 
-			common.ExitOnErr(cmd, "", errSetEACLTimeout)
 		}
 	},
 }

cmd/neofs-cli/modules/container/util.go

@@ -1,7 +1,9 @@
 package container
 
 import (
+	"context"
 	"errors"
+	"time"
 
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
@@ -12,8 +14,6 @@ import (
 
 const (
 	attributeDelimiter = "="
-
-	awaitTimeout = 120 // in seconds
 )
 
 var (
@@ -55,3 +55,7 @@ func getSession(cmd *cobra.Command) *session.Container {
 
 	return &res
 }
+
+func getAwaitContext(cmd *cobra.Command) (context.Context, context.CancelFunc) {
+	return commonflags.GetCommandContextWithAwait(cmd, "await", time.Minute)
+}