From 8788cdab0bd156ce1ae2c9adb243abeceb81b2a3 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Thu, 3 Nov 2016 14:09:13 -0400 Subject: [PATCH] review updates - use Filters instead of Filter for secret list - UID, GID -> string - getSecrets -> getSecretsByName - updated test case for secrets with better source - use golang.org/x/context instead of context - for grpc conversion allocate with make - check for nil with task.Spec.GetContainer() Signed-off-by: Evan Hazlett Upstream-commit: ab6c38e01414042eb3edc70c39453e7b3f45a563 Component: cli --- components/cli/secret_list.go | 4 ++-- components/cli/secret_list_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/cli/secret_list.go b/components/cli/secret_list.go index 5e9d2b5098..7e9d5ec167 100644 --- a/components/cli/secret_list.go +++ b/components/cli/secret_list.go @@ -14,8 +14,8 @@ import ( func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) { query := url.Values{} - if options.Filter.Len() > 0 { - filterJSON, err := filters.ToParam(options.Filter) + if options.Filters.Len() > 0 { + filterJSON, err := filters.ToParam(options.Filters) if err != nil { return nil, err } diff --git a/components/cli/secret_list_test.go b/components/cli/secret_list_test.go index 174963c7ee..1ac11cddb3 100644 --- a/components/cli/secret_list_test.go +++ b/components/cli/secret_list_test.go @@ -45,7 +45,7 @@ func TestSecretList(t *testing.T) { }, { options: types.SecretListOptions{ - Filter: filters, + Filters: filters, }, expectedQueryParams: map[string]string{ "filters": `{"label":{"label1":true,"label2":true}}`,