fix(hosted): restore public upstream for anonymous reads

Author: julianknutsen

cmd/wl/cmd_serve.go

@@ -34,9 +34,9 @@ import (
 )
 
 const (
-	hostedPublicUpstreamOrg = "wasteland"
-	hostedPublicUpstreamDB  = "wl-commons"
-	hostedPublicUpstream    = hostedPublicUpstreamOrg + "/" + hostedPublicUpstreamDB
+	hostedPublicUpstreamOrg = hosted.PublicUpstreamOrg
+	hostedPublicUpstreamDB  = hosted.PublicUpstreamDB
+	hostedPublicUpstream    = hosted.PublicUpstream
 	pendingRefreshTimeout   = 30 * time.Second
 )
 

cmd/wl/cmd_serve_additional_test.go

@@ -65,13 +65,13 @@ func TestResolvePort_InvalidEnvFallsBackToFlag(t *testing.T) {
 }
 
 func TestHostedPublicUpstream_IsCanonical(t *testing.T) {
-	if hostedPublicUpstreamOrg != "wasteland" {
+	if hostedPublicUpstreamOrg != "hop" {
 		t.Fatalf("hostedPublicUpstreamOrg = %q", hostedPublicUpstreamOrg)
 	}
 	if hostedPublicUpstreamDB != "wl-commons" {
 		t.Fatalf("hostedPublicUpstreamDB = %q", hostedPublicUpstreamDB)
 	}
-	if hostedPublicUpstream != "wasteland/wl-commons" {
+	if hostedPublicUpstream != "hop/wl-commons" {
 		t.Fatalf("hostedPublicUpstream = %q", hostedPublicUpstream)
 	}
 }

internal/hosted/public_upstream.go

@@ -0,0 +1,30 @@
+package hosted
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+)
+
+const (
+	// PublicUpstreamOrg defines the anonymous hosted board owner that backs
+	// logged-out browse, detail, and scoreboard reads.
+	PublicUpstreamOrg = "hop"
+	// PublicUpstreamDB defines the anonymous hosted board name that backs
+	// logged-out browse, detail, and scoreboard reads.
+	PublicUpstreamDB = "wl-commons"
+	// PublicUpstream is the canonical anonymous hosted board identity.
+	PublicUpstream = PublicUpstreamOrg + "/" + PublicUpstreamDB
+)
+
+// PublicDoltHubQueryURL builds the DoltHub SQL API URL for the canonical
+// public hosted upstream.
+func PublicDoltHubQueryURL(query string) string {
+	escaped := strings.ReplaceAll(url.QueryEscape(query), "+", "%20")
+	return fmt.Sprintf(
+		"https://www.dolthub.com/api/v1alpha1/%s/%s/main?q=%s",
+		PublicUpstreamOrg,
+		PublicUpstreamDB,
+		escaped,
+	)
+}

internal/hosted/public_upstream_test.go

@@ -0,0 +1,18 @@
+package hosted
+
+import "testing"
+
+func TestPublicDoltHubQueryURL_UsesCanonicalPublicRepo(t *testing.T) {
+	if PublicUpstreamOrg != "hop" {
+		t.Fatalf("PublicUpstreamOrg = %q", PublicUpstreamOrg)
+	}
+	if PublicUpstreamDB != "wl-commons" {
+		t.Fatalf("PublicUpstreamDB = %q", PublicUpstreamDB)
+	}
+	if PublicUpstream != "hop/wl-commons" {
+		t.Fatalf("PublicUpstream = %q", PublicUpstream)
+	}
+	if got := PublicDoltHubQueryURL("SELECT 1"); got != "https://www.dolthub.com/api/v1alpha1/hop/wl-commons/main?q=SELECT%201" {
+		t.Fatalf("PublicDoltHubQueryURL() = %q", got)
+	}
+}

internal/hosted/server.go

@@ -576,7 +576,7 @@ func (e *authError) Error() string { return e.msg }
 // not restart us for an upstream outage).
 func healthHandler() http.HandlerFunc {
 	client := &http.Client{Timeout: 3 * time.Second}
-	const probe = "https://www.dolthub.com/api/v1alpha1/hop/wl-commons/main?q=SELECT%201"
+	probe := PublicDoltHubQueryURL("SELECT 1")
 
 	return func(w http.ResponseWriter, _ *http.Request) {
 		dolthub := "ok"
@@ -608,8 +608,7 @@ var ProbeDoltHubToken = func(apiKey string) error {
 	if apiKey == "" {
 		return nil
 	}
-	req, err := http.NewRequest("GET",
-		"https://www.dolthub.com/api/v1alpha1/hop/wl-commons/main?q=SELECT%201", nil)
+	req, err := http.NewRequest("GET", PublicDoltHubQueryURL("SELECT 1"), nil)
 	if err != nil {
 		return nil // don't block connect for request construction errors
 	}