Merge pull request #221 from dnephin/fix-lint-errors

Fix lint errors merged while new lint branch was in PR
Upstream-commit: 0c6b8d717d
Component: cli

components/cli/cli/command/service/opts.go

@@ -354,7 +354,11 @@ func convertNetworks(ctx context.Context, apiClient client.NetworkAPIClient, net
 		if err != nil {
 			return nil, err
 		}
-		netAttach = append(netAttach, swarm.NetworkAttachmentConfig(net))
+		netAttach = append(netAttach, swarm.NetworkAttachmentConfig{ // nolint: gosimple
+			Target:     net.Target,
+			Aliases:    net.Aliases,
+			DriverOpts: net.DriverOpts,
+		})
 	}
 	sort.Sort(byNetworkTarget(netAttach))
 	return netAttach, nil

components/cli/cli/command/service/update.go

@@ -503,9 +503,8 @@ func updatePlacementPreferences(flags *pflag.FlagSet, placement *swarm.Placement
 	}
 
 	if flags.Changed(flagPlacementPrefAdd) {
-		for _, addition := range flags.Lookup(flagPlacementPrefAdd).Value.(*placementPrefOpts).prefs {
-			newPrefs = append(newPrefs, addition)
-		}
+		newPrefs = append(newPrefs,
+			flags.Lookup(flagPlacementPrefAdd).Value.(*placementPrefOpts).prefs...)
 	}
 
 	placement.Preferences = newPrefs

components/cli/cli/config/configfile/file.go

@@ -173,7 +173,7 @@ func (configFile *ConfigFile) ParseProxyConfig(host string, runOpts []string) ma
 		cfgKey = host
 	}
 
-	config, _ := configFile.Proxies[cfgKey]
+	config := configFile.Proxies[cfgKey]
 	permitted := map[string]*string{
 		"HTTP_PROXY":  &config.HTTPProxy,
 		"HTTPS_PROXY": &config.HTTPSProxy,