diff --git a/api/types/swarm/secret.go b/api/types/swarm/secret.go index b232d6dae1..fdb2388888 100644 --- a/api/types/swarm/secret.go +++ b/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/cli/command/secret/ls.go b/cli/command/secret/ls.go index 7471f08b19..e99f99e3d2 100644 --- a/cli/command/secret/ls.go +++ b/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/daemon/cluster/convert/secret.go b/daemon/cluster/convert/secret.go index 526646a69b..3e966873f4 100644 --- a/daemon/cluster/convert/secret.go +++ b/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,