Bake staging dashboard URL into CLI releases

Author: Snowy7

.github/workflows/release-macos-cli.yml

@@ -16,6 +16,7 @@ permissions:
 
 env:
   BINDHUB_DEFAULT_API_URL: https://staging-api.bindhub.dev/
+  BINDHUB_DEFAULT_WEB_URL: https://app-staging.bindhub.com
 
 jobs:
   macos-cli:
@@ -58,6 +59,6 @@ jobs:
             esac
             gh release create "$RELEASE_TAG" "${assets[@]}" \
               --title "Bindhub CLI $RELEASE_TAG" \
-              --notes "Alpha command-line tools for Loom and Bindhub. The default API is https://staging-api.bindhub.dev/. OAuth, signed installers, and production hardening are not included yet." \
+              --notes "Alpha command-line tools for Loom and Bindhub. The default API is https://staging-api.bindhub.dev/ and browser login opens https://app-staging.bindhub.com. OAuth, signed installers, and production hardening are not included yet." \
               "${flags[@]}"
           fi

README.md

@@ -151,7 +151,8 @@ bindhub pause|resume|unlink [name]
 
 Packaged builds can bake in the Bindhub API endpoint. Local/dev builds default to
 `http://127.0.0.1:8787`, and operators can override that with `bindhub login --api <URL>` or
-`BINDHUB_API_URL=<URL>`.
+`BINDHUB_API_URL=<URL>`. Browser login uses the packaged dashboard URL, or `--web <URL>` /
+`BINDHUB_WEB_URL=<URL>` when overriding it locally.
 
 To remove the generated workspace after a passing run:
 

bindhub/crates/bindhub-cli/src/product.rs

@@ -2152,7 +2152,10 @@ fn default_api_url() -> String {
 }
 
 fn default_web_url() -> String {
-    std::env::var(WEB_URL_ENV).unwrap_or_else(|_| LOCAL_DEV_WEB_URL.to_string())
+    std::env::var(WEB_URL_ENV)
+        .ok()
+        .or_else(|| option_env!("BINDHUB_DEFAULT_WEB_URL").map(ToString::to_string))
+        .unwrap_or_else(|| LOCAL_DEV_WEB_URL.to_string())
 }
 
 fn update_installer_url(repo: &str, installer: &str) -> String {

scripts/install-bindhub.sh

@@ -18,7 +18,8 @@ detect_target() {
 
 latest_tag() {
   curl_github "https://api.github.com/repos/$repo/releases" \
-    | sed -n 's/.*"tag_name": "\(v[^"]*\)".*/\1/p' \
+    | tr ',' '\n' \
+    | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\(v[^"]*\)".*/\1/p' \
     | head -n 1
 }
 
@@ -42,18 +43,7 @@ curl_github_asset() {
 
 asset_url() {
   asset_name="$1"
-  curl_github "https://api.github.com/repos/$repo/releases/tags/$tag" \
-    | awk -v name="$asset_name" '
-      /"url":/ {
-        url=$0
-        sub(/^[[:space:]]*"url": "/, "", url)
-        sub(/",?$/, "", url)
-      }
-      /"name":/ && index($0, "\"" name "\"") {
-        print url
-        exit
-      }
-    '
+  printf 'https://github.com/%s/releases/download/%s/%s\n' "$repo" "$tag" "$asset_name"
 }
 
 add_path_hint() {

scripts/package-cli.ps1

@@ -2,6 +2,7 @@ param(
     [string]$Version = "",
     [string]$Target = "x86_64-pc-windows-msvc",
     [string]$ApiUrl = "",
+    [string]$WebUrl = "",
     [switch]$SkipBuild
 )
 
@@ -17,6 +18,13 @@ if (-not $ApiUrl) {
         "https://staging-api.bindhub.dev/"
     }
 }
+if (-not $WebUrl) {
+    $WebUrl = if ($env:BINDHUB_DEFAULT_WEB_URL) {
+        $env:BINDHUB_DEFAULT_WEB_URL
+    } else {
+        "https://app-staging.bindhub.com"
+    }
+}
 
 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
 Set-Location $RepoRoot
@@ -36,8 +44,10 @@ New-Item -ItemType Directory -Force -Path $StageDir | Out-Null
 New-Item -ItemType Directory -Force -Path $DistDir | Out-Null
 
 $previousApiUrl = $env:BINDHUB_DEFAULT_API_URL
+$previousWebUrl = $env:BINDHUB_DEFAULT_WEB_URL
 try {
     $env:BINDHUB_DEFAULT_API_URL = $ApiUrl
+    $env:BINDHUB_DEFAULT_WEB_URL = $WebUrl
     if (-not $SkipBuild) {
         rustup target add $Target
         cargo build --release --locked `
@@ -49,6 +59,7 @@ try {
     }
 } finally {
     $env:BINDHUB_DEFAULT_API_URL = $previousApiUrl
+    $env:BINDHUB_DEFAULT_WEB_URL = $previousWebUrl
 }
 
 $ReleaseDir = Join-Path $RepoRoot "target\$Target\release"
@@ -64,6 +75,7 @@ Copy-Item -Force -Path (Join-Path $RepoRoot "LICENSE") -Destination (Join-Path $
 # Packaged production builds should already know the Bindhub API endpoint.
 
 # BINDHUB_API_URL=https://staging-api.bindhub.dev/
+# BINDHUB_WEB_URL=https://app-staging.bindhub.com
 BINDHUB_CONFIG_DIR=.bindhub
 "@ | Set-Content -Encoding UTF8 -Path (Join-Path $StageDir ".env.example")
 

scripts/package-cli.sh

@@ -10,6 +10,7 @@ Builds and packages Bindhub alpha command-line tools for the current macOS/Linux
 Environment:
   BINDHUB_RELEASE_TARGET   Optional Rust target triple.
   BINDHUB_DEFAULT_API_URL  Optional default Bindhub API URL baked into the CLI.
+  BINDHUB_DEFAULT_WEB_URL  Optional default Bindhub dashboard URL baked into the CLI.
 
 Examples:
   scripts/package-cli.sh v0.1.0-alpha.1
@@ -28,6 +29,7 @@ cd "$repo_root"
 version="${1:-$(git rev-parse --short HEAD)}"
 target="${BINDHUB_RELEASE_TARGET:-}"
 export BINDHUB_DEFAULT_API_URL="${BINDHUB_DEFAULT_API_URL:-https://staging-api.bindhub.dev/}"
+export BINDHUB_DEFAULT_WEB_URL="${BINDHUB_DEFAULT_WEB_URL:-https://app-staging.bindhub.com}"
 
 if [[ -z "$target" ]]; then
   os="$(uname -s)"
@@ -87,6 +89,7 @@ cat > "$stage_dir/.env.example" <<'ENV'
 # Packaged production builds should already know the Bindhub API endpoint.
 
 # BINDHUB_API_URL=https://staging-api.bindhub.dev/
+# BINDHUB_WEB_URL=https://app-staging.bindhub.com
 BINDHUB_CONFIG_DIR=.bindhub
 ENV
 cp "$repo_root/.env.example" "$stage_dir/.env.operator.example"

scripts/publish-cli-release.ps1

@@ -1,7 +1,8 @@
 param(
     [Parameter(Mandatory = $true)]
     [string]$Tag,
-    [string]$ApiUrl = ""
+    [string]$ApiUrl = "",
+    [string]$WebUrl = ""
 )
 
 $ErrorActionPreference = "Stop"
@@ -13,6 +14,13 @@ if (-not $ApiUrl) {
         "https://staging-api.bindhub.dev/"
     }
 }
+if (-not $WebUrl) {
+    $WebUrl = if ($env:BINDHUB_DEFAULT_WEB_URL) {
+        $env:BINDHUB_DEFAULT_WEB_URL
+    } else {
+        "https://app-staging.bindhub.com"
+    }
+}
 
 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
 Set-Location $RepoRoot
@@ -31,7 +39,7 @@ if ($LASTEXITCODE -ne 0) {
 
 git push origin $Tag
 
-& "$PSScriptRoot\package-cli.ps1" -Version $Tag -ApiUrl $ApiUrl
+& "$PSScriptRoot\package-cli.ps1" -Version $Tag -ApiUrl $ApiUrl -WebUrl $WebUrl
 
 $Assets = @(
     Join-Path $RepoRoot "dist\bindhub-$Tag-x86_64-pc-windows-msvc.zip"
@@ -60,7 +68,7 @@ if ($ReleaseExists) {
         "release", "create", $Tag
     ) + $Assets + @(
         "--title", "Bindhub CLI $Tag",
-        "--notes", "Alpha command-line tools for Loom and Bindhub. The default API is https://staging-api.bindhub.dev/. OAuth, signed installers, and production hardening are not included yet."
+        "--notes", "Alpha command-line tools for Loom and Bindhub. The default API is https://staging-api.bindhub.dev/ and browser login opens https://app-staging.bindhub.com. OAuth, signed installers, and production hardening are not included yet."
     )
     if ($Tag.Contains("-")) {
         $ghArgs += "--prerelease"