Merge branch 'trunk' into bump-cobra

mislav · web-flow · commit dac771e088ef · 2021-12-20T16:35:44.000+01:00
diff --git a/git/ssh_config.go b/git/ssh_config.go
@@ -30,9 +30,8 @@ func (m SSHAliasMap) Translator() func(*url.URL) *url.URL {
 		if !ok {
 			return u
 		}
-		// FIXME: cleanup domain logic
-		if strings.EqualFold(u.Hostname(), "github.com") && strings.EqualFold(resolvedHost, "ssh.github.com") {
-			return u
+		if strings.EqualFold(resolvedHost, "ssh.github.com") {
+			resolvedHost = "github.com"
 		}
 		newURL, _ := url.Parse(u.String())
 		newURL.Host = resolvedHost
diff --git a/git/ssh_config_test.go b/git/ssh_config_test.go
@@ -128,12 +128,14 @@ func Test_Translator(t *testing.T) {
 	m := SSHAliasMap{
 		"gh":         "github.com",
 		"github.com": "ssh.github.com",
+		"my.gh.com":  "ssh.github.com",
 	}
 	tr := m.Translator()
 
 	cases := [][]string{
 		{"ssh://gh/o/r", "ssh://github.com/o/r"},
 		{"ssh://github.com/o/r", "ssh://github.com/o/r"},
+		{"ssh://my.gh.com", "ssh://github.com"},
 		{"https://gh/o/r", "https://gh/o/r"},
 	}
 	for _, c := range cases {
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.2
 	github.com/MakeNowJust/heredoc v1.0.0
-	github.com/briandowns/spinner v1.13.0
+	github.com/briandowns/spinner v1.18.0
 	github.com/charmbracelet/glamour v0.3.0
 	github.com/cli/browser v1.1.0
 	github.com/cli/oauth v0.9.0
diff --git a/go.sum b/go.sum
@@ -81,8 +81,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/briandowns/spinner v1.13.0 h1:q/Y9LtpwtvL0CRzXrAMj0keVXqNhBYUFg6tBOUiY8ek=
-github.com/briandowns/spinner v1.13.0/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
+github.com/briandowns/spinner v1.18.0 h1:SJs0maNOs4FqhBwiJ3Gr7Z1D39/rukIVGQvpNZVHVcM=
+github.com/briandowns/spinner v1.18.0/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,8 @@ func (m SSHAliasMap) Translator() func(url.URL) url.URL {`
`30`	`30`	`if !ok {`
`31`	`31`	`return u`
`32`	`32`	`}`
`33`		`- // FIXME: cleanup domain logic`
`34`		`- if strings.EqualFold(u.Hostname(), "github.com") && strings.EqualFold(resolvedHost, "ssh.github.com") {`
`35`		`- return u`
	`33`	`+ if strings.EqualFold(resolvedHost, "ssh.github.com") {`
	`34`	`+ resolvedHost = "github.com"`
`36`	`35`	`}`
`37`	`36`	`newURL, _ := url.Parse(u.String())`
`38`	`37`	`newURL.Host = resolvedHost`
Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,14 @@ func Test_Translator(t *testing.T) {`
`128`	`128`	`m := SSHAliasMap{`
`129`	`129`	`"gh": "github.com",`
`130`	`130`	`"github.com": "ssh.github.com",`
	`131`	`+ "my.gh.com": "ssh.github.com",`
`131`	`132`	`}`
`132`	`133`	`tr := m.Translator()`
`133`	`134`
`134`	`135`	`cases := [][]string{`
`135`	`136`	`{"ssh://gh/o/r", "ssh://github.com/o/r"},`
`136`	`137`	`{"ssh://github.com/o/r", "ssh://github.com/o/r"},`
	`138`	`+ {"ssh://my.gh.com", "ssh://github.com"},`
`137`	`139`	`{"https://gh/o/r", "https://gh/o/r"},`
`138`	`140`	`}`
`139`	`141`	`for _, c := range cases {`