Support github.localhost as a non-enterprise host

joshmgross · mislav · commit e43777ebd293 · 2021-10-18T20:01:18.000+02:00
diff --git a/internal/ghinstance/host.go b/internal/ghinstance/host.go
@@ -8,14 +8,18 @@ import (
 
 const defaultHostname = "github.com"
 
+// localhost is the domain name of a local GitHub instance
+const localhost = "github.localhost"
+
 // Default returns the host name of the default GitHub instance
 func Default() string {
 	return defaultHostname
 }
 
 // IsEnterprise reports whether a non-normalized host name looks like a GHE instance
 func IsEnterprise(h string) bool {
-	return NormalizeHostname(h) != defaultHostname
+	normalizedHostName := NormalizeHostname(h)
+	return normalizedHostName != defaultHostname && normalizedHostName != localhost
 }
 
 // NormalizeHostname returns the canonical host name of a GitHub instance
@@ -24,6 +28,11 @@ func NormalizeHostname(h string) string {
 	if strings.HasSuffix(hostname, "."+defaultHostname) {
 		return defaultHostname
 	}
+
+	if strings.HasSuffix(hostname, "."+localhost) {
+		return localhost
+	}
+
 	return hostname
 }
 
@@ -46,14 +55,14 @@ func GraphQLEndpoint(hostname string) string {
 	if IsEnterprise(hostname) {
 		return fmt.Sprintf("https://%s/api/graphql", hostname)
 	}
-	return "https://api.github.com/graphql"
+	return fmt.Sprintf("https://api.%s/graphql", hostname)
 }
 
 func RESTPrefix(hostname string) string {
 	if IsEnterprise(hostname) {
 		return fmt.Sprintf("https://%s/api/v3/", hostname)
 	}
-	return "https://api.github.com/"
+	return fmt.Sprintf("https://api.%s/", hostname)
 }
 
 func GistPrefix(hostname string) string {
diff --git a/internal/ghinstance/host_test.go b/internal/ghinstance/host_test.go
@@ -19,6 +19,14 @@ func TestIsEnterprise(t *testing.T) {
 			host: "api.github.com",
 			want: false,
 		},
+		{
+			host: "github.localhost",
+			want: false,
+		},
+		{
+			host: "api.github.localhost",
+			want: false,
+		},
 		{
 			host: "ghe.io",
 			want: true,
@@ -58,6 +66,14 @@ func TestNormalizeHostname(t *testing.T) {
 			host: "upload.github.com",
 			want: "github.com",
 		},
+		{
+			host: "GitHub.localhost",
+			want: "github.localhost",
+		},
+		{
+			host: "api.github.localhost",
+			want: "github.localhost",
+		},
 		{
 			host: "GHE.IO",
 			want: "ghe.io",
@@ -129,6 +145,10 @@ func TestGraphQLEndpoint(t *testing.T) {
 			host: "github.com",
 			want: "https://api.github.com/graphql",
 		},
+		{
+			host: "github.localhost",
+			want: "https://api.github.localhost/graphql",
+		},
 		{
 			host: "ghe.io",
 			want: "https://ghe.io/api/graphql",
@@ -152,6 +172,10 @@ func TestRESTPrefix(t *testing.T) {
 			host: "github.com",
 			want: "https://api.github.com/",
 		},
+		{
+			host: "github.localhost",
+			want: "https://api.github.localhost/",
+		},
 		{
 			host: "ghe.io",
 			want: "https://ghe.io/api/v3/",

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,18 @@ import (`
`8`	`8`
`9`	`9`	`const defaultHostname = "github.com"`
`10`	`10`
	`11`	`+// localhost is the domain name of a local GitHub instance`
	`12`	`+const localhost = "github.localhost"`
	`13`	`+`
`11`	`14`	`// Default returns the host name of the default GitHub instance`
`12`	`15`	`func Default() string {`
`13`	`16`	`return defaultHostname`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`// IsEnterprise reports whether a non-normalized host name looks like a GHE instance`
`17`	`20`	`func IsEnterprise(h string) bool {`
`18`		`- return NormalizeHostname(h) != defaultHostname`
	`21`	`+ normalizedHostName := NormalizeHostname(h)`
	`22`	`+ return normalizedHostName != defaultHostname && normalizedHostName != localhost`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`// NormalizeHostname returns the canonical host name of a GitHub instance`
`@@ -24,6 +28,11 @@ func NormalizeHostname(h string) string {`
`24`	`28`	`if strings.HasSuffix(hostname, "."+defaultHostname) {`
`25`	`29`	`return defaultHostname`
`26`	`30`	`}`
	`31`	`+`
	`32`	`+ if strings.HasSuffix(hostname, "."+localhost) {`
	`33`	`+ return localhost`
	`34`	`+ }`
	`35`	`+`
`27`	`36`	`return hostname`
`28`	`37`	`}`
`29`	`38`
`@@ -46,14 +55,14 @@ func GraphQLEndpoint(hostname string) string {`
`46`	`55`	`if IsEnterprise(hostname) {`
`47`	`56`	`return fmt.Sprintf("https://%s/api/graphql", hostname)`
`48`	`57`	`}`
`49`		`- return "https://api.github.com/graphql"`
	`58`	`+ return fmt.Sprintf("https://api.%s/graphql", hostname)`
`50`	`59`	`}`
`51`	`60`
`52`	`61`	`func RESTPrefix(hostname string) string {`
`53`	`62`	`if IsEnterprise(hostname) {`
`54`	`63`	`return fmt.Sprintf("https://%s/api/v3/", hostname)`
`55`	`64`	`}`
`56`		`- return "https://api.github.com/"`
	`65`	`+ return fmt.Sprintf("https://api.%s/", hostname)`
`57`	`66`	`}`
`58`	`67`
`59`	`68`	`func GistPrefix(hostname string) string {`