Remove redundant return nil
| ... | ... |
@@ -1072,10 +1072,8 @@ func (c *Cluster) RemoveService(input string) error {
|
| 1072 | 1072 |
return err |
| 1073 | 1073 |
} |
| 1074 | 1074 |
|
| 1075 |
- if _, err := state.controlClient.RemoveService(ctx, &swarmapi.RemoveServiceRequest{ServiceID: service.ID}); err != nil {
|
|
| 1076 |
- return err |
|
| 1077 |
- } |
|
| 1078 |
- return nil |
|
| 1075 |
+ _, err = state.controlClient.RemoveService(ctx, &swarmapi.RemoveServiceRequest{ServiceID: service.ID})
|
|
| 1076 |
+ return err |
|
| 1079 | 1077 |
} |
| 1080 | 1078 |
|
| 1081 | 1079 |
// ServiceLogs collects service logs and writes them back to `config.OutStream` |
| ... | ... |
@@ -1268,10 +1266,8 @@ func (c *Cluster) RemoveNode(input string, force bool) error {
|
| 1268 | 1268 |
return err |
| 1269 | 1269 |
} |
| 1270 | 1270 |
|
| 1271 |
- if _, err := state.controlClient.RemoveNode(ctx, &swarmapi.RemoveNodeRequest{NodeID: node.ID, Force: force}); err != nil {
|
|
| 1272 |
- return err |
|
| 1273 |
- } |
|
| 1274 |
- return nil |
|
| 1271 |
+ _, err = state.controlClient.RemoveNode(ctx, &swarmapi.RemoveNodeRequest{NodeID: node.ID, Force: force})
|
|
| 1272 |
+ return err |
|
| 1275 | 1273 |
} |
| 1276 | 1274 |
|
| 1277 | 1275 |
// GetTasks returns a list of tasks matching the filter options. |
| ... | ... |
@@ -1594,10 +1590,8 @@ func (c *Cluster) RemoveNetwork(input string) error {
|
| 1594 | 1594 |
return err |
| 1595 | 1595 |
} |
| 1596 | 1596 |
|
| 1597 |
- if _, err := state.controlClient.RemoveNetwork(ctx, &swarmapi.RemoveNetworkRequest{NetworkID: network.ID}); err != nil {
|
|
| 1598 |
- return err |
|
| 1599 |
- } |
|
| 1600 |
- return nil |
|
| 1597 |
+ _, err = state.controlClient.RemoveNetwork(ctx, &swarmapi.RemoveNetworkRequest{NetworkID: network.ID})
|
|
| 1598 |
+ return err |
|
| 1601 | 1599 |
} |
| 1602 | 1600 |
|
| 1603 | 1601 |
func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.ControlClient, s *types.ServiceSpec) error {
|