chore(controller-sdk-go): add resource service api

Author: duanhongyi

api/resource.go

@@ -1,10 +1,29 @@
 package api
 
-// Binding is the definition of PATCH /v2/apps/<app_id>/resources/<name>/binding/.
-type Binding struct {
-	BindAction string `json:"bind_action,omitempty"`
+// ResourcePlan is the structure of an app's resource plan.
+type ResourcePlan struct {
+	// ID is a unique string for resource plan.
+	ID string `json:"id,omitempty"`
+	// Name is a unique string for resource plan.
+	Name string `json:"name,omitempty"`
+	// Description is a detailed description of the resource plan
+	Description string `json:"description,omitempty"`
+}
+
+type ResourcePlans []ResourcePlan
+
+// ResourceService is the structure of an app's resource service.
+type ResourceService struct {
+	// ID is a unique string for resource service.
+	ID string `json:"id,omitempty"`
+	// Name is a unique string for resource service.
+	Name string `json:"name,omitempty"`
+	// Updatable is the plans of the current resource can be upgraded
+	Updateable bool `json:"updateable,omitempty"`
 }
 
+type ResourceServices []ResourceService
+
 // Resource is the structure of an app's resource.
 type Resource struct {
 	// Owner is the app owner.
@@ -33,3 +52,8 @@ type Resource struct {
 }
 
 type Resources []Resource
+
+// Binding is the definition of PATCH /v2/apps/<app_id>/resources/<name>/binding/.
+type ResourceBinding struct {
+	BindAction string `json:"bind_action,omitempty"`
+}

resources/resources.go

@@ -4,10 +4,39 @@ package resources
 import (
 	"encoding/json"
 	"fmt"
+
 	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
 )
 
+// Services is list all available resource services
+func Services(c *drycc.Client, results int) (api.ResourceServices, int, error) {
+	u := fmt.Sprintf("/v2/resources/services/")
+	body, count, reqErr := c.LimitedRequest(u, results)
+	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
+		return []api.ResourceService{}, -1, reqErr
+	}
+	var services []api.ResourceService
+	if err := json.Unmarshal([]byte(body), &services); err != nil {
+		return []api.ResourceService{}, -1, err
+	}
+	return services, count, reqErr
+}
+
+// Plans is list all available resource services
+func Plans(c *drycc.Client, serviceName string, results int) (api.ResourcePlans, int, error) {
+	u := fmt.Sprintf("/v2/resources/services/%s/plans/", serviceName)
+	body, count, reqErr := c.LimitedRequest(u, results)
+	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
+		return []api.ResourcePlan{}, -1, reqErr
+	}
+	var plans []api.ResourcePlan
+	if err := json.Unmarshal([]byte(body), &plans); err != nil {
+		return []api.ResourcePlan{}, -1, err
+	}
+	return plans, count, reqErr
+}
+
 // List list an app's resources.
 func List(c *drycc.Client, appID string, results int) (api.Resources, int, error) {
 	u := fmt.Sprintf("/v2/apps/%s/resources/", appID)
@@ -86,7 +115,7 @@ func Put(c *drycc.Client, appID string, name string, resource api.Resource) (api
 }
 
 // Binding servicebinding binding with a serviceinstance
-func Binding(c *drycc.Client, appID string, name string, resource api.Binding) (api.Resource, error) {
+func Binding(c *drycc.Client, appID string, name string, resource api.ResourceBinding) (api.Resource, error) {
 	body, err := json.Marshal(resource)
 	if err != nil {
 		return api.Resource{}, err

resources/resources_test.go

@@ -2,15 +2,42 @@ package resources
 
 import (
 	"fmt"
-	drycc "github.com/drycc/controller-sdk-go"
-	"github.com/drycc/controller-sdk-go/api"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"testing"
+
+	drycc "github.com/drycc/controller-sdk-go"
+	"github.com/drycc/controller-sdk-go/api"
 )
 
+const resourceServices string = `
+{
+	"results": [
+		{
+			"id": "332588e0-6c2c-4f56-a6af-a56fd01ec4b4",
+			"name": "mysql",
+			"updateable": true
+		}
+	],
+	"count": 1
+}
+`
+
+const resourceServicePlans string = `
+{
+	"results": [
+		{
+			"id": "4d1dbd33-201b-45bc-9abb-757584ef7ab8",
+			"name": "standard-1600",
+			"description": "mysql standard-1600 plan which limit persistence size 1600Gi."
+		}
+	],
+	"count": 1
+}
+`
+
 const resourceCreateExpected string = `{"name":"mysql","plan":"mysql:5.6"}`
 
 const resourcePutExpected string = `{"plan":"mysql:5.7"}`
@@ -126,7 +153,18 @@ type fakeHTTPServer struct{}
 
 func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	res.Header().Add("DRYCC_API_VERSION", drycc.APIVersion)
-
+	// Services
+	if req.URL.Path == "/v2/resources/services/" && req.Method == "GET" {
+		res.WriteHeader(http.StatusCreated)
+		res.Write([]byte(resourceServices))
+		return
+	}
+	// Plans
+	if req.URL.Path == "/v2/resources/services/mysql/plans/" && req.Method == "GET" {
+		res.WriteHeader(http.StatusCreated)
+		res.Write([]byte(resourceServicePlans))
+		return
+	}
 	// Create
 	if req.URL.Path == "/v2/apps/example-go/resources/" && req.Method == "POST" {
 		body, err := ioutil.ReadAll(req.Body)
@@ -267,6 +305,68 @@ func TestResourcesCreate(t *testing.T) {
 	}
 }
 
+func TestServices(t *testing.T) {
+	t.Parallel()
+
+	expected := api.ResourceServices{
+		{
+			ID:         "332588e0-6c2c-4f56-a6af-a56fd01ec4b4",
+			Name:       "mysql",
+			Updateable: true,
+		},
+	}
+
+	handler := fakeHTTPServer{}
+	server := httptest.NewServer(&handler)
+	defer server.Close()
+
+	drycc, err := drycc.New(false, server.URL, "abc")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	actual, _, err := Services(drycc, 100)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Error(fmt.Errorf("Expected %v, Got %v", expected, actual))
+	}
+}
+
+func TestServicePlans(t *testing.T) {
+	t.Parallel()
+
+	expected := api.ResourcePlans{
+		{
+			ID:          "4d1dbd33-201b-45bc-9abb-757584ef7ab8",
+			Name:        "standard-1600",
+			Description: "mysql standard-1600 plan which limit persistence size 1600Gi.",
+		},
+	}
+
+	handler := fakeHTTPServer{}
+	server := httptest.NewServer(&handler)
+	defer server.Close()
+
+	drycc, err := drycc.New(false, server.URL, "abc")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	actual, _, err := Plans(drycc, "mysql", 100)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Error(fmt.Errorf("Expected %v, Got %v", expected, actual))
+	}
+}
+
 //
 func TestResourcesList(t *testing.T) {
 	t.Parallel()
@@ -426,7 +526,7 @@ func TestResourceBind(t *testing.T) {
 		Updated: "2020-09-08T00:00:00UTC",
 	}
 
-	resourceVars := api.Binding{
+	resourceVars := api.ResourceBinding{
 		BindAction: "bind",
 	}
 	actual, err := Binding(drycc, "example-bind", "mysql", resourceVars)
@@ -466,7 +566,7 @@ func TestResourceUnbind(t *testing.T) {
 		Updated: "2020-09-08T00:00:00UTC",
 	}
 
-	resourceVars := api.Binding{
+	resourceVars := api.ResourceBinding{
 		BindAction: "unbind",
 	}
 	actual, err := Binding(drycc, "example-unbind", "mysql", resourceVars)