Merge pull request #71 from mihaichitic/ND-7580

[ND-7580] - add Pipeline monitor interval to env actions

Author: bunnyshellcloud

cmd/environment/action/delete.go

@@ -34,7 +34,7 @@ func init() {
 				return lib.FormatCommandData(cmd, event)
 			}
 
-			if err = processEventPipeline(cmd, event, "delete", settings.IsStylish()); err != nil {
+			if err = processEventPipeline(cmd, event, "delete", settings.IsStylish(), deleteOptions.Interval); err != nil {
 				cmd.Printf("\nEnvironment %s deletion failed\n", deleteOptions.ID)
 
 				return err

cmd/environment/action/root.go

@@ -3,6 +3,7 @@ package action
 import (
 	"errors"
 	"fmt"
+	"time"
 
 	"bunnyshell.com/cli/pkg/api/common"
 	"bunnyshell.com/cli/pkg/api/component/endpoint"
@@ -58,7 +59,7 @@ func HandleDeploy(cmd *cobra.Command, deployOptions *environment.DeployOptions,
 		return lib.FormatCommandData(cmd, event)
 	}
 
-	if err = processEventPipeline(cmd, event, "deploy", printLogs); err != nil {
+	if err = processEventPipeline(cmd, event, "deploy", printLogs, deployOptions.Interval); err != nil {
 		if printLogs {
 			cmd.Printf("\nEnvironment %s deploying failed\n", deployOptions.ID)
 		}
@@ -120,8 +121,11 @@ func ensureKubernetesIntegration(deployOptions *environment.DeployOptions, kuber
 	return err
 }
 
-func processEventPipeline(cmd *cobra.Command, event *sdk.EventItem, action string, printLogs bool) error {
+func processEventPipeline(cmd *cobra.Command, event *sdk.EventItem, action string, printLogs bool, interval time.Duration) error {
 	progressOptions := progress.NewOptions()
+	if interval != 0 {
+		progressOptions.Interval = interval
+	}
 
 	if printLogs {
 		cmd.Printf(
@@ -150,7 +154,7 @@ func processEventPipeline(cmd *cobra.Command, event *sdk.EventItem, action strin
 		}
 	}
 
-	if err = progress.Pipeline(pipeline.GetId(), nil); err != nil {
+	if err = progress.Pipeline(pipeline.GetId(), progressOptions); err != nil {
 		return err
 	}
 

cmd/environment/action/start.go

@@ -36,7 +36,7 @@ func init() {
 
 			printLogs := settings.IsStylish()
 
-			if err = processEventPipeline(cmd, event, "start", printLogs); err != nil {
+			if err = processEventPipeline(cmd, event, "start", printLogs, startOptions.Interval); err != nil {
 				if printLogs {
 					cmd.Printf("\nEnvironment %s starting failed\n", startOptions.ID)
 				}

cmd/environment/action/stop.go

@@ -36,7 +36,7 @@ func init() {
 
 			printLogs := settings.IsStylish()
 
-			if err = processEventPipeline(cmd, event, "stop", printLogs); err != nil {
+			if err = processEventPipeline(cmd, event, "stop", printLogs, stopOptions.Interval); err != nil {
 				if printLogs {
 					cmd.Printf("\nEnvironment %s stopping failed\n", stopOptions.ID)
 				}

pkg/api/common/action.go

@@ -1,23 +1,30 @@
 package common
 
 import (
+	"time"
+
 	"github.com/spf13/pflag"
 )
 
 type ActionOptions struct {
 	ItemOptions
 
 	WithoutPipeline bool
+
+	Interval time.Duration
 }
 
 func NewActionOptions(id string) *ActionOptions {
 	return &ActionOptions{
 		ItemOptions: *NewItemOptions(id),
 
 		WithoutPipeline: false,
+
+		Interval: 2000 * time.Millisecond,
 	}
 }
 
 func (ao *ActionOptions) UpdateFlagSet(flags *pflag.FlagSet) {
 	flags.BoolVar(&ao.WithoutPipeline, "no-wait", ao.WithoutPipeline, "Do not wait for pipeline until finish")
+	flags.DurationVar(&ao.Interval, "pipeline-monitor-interval", ao.Interval, "Pipeline check interval")
 }

pkg/progress/vars.go

@@ -35,7 +35,7 @@ const (
 )
 
 const (
-	defaultSpinnerUpdate = 150 * time.Millisecond
+	defaultSpinnerUpdate = 2000 * time.Millisecond
 	defaultProgressSet   = 69 // ∙∙●
 )