Browse code

update secret create url for consistency

Signed-off-by: allencloud <allen.sun@daocloud.io>

allencloud authored on 2016/11/17 11:51:16
Showing 4 changed files
... ...
@@ -55,7 +55,7 @@ func (sr *swarmRouter) initRoutes() {
55 55
 		router.NewGetRoute("/tasks", sr.getTasks),
56 56
 		router.NewGetRoute("/tasks/{id}", sr.getTask),
57 57
 		router.NewGetRoute("/secrets", sr.getSecrets),
58
-		router.NewPostRoute("/secrets", sr.createSecret),
58
+		router.NewPostRoute("/secrets/create", sr.createSecret),
59 59
 		router.NewDeleteRoute("/secrets/{id}", sr.removeSecret),
60 60
 		router.NewGetRoute("/secrets/{id}", sr.getSecret),
61 61
 		router.NewPostRoute("/secrets/{id}/update", sr.updateSecret),
... ...
@@ -13,7 +13,7 @@ func (cli *Client) SecretCreate(ctx context.Context, secret swarm.SecretSpec) (t
13 13
 	var headers map[string][]string
14 14
 
15 15
 	var response types.SecretCreateResponse
16
-	resp, err := cli.post(ctx, "/secrets", nil, secret, headers)
16
+	resp, err := cli.post(ctx, "/secrets/create", nil, secret, headers)
17 17
 	if err != nil {
18 18
 		return response, err
19 19
 	}
... ...
@@ -25,7 +25,7 @@ func TestSecretCreateError(t *testing.T) {
25 25
 }
26 26
 
27 27
 func TestSecretCreate(t *testing.T) {
28
-	expectedURL := "/secrets"
28
+	expectedURL := "/secrets/create"
29 29
 	client := &Client{
30 30
 		client: newMockClient(func(req *http.Request) (*http.Response, error) {
31 31
 			if !strings.HasPrefix(req.URL.Path, expectedURL) {
... ...
@@ -41,7 +41,7 @@ func TestSecretCreate(t *testing.T) {
41 41
 				return nil, err
42 42
 			}
43 43
 			return &http.Response{
44
-				StatusCode: http.StatusOK,
44
+				StatusCode: http.StatusCreated,
45 45
 				Body:       ioutil.NopCloser(bytes.NewReader(b)),
46 46
 			}, nil
47 47
 		}),
... ...
@@ -285,7 +285,7 @@ func (d *SwarmDaemon) listServices(c *check.C) []swarm.Service {
285 285
 }
286 286
 
287 287
 func (d *SwarmDaemon) createSecret(c *check.C, secretSpec swarm.SecretSpec) string {
288
-	status, out, err := d.SockRequest("POST", "/secrets", secretSpec)
288
+	status, out, err := d.SockRequest("POST", "/secrets/create", secretSpec)
289 289
 
290 290
 	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
291 291
 	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf("output: %q", string(out)))