feat(workflow-cli): add volume expand support

Author: duanhongyi

.gitignore

@@ -29,3 +29,4 @@ workflow-cli
 coverage.txt
 .DS_Store
 .idea/*
+.vscode/*

cmd/cmd.go

@@ -98,6 +98,7 @@ type Commander interface {
 	PrintErrf(string, ...interface{}) (int, error)
 	Version(bool) error
 	VolumesCreate(string, string, string) error
+	VolumesExpand(string, string, string) error
 	VolumesDelete(string, string) error
 	VolumesList(string, int) error
 	VolumesMount(string, string, []string) error

cmd/volumes.go

@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/drycc/pkg/prettyprint"
 	"io"
 	"regexp"
 	"strings"
 
+	"github.com/drycc/pkg/prettyprint"
+
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/controller-sdk-go/volumes"
 )
@@ -68,16 +69,16 @@ func printVolumes(d *DryccCmd, appID string, volumes api.Volumes, wOut io.Writer
 }
 
 // VolumesCreate create a volume for the application
-func (d *DryccCmd) VolumesCreate(appID, name string, size string) error {
+func (d *DryccCmd) VolumesCreate(appID, name, size string) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
 		return err
 	}
-	regex := regexp.MustCompile("^([1-9][0-9]*[mgMG])$")
+	regex := regexp.MustCompile("^([1-9][0-9]*[gG])$")
 	if !regex.MatchString(size) {
 		return fmt.Errorf(`%s doesn't fit format #unit
-Examples: 2G 2g 500M 500m`, size)
+Examples: 2G 2g`, size)
 	}
 
 	d.Printf("Creating %s to %s... ", name, appID)
@@ -98,6 +99,37 @@ Examples: 2G 2g 500M 500m`, size)
 	return nil
 }
 
+// VolumesExpand create a volume for the application
+func (d *DryccCmd) VolumesExpand(appID, name, size string) error {
+	s, appID, err := load(d.ConfigFile, appID)
+
+	if err != nil {
+		return err
+	}
+	regex := regexp.MustCompile("^([1-9][0-9]*[gG])$")
+	if !regex.MatchString(size) {
+		return fmt.Errorf(`%s doesn't fit format #unit
+Examples: 2G 2g`, size)
+	}
+
+	d.Printf("Expand %s to %s... ", name, appID)
+
+	quit := progress(d.WOut)
+	volume := api.Volume{
+		Name: name,
+		Size: size,
+	}
+	_, err = volumes.Expand(s.Client, appID, volume)
+	quit <- true
+	<-quit
+	if d.checkAPICompatibility(s.Client, err) != nil {
+		return err
+	}
+
+	d.Println("done")
+	return nil
+}
+
 // VolumesDelete delete a volume from the application
 func (d *DryccCmd) VolumesDelete(appID, name string) error {
 	s, appID, err := load(d.ConfigFile, appID)

cmd/volumes_test.go

@@ -33,7 +33,7 @@ func TestVolumesList(t *testing.T) {
 			"owner": "test",
 			"app": "example-go",
 			"name": "myvolume",
-			"size": "500M",
+			"size": "500G",
 			"path": {"cmd": "/data/cmd1", "cmd123": "/data/cmd123"},
 			"created": "2020-08-26T00:00:00UTC",
 			"updated": "2020-08-26T00:00:00UTC"
@@ -46,7 +46,7 @@ func TestVolumesList(t *testing.T) {
 	assert.NoErr(t, err)
 
 	assert.Equal(t, b.String(), `=== example-go volumes
---- myvolume     500M
+--- myvolume     500G
 cmd              /data/cmd1
 cmd123           /data/cmd123
 `, "output")
@@ -63,23 +63,51 @@ func TestVolumesCreate(t *testing.T) {
 	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
 
 	server.Mux.HandleFunc("/v2/apps/example-go/volumes/", func(w http.ResponseWriter, r *http.Request) {
-		testutil.AssertBody(t, api.Volume{Name: "myvolume", Size: "500M"}, r)
+		testutil.AssertBody(t, api.Volume{Name: "myvolume", Size: "500G"}, r)
 		testutil.SetHeaders(w)
 		w.WriteHeader(http.StatusCreated)
 		// Body isn't used by CLI, so it isn't set.
 		w.Write([]byte("{}"))
 	})
 
-	err = cmdr.VolumesCreate("example-go", "myvolume", "500M")
+	err = cmdr.VolumesCreate("example-go", "myvolume", "500G")
 	assert.NoErr(t, err)
 	err = cmdr.VolumesCreate("example-go", "myvolume", "500K")
 	expected := `500K doesn't fit format #unit
-Examples: 2G 2g 500M 500m`
+Examples: 2G 2g`
 	assert.Equal(t, err.Error(), expected, "output")
 
 	assert.Equal(t, testutil.StripProgress(b.String()), "Creating myvolume to example-go... done\n", "output")
 }
 
+func TestVolumesExpand(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/example-go/volumes/myvolume/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.AssertBody(t, api.Volume{Name: "myvolume", Size: "500G"}, r)
+		testutil.SetHeaders(w)
+		w.WriteHeader(http.StatusCreated)
+		// Body isn't used by CLI, so it isn't set.
+		w.Write([]byte("{}"))
+	})
+
+	err = cmdr.VolumesExpand("example-go", "myvolume", "500G")
+	assert.NoErr(t, err)
+	err = cmdr.VolumesExpand("example-go", "myvolume", "500K")
+	expected := `500K doesn't fit format #unit
+Examples: 2G 2g`
+	assert.Equal(t, err.Error(), expected, "output")
+
+	assert.Equal(t, testutil.StripProgress(b.String()), "Expand myvolume to example-go... done\n", "output")
+}
+
 func TestVolumesDelete(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()
@@ -123,7 +151,7 @@ func TestVolumesMount(t *testing.T) {
 			"owner": "test",
 			"app": "example-go",
 			"name": "myvolume",
-			"size": "500M",
+			"size": "500G",
 			"path": {"cmd": "/data/cmd1"},
 			"created": "2020-08-26T00:00:00UTC",
 			"updated": "2020-08-26T00:00:00UTC"
@@ -162,7 +190,7 @@ func TestVolumesUnmount(t *testing.T) {
 			"owner": "test",
 			"app": "example-go",
 			"name": "myvolume",
-			"size": "500M",
+			"size": "500G",
 			"path": {},
 			"created": "2020-08-26T00:00:00UTC",
 			"updated": "2020-08-26T00:00:00UTC"

go.mod

@@ -1,14 +1,13 @@
 module github.com/drycc/workflow-cli
 
-go 1.17
+go 1.18
 
 require (
 	github.com/arschles/assert v1.0.1-0.20191213221312-71f210f9375a
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20211213072304-8a9f2f28d524
+	github.com/drycc/controller-sdk-go v0.0.0-20220801120356-de65d8cb5598
 	github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840
 	github.com/olekukonko/tablewriter v0.0.5
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )
 

go.sum

@@ -49,12 +49,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/drycc/controller-sdk-go v0.0.0-20210826011521-d57f3c75935a h1:TKz7m1cwN3ktK9bGWorLVSSmkLrDO4qALhdGUxTRToo=
-github.com/drycc/controller-sdk-go v0.0.0-20210826011521-d57f3c75935a/go.mod h1:DmVcssrb6yJMWI8sGT+8Xy3caVR5kSlsctD3a7Zn6FA=
-github.com/drycc/controller-sdk-go v0.0.0-20211124095117-dbf56da8c5a8 h1:cddNthWLhOdgvpF5S78Fc7j8I5ESDRUtTZhHIFTLcC0=
-github.com/drycc/controller-sdk-go v0.0.0-20211124095117-dbf56da8c5a8/go.mod h1:aGxL2AkmmG7d5afWiUGy93/+UPDnIxgsWSwxuznjteE=
-github.com/drycc/controller-sdk-go v0.0.0-20211213072304-8a9f2f28d524 h1:45Ufw74Ye6AXR3X5IzwJvSeByFiaV1nw3eh++mvLQbE=
-github.com/drycc/controller-sdk-go v0.0.0-20211213072304-8a9f2f28d524/go.mod h1:aGxL2AkmmG7d5afWiUGy93/+UPDnIxgsWSwxuznjteE=
+github.com/drycc/controller-sdk-go v0.0.0-20220801120356-de65d8cb5598 h1:SfwHwhoe7QpNzEmN96G6egIbZKWkfiyLCFk7SlhpQ8U=
+github.com/drycc/controller-sdk-go v0.0.0-20220801120356-de65d8cb5598/go.mod h1:aGxL2AkmmG7d5afWiUGy93/+UPDnIxgsWSwxuznjteE=
 github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840 h1:0OhP9AQ0mh3q0TMxK4PJTPSFwD/wj0xugiaZ3lnLcNA=
 github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840/go.mod h1:KX1FLm7Fq6FLCsjjRsgfI/bMQuHZXqYf1ZXU9fzJhDw=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
@@ -141,6 +137,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -154,6 +151,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -192,7 +190,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -394,6 +391,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

parser/volumes.go

@@ -11,6 +11,7 @@ func Volumes(argv []string, cmdr cmd.Commander) error {
 Valid commands for volumes:
 
 volumes:create           create a volume for the application
+volumes:expand           expand a volume for the application
 volumes:list             list volumes in the application
 volumes:delete           delete a volume from the application
 volumes:mount            mount a volume to process of the application
@@ -22,6 +23,8 @@ Use 'drycc help [command]' to learn more.
 	switch argv[0] {
 	case "volumes:create":
 		return volumesCreate(argv, cmdr)
+	case "volumes:expand":
+		return volumesExpand(argv, cmdr)
 	case "volumes:list":
 		return volumesList(argv, cmdr)
 	case "volumes:delete":
@@ -55,7 +58,7 @@ Arguments:
   <name>
     the volume name.
   <size>
-    the volume size, such as '500M'.
+    the volume size, such as '500G'.
 
 Options:
   -a --app=<app>
@@ -75,6 +78,36 @@ Options:
 	return cmdr.VolumesCreate(app, name, size)
 }
 
+func volumesExpand(argv []string, cmdr cmd.Commander) error {
+	usage := `
+Create a volume for the application.
+
+Usage: drycc volumes:expand <name> <size> [options]
+
+Arguments:
+  <name>
+    the volume name.
+  <size>
+    the volume size, such as '500G'.
+
+Options:
+  -a --app=<app>
+    the uniquely identifiable name for the application.
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	app := safeGetValue(args, "--app")
+	name := safeGetValue(args, "<name>")
+	size := safeGetValue(args, "<size>")
+
+	return cmdr.VolumesExpand(app, name, size)
+}
+
 func volumesList(argv []string, cmdr cmd.Commander) error {
 	usage := `
 List volumes in the application.

parser/volumes_test.go

@@ -20,6 +20,10 @@ func (d FakeDryccCmd) VolumesCreate(string, string, string) error {
 	return errors.New("volumes:create")
 }
 
+func (d FakeDryccCmd) VolumesExpand(string, string, string) error {
+	return errors.New("volumes:expand")
+}
+
 func (d FakeDryccCmd) VolumesDelete(string, string) error {
 	return errors.New("volumes:delete")
 }
@@ -50,7 +54,11 @@ func TestVolumes(t *testing.T) {
 		expected string
 	}{
 		{
-			args:     []string{"volumes:create", "myvolume", "500M"},
+			args:     []string{"volumes:create", "myvolume", "500G"},
+			expected: "",
+		},
+		{
+			args:     []string{"volumes:expand", "myvolume", "500G"},
 			expected: "",
 		},
 		{