feat(networkpeering): add --wait flag to disable command (#295)

Author: kangasta

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/UpCloudLtd/progress v1.0.2
-	github.com/UpCloudLtd/upcloud-go-api/v8 v8.0.0
+	github.com/UpCloudLtd/upcloud-go-api/v8 v8.2.0
 	github.com/adrg/xdg v0.3.2
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/gemalto/flume v0.12.0

go.sum

@@ -17,8 +17,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/UpCloudLtd/progress v1.0.2 h1:CTr1bBuFuXop9TEhR1PakbUMPTlUVL7Bgae9JgqXwPg=
 github.com/UpCloudLtd/progress v1.0.2/go.mod h1:iGxOnb9HvHW0yrLGUjHr0lxHhn7TehgWwh7a8NqK6iQ=
-github.com/UpCloudLtd/upcloud-go-api/v8 v8.0.0 h1:SqSNedBTgVO7GYZb2ixFradeEKKy5NfrWukQ/SMW0V4=
-github.com/UpCloudLtd/upcloud-go-api/v8 v8.0.0/go.mod h1:pMuPcIQ5VUC65UETsaEPgHiDymxwX/3xYm4vlC4E9VI=
+github.com/UpCloudLtd/upcloud-go-api/v8 v8.2.0 h1:+/vej9U9eSOUFt1MRRtB+GXEXWtLacyfWn9KmHCnLkw=
+github.com/UpCloudLtd/upcloud-go-api/v8 v8.2.0/go.mod h1:pMuPcIQ5VUC65UETsaEPgHiDymxwX/3xYm4vlC4E9VI=
 github.com/adrg/xdg v0.3.2 h1:GUSGQ5pHdev83AYhDSS1A/CX+0JIsxbiWtow2DSA+RU=
 github.com/adrg/xdg v0.3.2/go.mod h1:7I2hH/IT30IsupOpKZ5ue7/qNi3CoKzD6tL3HwpaRMQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

internal/commands/networkpeering/disable.go

@@ -5,8 +5,10 @@ import (
 
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/completion"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/config"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/output"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/resolver"
+	"github.com/spf13/pflag"
 
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
@@ -28,6 +30,15 @@ type disableCommand struct {
 	*commands.BaseCommand
 	resolver.CachingNetworkPeering
 	completion.NetworkPeering
+
+	wait config.OptionalBoolean
+}
+
+// InitCommand implements Command.InitCommand
+func (c *disableCommand) InitCommand() {
+	flags := &pflag.FlagSet{}
+	config.AddToggleFlag(flags, &c.wait, "wait", false, "Wait for network peering to be in disabled state before returning.")
+	c.AddFlags(flags)
 }
 
 // Execute implements commands.MultipleArgumentCommand
@@ -46,7 +57,11 @@ func (c *disableCommand) Execute(exec commands.Executor, arg string) (output.Out
 		return commands.HandleError(exec, msg, err)
 	}
 
-	exec.PushProgressSuccess(msg)
+	if c.wait.Value() {
+		waitForNetworkPeeringState(arg, upcloud.NetworkPeeringStateDisabled, exec, msg)
+	} else {
+		exec.PushProgressSuccess(msg)
+	}
 
 	return output.OnlyMarshaled{Value: peering}, nil
 }

internal/commands/networkpeering/networkpeering.go

@@ -1,7 +1,14 @@
 package networkpeering
 
 import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/UpCloudLtd/progress/messages"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
 )
 
 // BaseNetworkPeeringCommand creates the base "networkpeering" command
@@ -14,3 +21,27 @@ func BaseNetworkPeeringCommand() commands.Command {
 type networkpeeringCommand struct {
 	*commands.BaseCommand
 }
+
+// waitForNetworkPeeringState waits for network peering to reach given state and updates progress message with key matching given msg. Finally, progress message is updated back to given msg and either done state or timeout warning.
+func waitForNetworkPeeringState(uuid string, state upcloud.NetworkPeeringState, exec commands.Executor, msg string) {
+	exec.PushProgressUpdateMessage(msg, fmt.Sprintf("Waiting for network peering %s to be in %s state", uuid, state))
+
+	ctx, cancel := context.WithTimeout(exec.Context(), 15*time.Minute)
+	defer cancel()
+
+	if _, err := exec.All().WaitForNetworkPeeringState(ctx, &request.WaitForNetworkPeeringStateRequest{
+		UUID:         uuid,
+		DesiredState: state,
+	}); err != nil {
+		exec.PushProgressUpdate(messages.Update{
+			Key:     msg,
+			Message: msg,
+			Status:  messages.MessageStatusWarning,
+			Details: "Error: " + err.Error(),
+		})
+		return
+	}
+
+	exec.PushProgressUpdateMessage(msg, msg)
+	exec.PushProgressSuccess(msg)
+}

internal/mock/mock.go

@@ -1285,3 +1285,7 @@ func (m *Service) DeleteNetworkPeering(ctx context.Context, r *request.DeleteNet
 	args := m.Called(r)
 	return args.Error(0)
 }
+
+func (m *Service) WaitForNetworkPeeringState(ctx context.Context, r *request.WaitForNetworkPeeringStateRequest) (*upcloud.NetworkPeering, error) {
+	return nil, nil
+}