Filter empty strings from uplinks and endpoints

Author: Wei Tie

netplugin/netd.go

@@ -95,7 +95,7 @@ func initNetPluginConfig(ctx *cli.Context) (*plugin.Config, error) {
 	}
 	logrus.Infof("Using netplugin VTEP IP: %v", vtepIP)
 
-	vlanUpLinks := strings.Split(ctx.String("vlan-uplinks"), ",")
+	vlanUpLinks := utils.FilterEmpty(strings.Split(ctx.String("vlan-uplinks"), ","))
 	if netConfigs.NetworkMode == "vlan" && len(vlanUpLinks) == 0 {
 		return nil, fmt.Errorf("vlan-uplinks must be set when using VLAN mode")
 	}

utils/configs.go

@@ -195,7 +195,7 @@ func ValidateDBOptions(binary string, ctx *cli.Context) (*DBConfigs, error) {
 		storeDriver = "consul"
 		storeURLs = consulURLs
 	}
-	for _, endpoint := range strings.Split(storeURLs, ",") {
+	for _, endpoint := range FilterEmpty(strings.Split(storeURLs, ",")) {
 		_, err := url.Parse(endpoint)
 		if err != nil {
 			return nil, fmt.Errorf("invalid %s %v endpoint: %v", binary, storeDriver, endpoint)
@@ -206,6 +206,10 @@ func ValidateDBOptions(binary string, ctx *cli.Context) (*DBConfigs, error) {
 		break
 	}
 
+	if storeURL == "" {
+		return nil, fmt.Errorf("invalid %s %s endpoints: empty", binary, storeDriver)
+	}
+
 	return &DBConfigs{
 		StoreDriver: storeDriver,
 		StoreURL:    storeURL,
@@ -262,3 +266,14 @@ func FlattenFlags(flagSlices ...[]cli.Flag) []cli.Flag {
 	}
 	return flags
 }
+
+// FilterEmpty filters empty string from string slices
+func FilterEmpty(stringSlice []string) []string {
+	var result []string
+	for _, str := range stringSlice {
+		if str != "" {
+			result = append(result, str)
+		}
+	}
+	return result
+}