fix test and case insensitivity

mafredri · mafredri · commit 8e131ebc5eb0 · 2024-07-08T19:12:22.000+03:00
diff --git a/cli/configssh.go b/cli/configssh.go
@@ -75,7 +75,8 @@ func (o *sshConfigOptions) addOption(option string) error {
 	if err != nil {
 		return err
 	}
-	if o.removedKeys != nil && o.removedKeys[key] {
+	lowerKey := strings.ToLower(key)
+	if o.removedKeys != nil && o.removedKeys[lowerKey] {
 		// Key marked as removed, skip.
 		return nil
 	}
@@ -87,7 +88,7 @@ func (o *sshConfigOptions) addOption(option string) error {
 		if o.removedKeys == nil {
 			o.removedKeys = make(map[string]bool)
 		}
-		o.removedKeys[key] = true
+		o.removedKeys[lowerKey] = true
 	}
 	return nil
 }
diff --git a/cli/configssh_internal_test.go b/cli/configssh_internal_test.go
@@ -272,32 +272,32 @@ func Test_sshConfigOptions_addOption(t *testing.T) {
 			},
 		},
 		{
-			Name: "Replace",
+			Name: "AddTwo",
 			Start: []string{
 				"foo bar",
 			},
 			Add: []string{"Foo baz"},
 			Expect: []string{
+				"foo bar",
 				"Foo baz",
 			},
 		},
 		{
-			Name: "AddAndReplace",
+			Name: "AddAndRemove",
 			Start: []string{
-				"a b",
 				"foo bar",
 				"buzz bazz",
 			},
 			Add: []string{
 				"b c",
+				"a=", // Remove all entries that start with "a", i.e. next line.
 				"A hello",
 				"hello world",
 			},
 			Expect: []string{
 				"foo bar",
 				"buzz bazz",
 				"b c",
-				"A hello",
 				"hello world",
 			},
 		},

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ func (o *sshConfigOptions) addOption(option string) error {`
`75`	`75`	`if err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
`78`		`- if o.removedKeys != nil && o.removedKeys[key] {`
	`78`	`+ lowerKey := strings.ToLower(key)`
	`79`	`+ if o.removedKeys != nil && o.removedKeys[lowerKey] {`
`79`	`80`	`// Key marked as removed, skip.`
`80`	`81`	`return nil`
`81`	`82`	`}`
`@@ -87,7 +88,7 @@ func (o *sshConfigOptions) addOption(option string) error {`
`87`	`88`	`if o.removedKeys == nil {`
`88`	`89`	`o.removedKeys = make(map[string]bool)`
`89`	`90`	`}`
`90`		`- o.removedKeys[key] = true`
	`91`	`+ o.removedKeys[lowerKey] = true`
`91`	`92`	`}`
`92`	`93`	`return nil`
`93`	`94`	`}`