feat(workflow-cli): add resources services and plans api

Author: duanhongyi

cmd/cmd.go

@@ -102,6 +102,8 @@ type Commander interface {
 	VolumesList(string, int) error
 	VolumesMount(string, string, []string) error
 	VolumesUnmount(string, string, []string) error
+	ResourcesServices(int) error
+	ResourcesPlans(string, int) error
 	ResourcesCreate(string, string, string, []string) error
 	ResourcesList(string, int) error
 	ResourceDelete(string, string) error

cmd/resources.go

@@ -2,14 +2,77 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/drycc/controller-sdk-go/api"
-	"github.com/drycc/controller-sdk-go/resources"
-	"github.com/drycc/pkg/prettyprint"
 	"io"
 	"regexp"
+	"strconv"
 	"strings"
+
+	"github.com/olekukonko/tablewriter"
+
+	"github.com/drycc/controller-sdk-go/api"
+	"github.com/drycc/controller-sdk-go/resources"
+	"github.com/drycc/pkg/prettyprint"
+	"github.com/drycc/workflow-cli/settings"
 )
 
+// ResourceServices list resource service
+func (d *DryccCmd) ResourcesServices(results int) error {
+	s, err := settings.Load(d.ConfigFile)
+
+	if err != nil {
+		return err
+	}
+
+	if results == defaultLimit {
+		results = s.Limit
+	}
+	services, count, err := resources.Services(s.Client, results)
+	if d.checkAPICompatibility(s.Client, err) != nil {
+		return err
+	}
+
+	if count == 0 {
+		d.Println("Could not find any services")
+	} else {
+		table := tablewriter.NewWriter(d.WOut)
+		table.SetHeader([]string{"Name", "Updateable"})
+		for _, service := range services {
+			table.Append([]string{service.Name, strconv.FormatBool(service.Updateable)})
+		}
+		table.Render()
+	}
+	return nil
+}
+
+// ResourcePlans list resource plans
+func (d *DryccCmd) ResourcesPlans(serviceName string, results int) error {
+	s, err := settings.Load(d.ConfigFile)
+
+	if err != nil {
+		return err
+	}
+
+	if results == defaultLimit {
+		results = s.Limit
+	}
+	plans, count, err := resources.Plans(s.Client, serviceName, results)
+	if d.checkAPICompatibility(s.Client, err) != nil {
+		return err
+	}
+
+	if count == 0 {
+		d.Println("Could not find any services")
+	} else {
+		table := tablewriter.NewWriter(d.WOut)
+		table.SetHeader([]string{"Name", "Description"})
+		for _, plan := range plans {
+			table.Append([]string{plan.Name, plan.Description})
+		}
+		table.Render()
+	}
+	return nil
+}
+
 // ResourcesCreate create a resource for the application
 func (d *DryccCmd) ResourcesCreate(appID, plan string, name string, params []string) error {
 	s, appID, err := load(d.ConfigFile, appID)
@@ -150,7 +213,7 @@ func (d *DryccCmd) ResourceBind(appID string, name string) error {
 	d.Print("Binding resource... ")
 
 	quit := progress(d.WOut)
-	bindAction := api.Binding{BindAction: "bind"}
+	bindAction := api.ResourceBinding{BindAction: "bind"}
 	_, err = resources.Binding(s.Client, appID, name, bindAction)
 	quit <- true
 	<-quit
@@ -174,7 +237,7 @@ func (d *DryccCmd) ResourceUnbind(appID string, name string) error {
 	d.Print("Unbinding resource... ")
 
 	quit := progress(d.WOut)
-	bindAction := api.Binding{BindAction: "unbind"}
+	bindAction := api.ResourceBinding{BindAction: "unbind"}
 	_, err = resources.Binding(s.Client, appID, name, bindAction)
 	quit <- true
 	<-quit

cmd/resources_test.go

@@ -3,14 +3,84 @@ package cmd
 import (
 	"bytes"
 	"fmt"
-	"github.com/drycc/controller-sdk-go/api"
 	"net/http"
 	"testing"
 
+	"github.com/drycc/controller-sdk-go/api"
+
 	"github.com/arschles/assert"
 	"github.com/drycc/workflow-cli/pkg/testutil"
 )
 
+func TestResourcesServices(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/resources/services/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+	"results": [
+		{
+			"id": "332588e0-6c2c-4f56-a6af-a56fd01ec4b4",
+			"name": "mysql",
+			"updateable": true
+		}
+	],
+	"count": 1
+}`)
+	})
+
+	err = cmdr.ResourcesServices(100)
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), `+-------+------------+
+| NAME  | UPDATEABLE |
++-------+------------+
+| mysql | true       |
++-------+------------+
+`, "output")
+}
+
+func TestResourcesPlans(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/resources/services/mysql/plans/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+	"results": [{
+		"id": "4d1dbd33-201b-45bc-9abb-757584ef7ab8",
+		"name": "standard-1600",
+		"description": "mysql standard-1600 plan which limit persistence size 1600Gi."
+	}],
+	"count": 1
+}`)
+	})
+
+	err = cmdr.ResourcesPlans("mysql", 100)
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), `+---------------+--------------------------------+
+|     NAME      |          DESCRIPTION           |
++---------------+--------------------------------+
+| standard-1600 | mysql standard-1600 plan which |
+|               | limit persistence size 1600Gi. |
++---------------+--------------------------------+
+`, "output")
+}
+
 func TestResourcesCreate(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()
@@ -178,7 +248,7 @@ func TestResourceBind(t *testing.T) {
 	server.Mux.HandleFunc("/v2/apps/example-go/resources/mysql/binding/", func(w http.ResponseWriter, r *http.Request) {
 		testutil.SetHeaders(w)
 		if r.Method == "PATCH" {
-			testutil.AssertBody(t, api.Binding{
+			testutil.AssertBody(t, api.ResourceBinding{
 				BindAction: "bind",
 			}, r)
 		}
@@ -218,7 +288,7 @@ func TestResourceUnbind(t *testing.T) {
 	server.Mux.HandleFunc("/v2/apps/example-go/resources/mysql/binding/", func(w http.ResponseWriter, r *http.Request) {
 		testutil.SetHeaders(w)
 		if r.Method == "PATCH" {
-			testutil.AssertBody(t, api.Binding{
+			testutil.AssertBody(t, api.ResourceBinding{
 				BindAction: "unbind",
 			}, r)
 		}

go.mod

@@ -5,7 +5,7 @@ go 1.17
 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-20211124095117-dbf56da8c5a8
+	github.com/drycc/controller-sdk-go v0.0.0-20211213072304-8a9f2f28d524
 	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

go.sum

@@ -53,6 +53,8 @@ github.com/drycc/controller-sdk-go v0.0.0-20210826011521-d57f3c75935a h1:TKz7m1c
 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/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=

parser/resources.go

@@ -10,6 +10,8 @@ func Resources(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Valid commands for resources:
 
+resources:services         list all available resource services
+resources:plans            list all available plans for an resource services
 resources:create           create a resource for the application
 resources:list             list resources in the application
 resources:describe         get a resource detail info in the application
@@ -22,6 +24,10 @@ Use 'drycc help [command]' to learn more.
 `
 
 	switch argv[0] {
+	case "resources:services":
+		return resourcesServices(argv, cmdr)
+	case "resources:plans":
+		return resourcesPlans(argv, cmdr)
 	case "resources:create":
 		return resourcesCreate(argv, cmdr)
 	case "resources:list":
@@ -51,6 +57,64 @@ Use 'drycc help [command]' to learn more.
 	}
 }
 
+func resourcesServices(argv []string, cmdr cmd.Commander) error {
+	usage := `
+List all available resource services.
+
+Usage: drycc resources:services [options]
+
+Options:
+  -l --limit=<num>
+    the maximum number of results to display, defaults to config setting
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	results, err := responseLimit(safeGetValue(args, "--limit"))
+
+	if err != nil {
+		return err
+	}
+
+	return cmdr.ResourcesServices(results)
+}
+
+func resourcesPlans(argv []string, cmdr cmd.Commander) error {
+	usage := `
+List all available plans for an resource services.
+
+Usage: drycc resources:plans <service> [options]
+
+Arguments:
+  <service>
+    the service name for plans.
+
+Options:
+  -l --limit=<num>
+    the maximum number of results to display, defaults to config setting
+`
+
+	args, err := docopt.Parse(usage, argv, true, "", false, true)
+
+	if err != nil {
+		return err
+	}
+
+	service := safeGetValue(args, "<service>")
+
+	results, err := responseLimit(safeGetValue(args, "--limit"))
+
+	if err != nil {
+		return err
+	}
+
+	return cmdr.ResourcesPlans(service, results)
+}
+
 func resourcesCreate(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Create a resource for the application.

parser/resources_test.go

@@ -12,6 +12,14 @@ import (
 // Create fake implementations of each method that return the argument
 // we expect to have called the function (as an error to satisfy the interface).
 
+func (d FakeDryccCmd) ResourcesServices(int) error {
+	return errors.New("resources:services")
+}
+
+func (d FakeDryccCmd) ResourcesPlans(string, int) error {
+	return errors.New("resources:plans")
+}
+
 func (d FakeDryccCmd) ResourcesCreate(string, string, string, []string) error {
 	return errors.New("resources:create")
 }
@@ -57,6 +65,14 @@ func TestResources(t *testing.T) {
 		args     []string
 		expected string
 	}{
+		{
+			args:     []string{"resources:services"},
+			expected: "",
+		},
+		{
+			args:     []string{"resources:plans", "mysql"},
+			expected: "",
+		},
 		{
 			args:     []string{"resources:create", "mysql:5.6", "mysql", "key1=value1"},
 			expected: "",