Normalize hostname checking for tenancy or enterprise

andyfeller · andyfeller · commit 7b29c8ee05f1 · 2024-03-18T13:16:17.000-04:00
This aligns the `cli/cli` behavior of IsTenancy and IsEnterprise with the counterparts here.
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
@@ -153,11 +153,13 @@ func defaultHost(cfg *config.Config) (string, string) {
 const tenancyHost = "ghe.com"
 
 func IsEnterprise(host string) bool {
-	return host != github && host != localhost && !IsTenancy(host)
+	normalizedHost := normalizeHostname(host)
+	return normalizedHost != github && normalizedHost != localhost && !IsTenancy(normalizedHost)
 }
 
 func IsTenancy(host string) bool {
-	return strings.HasSuffix(host, "."+tenancyHost)
+	normalizedHost := normalizeHostname(host)
+	return strings.HasSuffix(normalizedHost, "."+tenancyHost)
 }
 
 func normalizeHostname(host string) string {

Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,13 @@ func defaultHost(cfg *config.Config) (string, string) {`
`153`	`153`	`const tenancyHost = "ghe.com"`
`154`	`154`
`155`	`155`	`func IsEnterprise(host string) bool {`
`156`		`- return host != github && host != localhost && !IsTenancy(host)`
	`156`	`+ normalizedHost := normalizeHostname(host)`
	`157`	`+ return normalizedHost != github && normalizedHost != localhost && !IsTenancy(normalizedHost)`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`func IsTenancy(host string) bool {`
`160`		`- return strings.HasSuffix(host, "."+tenancyHost)`
	`161`	`+ normalizedHost := normalizeHostname(host)`
	`162`	`+ return strings.HasSuffix(normalizedHost, "."+tenancyHost)`
`161`	`163`	`}`
`162`	`164`
`163`	`165`	`func normalizeHostname(host string) string {`