From 98c036943794383094e00cfb0c16d460593375bf Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Tue, 3 Jan 2017 11:31:41 +0800 Subject: [PATCH] Remove the redundant 'if' statements Signed-off-by: Yanqiang Miao --- daemon/cluster/secrets.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/daemon/cluster/secrets.go b/daemon/cluster/secrets.go index 959ae29376..df26f13d46 100644 --- a/daemon/cluster/secrets.go +++ b/daemon/cluster/secrets.go @@ -101,10 +101,8 @@ func (c *Cluster) RemoveSecret(id string) error { SecretID: id, } - if _, err := state.controlClient.RemoveSecret(ctx, req); err != nil { - return err - } - return nil + _, err := state.controlClient.RemoveSecret(ctx, req) + return err } // UpdateSecret updates a secret in a managed swarm cluster. @@ -123,16 +121,13 @@ func (c *Cluster) UpdateSecret(id string, version uint64, spec types.SecretSpec) secretSpec := convert.SecretSpecToGRPC(spec) - if _, err := state.controlClient.UpdateSecret(ctx, + _, err := state.controlClient.UpdateSecret(ctx, &swarmapi.UpdateSecretRequest{ SecretID: id, SecretVersion: &swarmapi.Version{ Index: version, }, Spec: &secretSpec, - }); err != nil { - return err - } - - return nil + }) + return err }