From 2e3fe52bff0a6da6bd29b3e4d26b6c29fd538ea0 Mon Sep 17 00:00:00 2001 From: cyli Date: Tue, 22 Nov 2016 16:37:02 -0500 Subject: [PATCH 1/2] Do not display the digest or size of swarm secrets Signed-off-by: cyli Upstream-commit: 2c0613540a25d45069d142542e572bb6338e4155 Component: engine --- components/engine/api/types/swarm/secret.go | 4 +--- components/engine/cli/command/secret/ls.go | 5 ++--- components/engine/daemon/cluster/convert/secret.go | 4 +--- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/engine/api/types/swarm/secret.go b/components/engine/api/types/swarm/secret.go index b232d6dae1..fdb2388888 100644 --- a/components/engine/api/types/swarm/secret.go +++ b/components/engine/api/types/swarm/secret.go @@ -6,9 +6,7 @@ import "os" type Secret struct { ID string Meta - Spec SecretSpec - Digest string - SecretSize int64 + Spec SecretSpec } // SecretSpec represents a secret specification from a secret in swarm diff --git a/components/engine/cli/command/secret/ls.go b/components/engine/cli/command/secret/ls.go index 7471f08b19..e99f99e3d2 100644 --- a/components/engine/cli/command/secret/ls.go +++ b/components/engine/cli/command/secret/ls.go @@ -50,15 +50,14 @@ func runSecretList(dockerCli *command.DockerCli, opts listOptions) error { fmt.Fprintf(w, "%s\n", s.ID) } } else { - fmt.Fprintf(w, "ID\tNAME\tCREATED\tUPDATED\tSIZE") + fmt.Fprintf(w, "ID\tNAME\tCREATED\tUPDATED") fmt.Fprintf(w, "\n") for _, s := range secrets { created := units.HumanDuration(time.Now().UTC().Sub(s.Meta.CreatedAt)) + " ago" updated := units.HumanDuration(time.Now().UTC().Sub(s.Meta.UpdatedAt)) + " ago" - size := units.HumanSizeWithPrecision(float64(s.SecretSize), 3) - fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", s.ID, s.Spec.Annotations.Name, created, updated, size) + fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", s.ID, s.Spec.Annotations.Name, created, updated) } } diff --git a/components/engine/daemon/cluster/convert/secret.go b/components/engine/daemon/cluster/convert/secret.go index 526646a69b..3e966873f4 100644 --- a/components/engine/daemon/cluster/convert/secret.go +++ b/components/engine/daemon/cluster/convert/secret.go @@ -9,9 +9,7 @@ import ( // SecretFromGRPC converts a grpc Secret to a Secret. func SecretFromGRPC(s *swarmapi.Secret) swarmtypes.Secret { secret := swarmtypes.Secret{ - ID: s.ID, - Digest: s.Digest, - SecretSize: s.SecretSize, + ID: s.ID, Spec: swarmtypes.SecretSpec{ Annotations: swarmtypes.Annotations{ Name: s.Spec.Annotations.Name, From 00fa4cf151f9a343d8da43e98f69580ff487ae5e Mon Sep 17 00:00:00 2001 From: cyli Date: Tue, 22 Nov 2016 18:18:50 -0500 Subject: [PATCH 2/2] Update docs to reflect no longer displaying secret digest or size. Signed-off-by: cyli Upstream-commit: fe127b7eae427bde96b7852ac196825e1c9ea359 Component: engine --- components/engine/api/swagger.yaml | 9 --------- .../reference/commandline/secret_inspect.md | 17 +++++++---------- .../docs/reference/commandline/secret_ls.md | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index a8daf61f02..56a32bf8b2 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -2377,11 +2377,6 @@ definitions: format: "dateTime" Spec: $ref: "#/definitions/ServiceSpec" - Digest: - type: "string" - SecretSize: - type: "integer" - format: "int64" paths: /containers/json: get: @@ -7540,8 +7535,6 @@ paths: UpdatedAt: "2016-11-05T01:20:17.327670065Z" Spec: Name: "app-dev.crt" - Digest: "sha256:11d7c6f38253b73e608153c9f662a191ae605e1a3d9b756b0b3426388f91d3fa" - SecretSize: 31 500: description: "server error" schema: @@ -7620,8 +7613,6 @@ paths: UpdatedAt: "2016-11-05T01:20:17.327670065Z" Spec: Name: "app-dev.crt" - Digest: "sha256:11d7c6f38253b73e608153c9f662a191ae605e1a3d9b756b0b3426388f91d3fa" - SecretSize: 31 404: description: "secret not found" schema: diff --git a/components/engine/docs/reference/commandline/secret_inspect.md b/components/engine/docs/reference/commandline/secret_inspect.md index 0d427464af..de878f74e4 100644 --- a/components/engine/docs/reference/commandline/secret_inspect.md +++ b/components/engine/docs/reference/commandline/secret_inspect.md @@ -45,8 +45,8 @@ For example, given the following secret: ```bash $ docker secret ls -ID NAME CREATED UPDATED SIZE -mhv17xfe3gh6xc4rij5orpfds secret.json 2016-10-27 23:25:43.909181089 +0000 UTC 2016-10-27 23:25:43.909181089 +0000 UTC 1679 +ID NAME CREATED UPDATED +mhv17xfe3gh6xc4rij5orpfds secret.json 2016-10-27 23:25:43.909181089 +0000 UTC 2016-10-27 23:25:43.909181089 +0000 UTC ``` ```bash @@ -60,11 +60,8 @@ $ docker secret inspect secret.json "CreatedAt": "2016-10-27T23:25:43.909181089Z", "UpdatedAt": "2016-10-27T23:25:43.909181089Z", "Spec": { - "Name": "secret.json", - "Data": null - }, - "Digest": "sha256:8281c6d924520986e3c6af23ed8926710a611c90339db582c2a9ac480ba622b7", - "SecretSize": 1679 + "Name": "secret.json" + } } ] ``` @@ -72,12 +69,12 @@ $ docker secret inspect secret.json ### Formatting secret output You can use the --format option to obtain specific information about a -secret. The following example command outputs the digest of the +secret. The following example command outputs the creation time of the secret. ```bash{% raw %} -$ docker secret inspect --format='{{.Digest}}' mhv17xfe3gh6xc4rij5orpfds -sha256:8281c6d924520986e3c6af23ed8926710a611c90339db582c2a9ac480ba622b7 +$ docker secret inspect --format='{{.CreatedAt}}' mhv17xfe3gh6xc4rij5orpfds +2016-10-27 23:25:43.909181089 +0000 UTC {% endraw %}``` diff --git a/components/engine/docs/reference/commandline/secret_ls.md b/components/engine/docs/reference/commandline/secret_ls.md index fa78e66427..31659e72e6 100644 --- a/components/engine/docs/reference/commandline/secret_ls.md +++ b/components/engine/docs/reference/commandline/secret_ls.md @@ -33,8 +33,8 @@ On a manager node: ```bash $ docker secret ls -ID NAME CREATED UPDATED SIZE -mhv17xfe3gh6xc4rij5orpfds secret.json 2016-10-27 23:25:43.909181089 +0000 UTC 2016-10-27 23:25:43.909181089 +0000 UTC 1679 +ID NAME CREATED UPDATED +mhv17xfe3gh6xc4rij5orpfds secret.json 2016-10-27 23:25:43.909181089 +0000 UTC 2016-10-27 23:25:43.909181089 +0000 UTC ``` ## Related information