feat(services): fit controller services api

Author: jianxiaoguo

api/services.go

@@ -3,7 +3,9 @@ package api
 // Service is the structure of the service object.
 type Service struct {
 	ProcfileType string `json:"procfile_type"`
-	PathPattern  string `json:"path_pattern"`
+	Port         int    `json:"port"`
+	Protocol     string `json:"protocol"`
+	TargetPort   int    `json:"target_port"`
 }
 
 // Services defines a collection of service objects.
@@ -16,7 +18,9 @@ func (s Services) Less(i, j int) bool { return s[i].ProcfileType < s[j].Procfile
 // ServiceCreateUpdateRequest is the structure of POST /v2/app/<app id>/services/.
 type ServiceCreateUpdateRequest struct {
 	ProcfileType string `json:"procfile_type"`
-	PathPattern  string `json:"path_pattern"`
+	Port         int    `json:"port"`
+	Protocol     string `json:"protocol"`
+	TargetPort   int    `json:"target_port"`
 }
 
 // ServiceDeleteRequest is the structure of DELETE /v2/app/<app id>/services/.

go.mod

@@ -1,6 +1,6 @@
 module github.com/drycc/controller-sdk-go
 
-go 1.19
+go 1.20
 
 require (
 	github.com/gorilla/websocket v1.5.0

services/services.go

@@ -48,13 +48,11 @@ func List(c *drycc.Client, appID string) (api.Services, error) {
 // Service is the way to route some traffic matching given URL pattern to worker different than `web`
 // procfileType - name of the process in Procfile (i.e. <process type> from the `<process type>: <command>`), e.g. `webhooks`
 // for more about Procfile see this https://devcenter.heroku.com/articles/procfile
-// pathPattern - one or several regexp patterns separated by comma, all request matching given regexp
-// are routed to the procfileType workers. E.g. `/webhooks/notify,~ ^/users/[0-9]+/.*/webhooks/notify,/webhooks/rest`
 // procfileType and pathPattern are mandatory and should have valid values.
-func New(c *drycc.Client, appID string, procfileType string, pathPattern string) (api.Service, error) {
+func New(c *drycc.Client, appID string, procfileType string, port int, protocol string, targetPort int) (api.Service, error) {
 	u := fmt.Sprintf("/v2/apps/%s/services/", appID)
 
-	req := api.ServiceCreateUpdateRequest{ProcfileType: procfileType, PathPattern: pathPattern}
+	req := api.ServiceCreateUpdateRequest{ProcfileType: procfileType, Port: port, Protocol: protocol, TargetPort: targetPort}
 
 	body, err := json.Marshal(req)
 
@@ -68,7 +66,7 @@ func New(c *drycc.Client, appID string, procfileType string, pathPattern string)
 	}
 	defer res.Body.Close()
 
-	d := api.Service{ProcfileType: procfileType, PathPattern: pathPattern}
+	d := api.Service{ProcfileType: procfileType, Port: port, Protocol: protocol, TargetPort: targetPort}
 	return d, reqErr
 }
 

services/services_test.go

@@ -17,22 +17,28 @@ const servicesFixture string = `
   "services": [
     {
         "procfile_type": "web",
-        "path_pattern":  "/abc/xyz"
+        "port": 5000,
+        "protocol": "UDP",
+        "target_port": 5000
     },
     {
         "procfile_type": "worker",
-        "path_pattern":  "/x1z/a2c"
+        "port": 5000,
+        "protocol": "TCP",
+        "target_port": 5000
     }
   ]
 }`
 
 const serviceFixture string = `
 {
     "procfile_type": "web",
-    "path_pattern":  "/abc/xyz"
+    "port": 5000,
+    "protocol": "UDP",
+    "target_port": 5000
 }`
 
-const serviceCreateExpected string = `{"procfile_type":"web","path_pattern":"/abc/xyz"}`
+const serviceCreateExpected string = `{"procfile_type":"web","port":5000,"protocol":"UDP","target_port":5000}`
 
 type fakeHTTPServer struct{}
 
@@ -82,11 +88,15 @@ func TestServicesList(t *testing.T) {
 	expected := api.Services{
 		{
 			ProcfileType: "web",
-			PathPattern:  "/abc/xyz",
+			Port:         5000,
+			Protocol:     "UDP",
+			TargetPort:   5000,
 		},
 		{
 			ProcfileType: "worker",
-			PathPattern:  "/x1z/a2c",
+			Port:         5000,
+			Protocol:     "TCP",
+			TargetPort:   5000,
 		},
 	}
 
@@ -115,7 +125,9 @@ func TestServicesAdd(t *testing.T) {
 
 	expected := api.Service{
 		ProcfileType: "web",
-		PathPattern:  "/abc/xyz",
+		Port:         5000,
+		Protocol:     "UDP",
+		TargetPort:   5000,
 	}
 
 	handler := fakeHTTPServer{}
@@ -127,7 +139,7 @@ func TestServicesAdd(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	actual, err := New(drycc, "example-go", "web", "/abc/xyz")
+	actual, err := New(drycc, "example-go", "web", 5000, "UDP", 5000)
 
 	if err != nil {
 		t.Fatal(err)