Merge pull request #29837 from miaoyq/remove-extra-if-statement

Remove the redundant 'if' statements
This commit is contained in:
Vincent Demeester 2017-01-03 12:42:19 +01:00 committed by GitHub
commit 884a1c2263
1 changed files with 5 additions and 10 deletions

View File

@ -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
}