Feat/progress bar

.gitignore

@@ -9,6 +9,7 @@ test/c8y_test/debug.test
 test/c8y_test/application.setup.properties
 .cumulocity/
 temp-example/
+*.tmp
 c8y.env
 c8y.activitylog.*.json
 c8y~

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.3.0
-	github.com/reubenmiller/go-c8y v0.10.0-rc.6
+	github.com/reubenmiller/go-c8y v0.11.0-rc.2
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/sethvargo/go-password v0.2.0

go.sum

@@ -437,8 +437,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/reubenmiller/go-c8y v0.10.0-rc.6 h1:bP5l2+gJZbTqY5FVTUOR/Z8urtZ47BuFVh+EeX8xqMo=
-github.com/reubenmiller/go-c8y v0.10.0-rc.6/go.mod h1:aSU0AZdT/IWCn87wMveejGvwQE3FbnAkh5LEs/78xj8=
+github.com/reubenmiller/go-c8y v0.11.0-rc.2 h1:d1FWuGGDYvPgcmdw51m8COYJc0xnDtN/8Xqie+KwRZw=
+github.com/reubenmiller/go-c8y v0.11.0-rc.2/go.mod h1:aSU0AZdT/IWCn87wMveejGvwQE3FbnAkh5LEs/78xj8=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

pkg/c8ybinary/c8ybinary.go

@@ -0,0 +1,234 @@
+package c8ybinary
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"mime"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/reubenmiller/go-c8y-cli/v2/pkg/flags"
+	"github.com/reubenmiller/go-c8y/pkg/c8y"
+	"github.com/reubenmiller/go-c8y/pkg/c8y/binary"
+	"github.com/spf13/cobra"
+	"github.com/vbauerster/mpb/v6"
+	"github.com/vbauerster/mpb/v6/decor"
+)
+
+const BarFiller = "[━━ ]"
+
+// const BarFiller = "[██-]"
+
+func CreateBinaryWithProgress(ctx context.Context, client *c8y.Client, path string, filename string, properties interface{}, progress *mpb.Progress) (*c8y.Response, error) {
+	file, err := os.Open(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	values := map[string]io.Reader{
+		"file": file,
+	}
+
+	if properties != nil {
+		metadataBytes, err := json.Marshal(properties)
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert binary properties to json. %w", err)
+		}
+		values["object"] = bytes.NewReader(metadataBytes)
+	}
+
+	return client.SendRequest(ctx, c8y.RequestOptions{
+		Method:   "POST",
+		Accept:   "application/json",
+		Path:     path,
+		FormData: values,
+		PrepareRequest: func(r *http.Request) (*http.Request, error) {
+			if r.Body == nil || progress == nil {
+				return r, nil
+			}
+
+			bar, err := NewProgressBar(progress, filename)
+			if err != nil {
+				return nil, err
+			}
+			r.Body = bar.ProxyReader(r.Body)
+			return r, nil
+		},
+	})
+}
+
+func AddProgress(cmd *cobra.Command, fileFlag string, progress *mpb.Progress) func(r *http.Request) (*http.Request, error) {
+	return func(r *http.Request) (*http.Request, error) {
+		if r.Body == nil || progress == nil {
+			return r, nil
+		}
+		filename, err := cmd.Flags().GetString(fileFlag)
+		if err != nil {
+			// Don't return error here, as if the user does not provide a file, then ignore the progress
+			return r, nil
+		}
+
+		if filename == "" {
+			return r, nil
+		}
+
+		bar, err := NewProgressBar(progress, filename)
+		if err != nil {
+			return nil, err
+		}
+		r.Body = bar.ProxyReader(r.Body)
+
+		return r, nil
+	}
+}
+
+func CreateProxyReader(progress *mpb.Progress) func(response *http.Response) io.Reader {
+	return func(r *http.Response) io.Reader {
+		size := int64(r.ContentLength)
+		basename := "download"
+
+		_, params, err := mime.ParseMediaType(r.Header.Get("Content-Disposition"))
+		if err == nil {
+			if filename, ok := params["filename"]; ok {
+				basename = filename
+			}
+		}
+
+		bar := progress.Add(size,
+			mpb.NewBarFiller(BarFiller),
+			mpb.PrependDecorators(
+				decor.Name("elapsed", decor.WC{W: len("elapsed") + 1, C: decor.DidentRight}),
+				decor.Elapsed(decor.ET_STYLE_MMSS, decor.WC{W: 8, C: decor.DidentRight}),
+				decor.Name(basename, decor.WC{W: len(basename) + 1, C: decor.DidentRight}),
+			),
+			mpb.AppendDecorators(
+				decor.Percentage(decor.WC{W: 6, C: decor.DidentRight}),
+				decor.CountersKibiByte("% .2f / % .2f"),
+			),
+		)
+
+		proxyReader := c8y.NewProxyReader(bar.ProxyReader(r.Body))
+		r.Body = proxyReader
+		return proxyReader
+	}
+}
+
+func NewProgressBar(progress *mpb.Progress, filename string) (*mpb.Bar, error) {
+	if progress == nil {
+		return nil, nil
+	}
+
+	file, err := os.Stat(filename)
+
+	if err != nil {
+		return nil, err
+	}
+
+	size := int64(file.Size())
+	basename := filepath.Base(filename)
+
+	bar := progress.Add(size,
+		mpb.NewBarFiller(BarFiller),
+		mpb.PrependDecorators(
+			decor.Name("elapsed", decor.WC{W: len("elapsed") + 1, C: decor.DidentRight}),
+			decor.Elapsed(decor.ET_STYLE_MMSS, decor.WC{W: 8, C: decor.DidentRight}),
+			decor.Name(basename, decor.WC{W: len(basename) + 1, C: decor.DidentRight}),
+		),
+		mpb.AppendDecorators(
+			decor.Percentage(decor.WC{W: 6, C: decor.DidentRight}),
+			decor.CountersKibiByte("% .2f / % .2f"),
+		),
+	)
+
+	return bar, nil
+}
+
+func NewProxyReader(progress *mpb.Progress, r io.ReadCloser, filename string) (io.ReadCloser, error) {
+	if progress == nil {
+		return r, nil
+	}
+
+	file, err := os.Stat(filename)
+
+	if err != nil {
+		return nil, err
+	}
+
+	size := int64(file.Size())
+	basename := filepath.Base(filename)
+
+	bar := progress.Add(size,
+		mpb.NewBarFiller(BarFiller),
+		mpb.PrependDecorators(
+			decor.Name("elapsed", decor.WC{W: len("elapsed") + 1, C: decor.DidentRight}),
+			decor.Elapsed(decor.ET_STYLE_MMSS, decor.WC{W: 8, C: decor.DidentRight}),
+			decor.Name(basename, decor.WC{W: len(basename) + 1, C: decor.DidentRight}),
+		),
+		mpb.AppendDecorators(
+			decor.Percentage(decor.WC{W: 6, C: decor.DidentRight}),
+			decor.CountersKibiByte("% .2f / % .2f"),
+		),
+	)
+
+	return bar.ProxyReader(r), nil
+}
+
+// WithBinaryUploadURL uploads an inventory binary and returns the URL to it
+func WithBinaryUploadURL(client *c8y.Client, progress *mpb.Progress, opts ...string) flags.GetOption {
+	return func(cmd *cobra.Command, inputIterators *flags.RequestInputIterators) (string, interface{}, error) {
+		src, dst, _ := flags.UnpackGetterOptions("%s", opts...)
+
+		if !cmd.Flags().Changed(src) {
+			return "", "", nil
+		}
+
+		filename, err := cmd.Flags().GetString(src)
+		if err != nil {
+			return dst, filename, err
+		}
+
+		// binary properties
+		file, err := os.Open(filename)
+		if err != nil {
+			return "", nil, err
+		}
+
+		defer file.Close()
+
+		bar, err := NewProgressBar(progress, filename)
+
+		if err != nil {
+			return "", nil, err
+		}
+
+		binaryFile, err := binary.NewBinaryFile(
+			binary.WithReader(file),
+			binary.WithFileProperties(filename),
+			binary.WithGlobal(),
+		)
+		if err != nil {
+			return "", nil, err
+		}
+
+		mo, _, err := client.Inventory.CreateBinary(context.Background(), binaryFile, func(r *http.Request) (*http.Request, error) {
+			if bar != nil {
+				r.Body = bar.ProxyReader(r.Body)
+			}
+			return r, nil
+		})
+
+		if progress != nil {
+			progress.Wait()
+		}
+
+		if err != nil {
+			return "", nil, err
+		}
+
+		return dst, mo.Self, err
+	}
+}

pkg/cmd/api/api.manual.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/MakeNowJust/heredoc/v2"
+	"github.com/reubenmiller/go-c8y-cli/v2/pkg/c8ybinary"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/subcommand"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
@@ -278,8 +279,12 @@ func (n *CmdAPI) RunE(cmd *cobra.Command, args []string) error {
 			req.Body = body
 		}
 
+		req.PrepareRequest = c8ybinary.AddProgress(cmd, "file", cfg.GetProgressBar(n.factory.IOStreams.ErrOut, n.factory.IOStreams.IsStderrTTY()))
 		// get file info
 		// form data
+		// BUG: Format data needs to be lazily loaded via the iterator so it can be re-read
+		// for each request
+		//
 		formData := make(map[string]io.Reader)
 		err = flags.WithFormDataOptions(
 			cmd,

pkg/cmd/applications/createhostedapplication/createHostedApplication.manual.go

@@ -13,9 +13,11 @@ import (
 	"strings"
 
 	"github.com/MakeNowJust/heredoc/v2"
+	"github.com/reubenmiller/go-c8y-cli/v2/pkg/c8ybinary"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/c8yfetcher"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/subcommand"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
+	"github.com/reubenmiller/go-c8y-cli/v2/pkg/completion"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/flags"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/logger"
 	"github.com/reubenmiller/go-c8y-cli/v2/pkg/zipUtilities"
@@ -94,6 +96,11 @@ func NewCmdCreateHostedApplication(f *cmdutil.Factory) *CmdCreateHostedApplicati
 	cmd.Flags().BoolVar(&ccmd.skipActivation, "skipActivation", false, "Don't activate to the application after it has been created and uploaded")
 	cmd.Flags().BoolVar(&ccmd.skipUpload, "skipUpload", false, "Don't uploaded the web app binary. Only the application placeholder will be created")
 
+	completion.WithOptions(
+		cmd,
+		completion.WithValidateSet("availability", "MARKET", "PRIVATE"),
+	)
+
 	flags.WithOptions(
 		cmd,
 		flags.WithData(),
@@ -297,7 +304,16 @@ func (n *CmdCreateHostedApplication) RunE(cmd *cobra.Command, args []string) err
 			}
 
 			log.Infof("uploading binary [app=%s]", application.ID)
-			resp, err := client.Application.CreateBinary(context.Background(), zipfile, application.ID)
+			progress := n.factory.IOStreams.ProgressIndicator()
+			resp, err := c8ybinary.CreateBinaryWithProgress(
+				context.Background(),
+				client,
+				"/application/applications/"+application.ID+"/binaries",
+				zipfile,
+				nil,
+				progress,
+			)
+			n.factory.IOStreams.WaitForProgressIndicator()
 
 			if err != nil {
 				// handle error