From 21768933fbf61d1481e303ee7a3a5ecc57fc3838 Mon Sep 17 00:00:00 2001 From: erxian Date: Tue, 29 Nov 2016 13:37:16 +0800 Subject: [PATCH] correct the http return code of secret remove Signed-off-by: erxian --- api/server/router/swarm/cluster_routes.go | 1 + docs/api/version-history.md | 6 +++++- integration-cli/daemon_swarm.go | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/api/server/router/swarm/cluster_routes.go b/api/server/router/swarm/cluster_routes.go index cb4ae3a7b3..fe976434bc 100644 --- a/api/server/router/swarm/cluster_routes.go +++ b/api/server/router/swarm/cluster_routes.go @@ -383,6 +383,7 @@ func (sr *swarmRouter) removeSecret(ctx context.Context, w http.ResponseWriter, if err := sr.backend.RemoveSecret(vars["id"]); err != nil { return err } + w.WriteHeader(http.StatusNoContent) return nil } diff --git a/docs/api/version-history.md b/docs/api/version-history.md index b70cff1cab..62f7430adc 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -76,7 +76,11 @@ keywords: "API, Docker, rcli, REST, documentation" * `DELETE /plugins/(plugin name)` delete a plugin. * `POST /node/(id or name)/update` now accepts both `id` or `name` to identify the node to update. * `GET /images/json` now support a `reference` filter. - +* `GET /secrets` returns information on the secrets. +* `POST /secrets/create` creates a secret. +* `DELETE /secrets/{id}` removes the secret `id`. +* `GET /secrets/{id}` returns information on the secret `id`. +* `POST /secrets/{id}/update` updates the secret `id`. ## v1.24 API changes diff --git a/integration-cli/daemon_swarm.go b/integration-cli/daemon_swarm.go index cb364f0443..a5039971a3 100644 --- a/integration-cli/daemon_swarm.go +++ b/integration-cli/daemon_swarm.go @@ -317,7 +317,7 @@ func (d *SwarmDaemon) getSecret(c *check.C, id string) *swarm.Secret { func (d *SwarmDaemon) deleteSecret(c *check.C, id string) { status, out, err := d.SockRequest("DELETE", "/secrets/"+id, nil) c.Assert(err, checker.IsNil, check.Commentf(string(out))) - c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out))) + c.Assert(status, checker.Equals, http.StatusNoContent, check.Commentf("output: %q", string(out))) } func (d *SwarmDaemon) getSwarm(c *check.C) swarm.Swarm {