chore(volumes): add endpoint for serve

Author: duanhongyi

volumes/volumes.go

@@ -82,8 +82,8 @@ func Expand(c *drycc.Client, appID string, volume api.Volume) (api.Volume, error
 
 // Serve serves an app's volume.
 func Serve(parent context.Context, c *drycc.Client, appID, name string) (context.Context, map[string]string, error) {
-	u := fmt.Sprintf("/v2/apps/%s/volumes/%s/filer/_/bind", appID, name)
-	res, err := c.Request("POST", u, nil)
+	basePath := fmt.Sprintf("/v2/apps/%s/volumes/%s/filer", appID, name)
+	res, err := c.Request("POST", fmt.Sprintf("%s/_/bind", basePath), nil)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -100,8 +100,7 @@ func Serve(parent context.Context, c *drycc.Client, appID, name string) (context
 			case <-parent.Done():
 				return
 			default:
-				u := fmt.Sprintf("/v2/apps/%s/volumes/%s/filer/_/ping", appID, name)
-				res, err := c.Request("GET", u, nil)
+				res, err := c.Request("GET", fmt.Sprintf("%s/_/ping", basePath), nil)
 				if err != nil {
 					return
 				}
@@ -112,6 +111,7 @@ func Serve(parent context.Context, c *drycc.Client, appID, name string) (context
 			}
 		}
 	}()
+	filer["endpoint"] = fmt.Sprintf("%s%s/webdav/", c.ControllerURL, basePath)
 	return ctx, filer, nil
 }
 

volumes/volumes_test.go

@@ -118,9 +118,8 @@ const volumeUnmountFixture string = `
 `
 
 const (
-	volumeMountExpected       string = `{"path":{"cmd":"/data/cmd1","web":"/data/web1"}}`
-	volumeUnmountExpected     string = `{"path":{"cmd":null,"web":null}}`
-	volumeFileContentExpected string = `test file content`
+	volumeMountExpected   string = `{"path":{"cmd":"/data/cmd1","web":"/data/web1"}}`
+	volumeUnmountExpected string = `{"path":{"cmd":null,"web":null}}`
 )
 
 type fakeHTTPServer struct{}
@@ -231,7 +230,7 @@ func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	if req.URL.Path == "/v2/apps/example-go/volumes/myvolume/filer/_/bind" && req.Method == "POST" {
 		res.Header().Add("Content-Type", "application/json")
 		res.WriteHeader(http.StatusOK)
-		res.Write([]byte(`{"host":"localhost","port":"8080"}`))
+		res.Write([]byte(`{"username":"user","password":"pass"}`))
 		return
 	}
 
@@ -505,8 +504,9 @@ func TestVolumeServe(t *testing.T) {
 	}
 
 	expectedFiler := map[string]string{
-		"host": "localhost",
-		"port": "8080",
+		"endpoint": fmt.Sprintf("%s/v2/apps/example-go/volumes/myvolume/filer/webdav/", server.URL),
+		"username": "user",
+		"password": "pass",
 	}
 
 	parentCtx, cancel := context.WithCancel(context.Background())