From b96a6d108662ac74756e9ed07cb564023e63c9f2 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Tue, 8 Sep 2020 17:19:42 +0200
Subject: [PATCH] Add progress on volume creation

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
---
 aci/volumes.go           | 43 ++++++++++++++++++++++++++++++++++++----
 cli/cmd/volume/volume.go | 20 +++++++++++++------
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/aci/volumes.go b/aci/volumes.go
index 78039d66e..87791923d 100644
--- a/aci/volumes.go
+++ b/aci/volumes.go
@@ -20,6 +20,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/compose-cli/progress"
+
 	"github.com/Azure/go-autorest/autorest/to"
 
 	"github.com/docker/compose-cli/aci/login"
@@ -90,12 +92,16 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
 	if !ok {
 		return volumes.Volume{}, errors.New("Could not read azure LoginParams struct from generic parameter")
 	}
+	w := progress.ContextWriter(ctx)
+	w.Event(event(opts.Account, progress.Working, "Validating"))
 	accountClient, err := login.NewStorageAccountsClient(cs.aciContext.SubscriptionID)
 	if err != nil {
 		return volumes.Volume{}, err
 	}
 	account, err := accountClient.GetProperties(ctx, cs.aciContext.ResourceGroup, opts.Account, "")
-	if err != nil {
+	if err == nil {
+		w.Event(event(opts.Account, progress.Done, "Use existing"))
+	} else {
 		if account.StatusCode != 404 {
 			return volumes.Volume{}, err
 		}
@@ -111,20 +117,27 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
 			return volumes.Volume{}, errors.New("error: " + *result.Message)
 		}
 		parameters := defaultStorageAccountParams(cs.aciContext)
-		// TODO progress account creation
+
+		w.Event(event(opts.Account, progress.Working, "Creating"))
+
 		future, err := accountClient.Create(ctx, cs.aciContext.ResourceGroup, opts.Account, parameters)
 		if err != nil {
+			w.Event(errorEvent(opts.Account))
 			return volumes.Volume{}, err
 		}
 		err = future.WaitForCompletionRef(ctx, accountClient.Client)
 		if err != nil {
+			w.Event(errorEvent(opts.Account))
 			return volumes.Volume{}, err
 		}
 		account, err = future.Result(accountClient)
 		if err != nil {
+			w.Event(errorEvent(opts.Account))
 			return volumes.Volume{}, err
 		}
+		w.Event(event(opts.Account, progress.Done, "Created"))
 	}
+	w.Event(event(opts.Fileshare, progress.Working, "Creating"))
 	fileShareClient, err := login.NewFileShareClient(cs.aciContext.SubscriptionID)
 	if err != nil {
 		return volumes.Volume{}, err
@@ -132,26 +145,48 @@ func (cs *aciVolumeService) Create(ctx context.Context, options interface{}) (vo
 
 	fileShare, err := fileShareClient.Get(ctx, cs.aciContext.ResourceGroup, *account.Name, opts.Fileshare, "")
 	if err == nil {
+		w.Event(errorEvent(opts.Fileshare))
 		return volumes.Volume{}, errors.Wrapf(errdefs.ErrAlreadyExists, "Azure fileshare %q already exists", opts.Fileshare)
 	}
 	if fileShare.StatusCode != 404 {
+		w.Event(errorEvent(opts.Fileshare))
 		return volumes.Volume{}, err
 	}
+	//TODO tag fileshare
 	fileShare, err = fileShareClient.Create(ctx, cs.aciContext.ResourceGroup, *account.Name, opts.Fileshare, storage.FileShare{})
 	if err != nil {
+		w.Event(errorEvent(opts.Fileshare))
 		return volumes.Volume{}, err
 	}
+	w.Event(event(opts.Fileshare, progress.Done, "Created"))
 	return toVolume(account, *fileShare.Name), nil
 }
 
+func event(resource string, status progress.EventStatus, text string) progress.Event {
+	return progress.Event{
+		ID:         resource,
+		Status:     status,
+		StatusText: text,
+	}
+}
+
+func errorEvent(resource string) progress.Event {
+	return progress.Event{
+		ID:         resource,
+		Status:     progress.Error,
+		StatusText: "Error",
+	}
+}
+
 func (cs *aciVolumeService) Delete(ctx context.Context, options interface{}) error {
 	opts, ok := options.(VolumeDeleteOptions)
 	if !ok {
 		return errors.New("Could not read azure VolumeDeleteOptions struct from generic parameter")
 	}
 	if opts.DeleteAccount {
-		//TODO check if there are other shares on this account
-		//TODO flag account and only delete ours
+		//TODO check if there are other fileshares on this account
+		//TODO flag account and only delete ours?
+		//TODO error when not found
 		storageAccountsClient, err := login.NewStorageAccountsClient(cs.aciContext.SubscriptionID)
 		if err != nil {
 			return err
diff --git a/cli/cmd/volume/volume.go b/cli/cmd/volume/volume.go
index 560be5369..1f9b4b956 100644
--- a/cli/cmd/volume/volume.go
+++ b/cli/cmd/volume/volume.go
@@ -17,12 +17,13 @@
 package volume
 
 import (
+	"context"
 	"fmt"
 
-	"github.com/spf13/cobra"
-
 	"github.com/docker/compose-cli/aci"
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/progress"
+	"github.com/spf13/cobra"
 )
 
 // Command manage volumes
@@ -47,16 +48,23 @@ func createVolume() *cobra.Command {
 		Short: "Creates an Azure file share to use as ACI volume.",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := client.New(cmd.Context())
+			ctx := cmd.Context()
+			c, err := client.New(ctx)
 			if err != nil {
 				return err
 			}
-			id, err := c.VolumeService().Create(cmd.Context(), opts)
+			err = progress.Run(ctx, func(ctx context.Context) error {
+				_, err := c.VolumeService().Create(ctx, opts)
+				if err != nil {
+					return err
+				}
+				return nil
+			})
 			if err != nil {
 				return err
 			}
-			fmt.Println(id)
-			return nil
+			fmt.Printf("volume successfully created\n")
+			return err
 		},
 	}