Add ssh_config.GetCanonicalCase to print correct key case

sbrownjc · sbrownjc · commit cf1aad903183 · 2022-02-10T15:53:56.000-06:00
TODO: Remove reference to github.com/StephenBrown2/ssh_config when kevinburke/ssh_config#39 or xwjdsh/ssh_config#1 get merged
diff --git a/cmd/manssh/print.go b/cmd/manssh/print.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/xwjdsh/manssh"
 	"github.com/xwjdsh/manssh/utils"
+	"github.com/StephenBrown2/ssh_config"
 
 	"github.com/fatih/color"
 	"github.com/urfave/cli"
@@ -68,13 +69,15 @@ func printHost(showPath bool, host *manssh.HostConfig) {
 		if value == "" {
 			continue
 		}
+		key = ssh_config.GetCanonicalCase(key)
 		color.Cyan("\t    %s = %s\n", key, value)
 	}
 	for _, key := range utils.SortKeys(host.ImplicitConfig) {
 		value := host.ImplicitConfig[key]
 		if value == "" {
 			continue
 		}
+		key = ssh_config.GetCanonicalCase(key)
 		fmt.Printf("\t    %s = %s\n", key, value)
 	}
 	fmt.Println()
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/xwjdsh/manssh
 go 1.17
 
 require (
+	github.com/StephenBrown2/ssh_config v0.0.0-20220210203636-036f61b9d304
 	github.com/fatih/color v1.6.0
 	github.com/stretchr/testify v1.2.2
 	github.com/urfave/cli v1.20.0
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/StephenBrown2/ssh_config v0.0.0-20220210203636-036f61b9d304 h1:8hAMVQVab9hnIUPWdC9EpjQ4hQZ2cFA1IWTcVK6OFlc=
+github.com/StephenBrown2/ssh_config v0.0.0-20220210203636-036f61b9d304/go.mod h1:+xBtisLP9jShhZEbtomFsY6e/rvCwloqPf1qbA1HCaU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.6.0 h1:66qjqZk8kalYAvDRtM1AdAJQI0tj4Wrue3Eq3B3pmFU=

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/xwjdsh/manssh"`
`9`	`9`	`"github.com/xwjdsh/manssh/utils"`
	`10`	`+ "github.com/StephenBrown2/ssh_config"`
`10`	`11`
`11`	`12`	`"github.com/fatih/color"`
`12`	`13`	`"github.com/urfave/cli"`
`@@ -68,13 +69,15 @@ func printHost(showPath bool, host *manssh.HostConfig) {`
`68`	`69`	`if value == "" {`
`69`	`70`	`continue`
`70`	`71`	`}`
	`72`	`+ key = ssh_config.GetCanonicalCase(key)`
`71`	`73`	`color.Cyan("\t %s = %s\n", key, value)`
`72`	`74`	`}`
`73`	`75`	`for _, key := range utils.SortKeys(host.ImplicitConfig) {`
`74`	`76`	`value := host.ImplicitConfig[key]`
`75`	`77`	`if value == "" {`
`76`	`78`	`continue`
`77`	`79`	`}`
	`80`	`+ key = ssh_config.GetCanonicalCase(key)`
`78`	`81`	`fmt.Printf("\t %s = %s\n", key, value)`
`79`	`82`	`}`
`80`	`83`	`fmt.Println()`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+github.com/StephenBrown2/ssh_config v0.0.0-20220210203636-036f61b9d304 h1:8hAMVQVab9hnIUPWdC9EpjQ4hQZ2cFA1IWTcVK6OFlc=`
	`2`	`+github.com/StephenBrown2/ssh_config v0.0.0-20220210203636-036f61b9d304/go.mod h1:+xBtisLP9jShhZEbtomFsY6e/rvCwloqPf1qbA1HCaU=`
`1`	`3`	`github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=`
`2`	`4`	`github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=`
`3`	`5`	`github.com/fatih/color v1.6.0 h1:66qjqZk8kalYAvDRtM1AdAJQI0tj4Wrue3Eq3B3pmFU=`