From 01099d975959ac514132714e0b94eb610afb7ab8 Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 11 Nov 2026 19:56:13 +0000 Subject: [PATCH] acc: clone a tiny repo in bundle/debug/fetch-repository-info POST /api/2.0/repos clones synchronously; cloning bundle-examples intermittently exceeded the 90s inactivity timeout, mostly on GCP. Co-authored-by: Isaac --- .../bundle/debug/fetch-repository-info/output.txt | 12 ++++++------ acceptance/bundle/debug/fetch-repository-info/script | 6 ++++-- .../bundle/debug/fetch-repository-info/test.toml | 5 +++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/acceptance/bundle/debug/fetch-repository-info/output.txt b/acceptance/bundle/debug/fetch-repository-info/output.txt index 2c4a60db972..ea7dc96bccf 100644 --- a/acceptance/bundle/debug/fetch-repository-info/output.txt +++ b/acceptance/bundle/debug/fetch-repository-info/output.txt @@ -4,9 +4,9 @@ >>> [CLI] bundle debug fetch-repository-info --path /Workspace/Repos/[USERNAME]/test-repo-[UNIQUE_NAME] { "worktree_root": "/Workspace/Repos/[USERNAME]/test-repo-[UNIQUE_NAME]", - "current_branch": "main", + "current_branch": "[BRANCH]", "latest_commit": "[COMMIT_SHA]", - "origin_url": "https://github.com/databricks/bundle-examples" + "origin_url": "https://github.com/databricks/databricks-empty-ide-project" } === a subdirectory of it, which resolves to the same root @@ -14,9 +14,9 @@ >>> [CLI] bundle debug fetch-repository-info --path /Workspace/Repos/[USERNAME]/test-repo-[UNIQUE_NAME]/subdir { "worktree_root": "/Workspace/Repos/[USERNAME]/test-repo-[UNIQUE_NAME]", - "current_branch": "main", + "current_branch": "[BRANCH]", "latest_commit": "[COMMIT_SHA]", - "origin_url": "https://github.com/databricks/bundle-examples" + "origin_url": "https://github.com/databricks/databricks-empty-ide-project" } === the root of a Git folder outside /Repos @@ -24,9 +24,9 @@ >>> [CLI] bundle debug fetch-repository-info --path /Workspace/Users/[USERNAME]/test-folder-[UNIQUE_NAME] { "worktree_root": "/Workspace/Users/[USERNAME]/test-folder-[UNIQUE_NAME]", - "current_branch": "main", + "current_branch": "[BRANCH]", "latest_commit": "[COMMIT_SHA]", - "origin_url": "https://github.com/databricks/bundle-examples" + "origin_url": "https://github.com/databricks/databricks-empty-ide-project" } === a path in no Git folder at all diff --git a/acceptance/bundle/debug/fetch-repository-info/script b/acceptance/bundle/debug/fetch-repository-info/script index abe6ff9e072..8db80c1c28f 100644 --- a/acceptance/bundle/debug/fetch-repository-info/script +++ b/acceptance/bundle/debug/fetch-repository-info/script @@ -1,5 +1,7 @@ -# The fake workspace reports "main", which is this repo's default branch too. -url=https://github.com/databricks/bundle-examples +# A tiny repo: Repos clones synchronously inside POST /api/2.0/repos, and +# cloning a larger one (bundle-examples) intermittently exceeded the client's +# 90s inactivity timeout, mostly on GCP. +url=https://github.com/databricks/databricks-empty-ide-project # A Git folder under /Repos and one outside it. Once a Git folder has Git CLI # access the workspace API reports no git metadata for it, so both resolve diff --git a/acceptance/bundle/debug/fetch-repository-info/test.toml b/acceptance/bundle/debug/fetch-repository-info/test.toml index 057e7be73f6..b7bbc71e585 100644 --- a/acceptance/bundle/debug/fetch-repository-info/test.toml +++ b/acceptance/bundle/debug/fetch-repository-info/test.toml @@ -10,3 +10,8 @@ Env.MSYS_NO_PATHCONV = "1" [[Repls]] Old = '\b[0-9a-f]{40}\b' New = '[COMMIT_SHA]' + +# The fake workspace reports "main"; the real repo's default branch is "ide". +[[Repls]] +Old = '"current_branch": "(main|ide)"' +New = '"current_branch": "[BRANCH]"'