feat: better error message if scheme forgotten in CLI *_BASE_URL/--base-url

Author: stainless-app[bot]

cmd/beeper-desktop-cli/main.go

@@ -23,6 +23,13 @@ func main() {
 		prepareForAutocomplete(app)
 	}
 
+	if baseURL, ok := os.LookupEnv("BEEPER_DESKTOP_BASE_URL"); ok {
+		if err := cmd.ValidateBaseURL(baseURL, "BEEPER_DESKTOP_BASE_URL"); err != nil {
+			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
+			os.Exit(1)
+		}
+	}
+
 	if err := app.Run(context.Background(), os.Args); err != nil {
 		exitCode := 1
 

pkg/cmd/cmd.go

@@ -39,6 +39,9 @@ func init() {
 				Name:        "base-url",
 				DefaultText: "url",
 				Usage:       "Override the base URL for API requests",
+				Validator: func(baseURL string) error {
+					return ValidateBaseURL(baseURL, "--base-url")
+				},
 			},
 			&cli.StringFlag{
 				Name:  "format",

pkg/cmd/cmdutil.go

@@ -29,6 +29,15 @@ import (
 
 var OutputFormats = []string{"auto", "explore", "json", "jsonl", "pretty", "raw", "yaml"}
 
+// ValidateBaseURL checks that a base URL is correctly prefixed with a protocol scheme and produces a better
+// error message than the person would see otherwise if it doesn't.
+func ValidateBaseURL(value, source string) error {
+	if value != "" && !strings.HasPrefix(value, "http://") && !strings.HasPrefix(value, "https://") {
+		return fmt.Errorf("%s %q is missing a scheme (expected http:// or https://)", source, value)
+	}
+	return nil
+}
+
 func getDefaultRequestOptions(cmd *cli.Command) []option.RequestOption {
 	opts := []option.RequestOption{
 		option.WithHeader("User-Agent", fmt.Sprintf("BeeperDesktop/CLI %s", Version)),

pkg/cmd/cmdutil_test.go

@@ -125,3 +125,42 @@ func TestCreateDownloadFile(t *testing.T) {
 		assert.Equal(t, "passwd", filepath.Base(file.Name()))
 	})
 }
+
+func TestValidateBaseURL(t *testing.T) {
+	t.Parallel()
+
+	t.Run("ValidHTTPS", func(t *testing.T) {
+		t.Parallel()
+
+		require.NoError(t, ValidateBaseURL("https://api.example.com", "--base-url"))
+	})
+
+	t.Run("ValidHTTP", func(t *testing.T) {
+		t.Parallel()
+
+		require.NoError(t, ValidateBaseURL("http://localhost:8080", "--base-url"))
+	})
+
+	t.Run("Empty", func(t *testing.T) {
+		t.Parallel()
+
+		require.NoError(t, ValidateBaseURL("", "MY_BASE_URL"))
+	})
+
+	t.Run("MissingScheme", func(t *testing.T) {
+		t.Parallel()
+
+		err := ValidateBaseURL("localhost:8080", "MY_BASE_URL")
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "MY_BASE_URL")
+		assert.Contains(t, err.Error(), "missing a scheme")
+	})
+
+	t.Run("HostOnly", func(t *testing.T) {
+		t.Parallel()
+
+		err := ValidateBaseURL("api.example.com", "--base-url")
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "--base-url")
+	})
+}