UpdateAppArg removes app argument if its value is empty

pkg/visor/visorconfig/v1.go

@@ -125,41 +125,56 @@ func (v1 *V1) UpdateAppAutostart(launch *launcher.Launcher, appName string, auto
 }
 
 // UpdateAppArg updates the cli flag of the specified app config and also within the launcher.
+// It removes argName from app args if value is an empty string.
 // The updated config gets flushed to file if there are any changes.
 func (v1 *V1) UpdateAppArg(launch *launcher.Launcher, appName, argName, value string) error {
 	v1.mu.Lock()
 	defer v1.mu.Unlock()
 
 	conf := v1.Launcher
 
-	configChanged := true
+	configChanged := updateArg(conf, appName, argName, value)
+
+	if !configChanged {
+		return nil
+	}
+
+	launch.ResetConfig(launcher.Config{
+		VisorPK:    v1.PK,
+		Apps:       conf.Apps,
+		ServerAddr: conf.ServerAddr,
+	})
+
+	return v1.flush(v1)
+}
+
+func updateArg(conf *V1Launcher, appName, argName, value string) bool {
+	configChanged := false
+
 	for i := range conf.Apps {
 		if conf.Apps[i].Name == appName {
 			configChanged = true
 
 			argChanged := false
-			for j := range conf.Apps[i].Args {
+			l := len(conf.Apps[i].Args)
+			for j := 0; j < l; j++ {
 				if conf.Apps[i].Args[j] == argName && j+1 < len(conf.Apps[i].Args) {
-					conf.Apps[i].Args[j+1] = value
+					if value == "" {
+						conf.Apps[i].Args = append(conf.Apps[i].Args[:j], conf.Apps[i].Args[j+2:]...)
+						j--
+					} else {
+						conf.Apps[i].Args[j+1] = value
+					}
 					argChanged = true
 					break
 				}
 			}
+
 			if !argChanged {
 				conf.Apps[i].Args = append(conf.Apps[i].Args, argName, value)
 			}
 		}
 	}
 
-	if !configChanged {
-		return nil
-	}
-
-	launch.ResetConfig(launcher.Config{
-		VisorPK:    v1.PK,
-		Apps:       conf.Apps,
-		ServerAddr: conf.ServerAddr,
-	})
-
-	return v1.flush(v1)
+	return configChanged
 }

pkg/visor/visorconfig/v1_test.go

@@ -0,0 +1,158 @@
+package visorconfig
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/skycoin/skywire/pkg/app/launcher"
+)
+
+func Test_updateArg(t *testing.T) {
+	type args struct {
+		conf    *V1Launcher
+		appName string
+		argName string
+		value   string
+	}
+	tests := []struct {
+		name       string
+		args       args
+		wantResult bool
+		wantConf   *V1Launcher
+	}{
+		{
+			name: "Case 1",
+			args: args{
+				conf: &V1Launcher{
+					Apps: []launcher.AppConfig{
+						{
+							Name: "skysocks-client",
+							Args: []string{"-passcode", "1234"},
+						},
+					},
+				},
+				appName: "skysocks-client",
+				argName: "-passcode",
+				value:   "4321",
+			},
+			wantResult: true,
+			wantConf: &V1Launcher{
+				Apps: []launcher.AppConfig{
+					{
+						Name: "skysocks-client",
+						Args: []string{"-passcode", "4321"},
+					},
+				},
+			},
+		},
+		{
+			name: "Case 2",
+			args: args{
+				conf: &V1Launcher{
+					Apps: []launcher.AppConfig{
+						{
+							Name: "skysocks-client",
+							Args: []string{"-passcode", "1234"},
+						},
+					},
+				},
+				appName: "skysocks-client",
+				argName: "-passcode",
+				value:   "",
+			},
+			wantResult: true,
+			wantConf: &V1Launcher{
+				Apps: []launcher.AppConfig{
+					{
+						Name: "skysocks-client",
+						Args: []string{},
+					},
+				},
+			},
+		},
+		{
+			name: "Case 3",
+			args: args{
+				conf: &V1Launcher{
+					Apps: []launcher.AppConfig{
+						{
+							Name: "skysocks-client",
+							Args: []string{"-t", "-passcode", "1234", "-test", "abc"},
+						},
+					},
+				},
+				appName: "skysocks-client",
+				argName: "-passcode",
+				value:   "",
+			},
+			wantResult: true,
+			wantConf: &V1Launcher{
+				Apps: []launcher.AppConfig{
+					{
+						Name: "skysocks-client",
+						Args: []string{"-t", "-test", "abc"},
+					},
+				},
+			},
+		},
+		{
+			name: "Case 4",
+			args: args{
+				conf: &V1Launcher{
+					Apps: []launcher.AppConfig{
+						{
+							Name: "skysocks-client",
+							Args: []string{"-t", "-passcode", "1234", "-test", "abc"},
+						},
+					},
+				},
+				appName: "skysocks-client",
+				argName: "-arg1",
+				value:   "678",
+			},
+			wantResult: true,
+			wantConf: &V1Launcher{
+				Apps: []launcher.AppConfig{
+					{
+						Name: "skysocks-client",
+						Args: []string{"-t", "-passcode", "1234", "-test", "abc", "-arg1", "678"},
+					},
+				},
+			},
+		},
+		{
+			name: "Case 5",
+			args: args{
+				conf: &V1Launcher{
+					Apps: []launcher.AppConfig{
+						{
+							Name: "skysocks-client",
+							Args: []string{"-t", "-passcode", "1234", "-test", "abc"},
+						},
+					},
+				},
+				appName: "unknown",
+				argName: "-arg1",
+				value:   "678",
+			},
+			wantResult: false,
+			wantConf: &V1Launcher{
+				Apps: []launcher.AppConfig{
+					{
+						Name: "skysocks-client",
+						Args: []string{"-t", "-passcode", "1234", "-test", "abc"},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := updateArg(tt.args.conf, tt.args.appName, tt.args.argName, tt.args.value)
+			assert.Equal(t, result, tt.wantResult)
+			assert.EqualValues(t, tt.args.conf, tt.wantConf)
+		})
+	}
+}