Skip to content

fix(cli): do not overwrite repeated SSH options in config-ssh #13819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 9, 2024
Merged

fix(cli): do not overwrite repeated SSH options in config-ssh #13819

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62ada21
fix(cli): do not overwrite repeated SSH options in config-ssh
mafredri Jul 8, 2024
8e131eb
fix test and case insensitivity
mafredri Jul 8, 2024
bec1f01
improve comment
mafredri Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test and case insensitivity
  • Loading branch information
@mafredri
mafredri committed Jul 8, 2024
commit 8e131ebc5eb0eae380e732c10bd5fd2ac940a704
5 changes: 3 additions & 2 deletions cli/configssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions cli/configssh_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down