Properly read Git metadata when running inside workspace by denik · Pull Request #1945 · databricks/cli

denik · 2024-11-29T10:05:09Z

Changes

Since there is no .git directory in Workspace file system, we need to make an API call to api/2.0/workspace/get-status?return_git_info=true to fetch git the root of the repo, current branch, commit and origin.

Added new function FetchRepositoryInfo that either looks up and parses .git or calls remote API depending on env.

Refactor Repository/View/FileSet to accept repository root rather than calculate it. This helps because:

Repository is currently created in multiple places and finding the repository root is becoming relatively expensive (API call needed).
Repository/FileSet/View do not have access to current Bundle which is where WorkplaceClient is stored.

Tests

Tested manually by running "bundle validate --json" inside web terminal within Databricks env.
Added integration tests for the new API.

andrewnester

Approved but please take a look at integration tests failures on Windows before merging

It seems that because vfs.Path does filepath.Abs (OS-specific) transformation that mangles the path even when it's already in good state, e.g. /Workspace/Something and that causes the tests to fail on Windows.

pietern · 2024-12-04T11:03:38Z

These are minor comments. Core of the PR LGTM!

Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>

github-actions · 2024-12-05T08:53:15Z

If integration tests don't run automatically, an authorized user can run them manually by following the instructions below:

Trigger:
go/deco-tests-run/cli

Inputs:

PR number: 1945
Commit SHA: 43da63bc50fd4f5a9b9da515db83ecd9249cdfe3

Checks will be approved automatically on success.

eng-dev-ecosystem-bot · 2024-12-05T08:53:45Z

Test Details: go/deco-tests/12176323188

denik temporarily deployed to test-trigger-is November 29, 2024 10:05 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is November 29, 2024 11:03 — with GitHub Actions Inactive

denik changed the base branch from main to DECO-24125--move-git-load-to-initializeNovember 29, 2024 11:51

denik marked this pull request as ready for review November 29, 2024 11:52

denik requested review from andrewnester, ilia-db, pietern and shreyas-goenka November 29, 2024 11:52

andrewnester reviewed Nov 29, 2024
View reviewed changes

Comment threadlibs/git/view.go

denik temporarily deployed to test-trigger-is November 29, 2024 16:44 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is November 29, 2024 16:45 — with GitHub Actions Inactive

denik force-pushed the DECO-24125--move-git-load-to-initialize branch from 17f284e to 84d535aCompare December 1, 2024 20:28

denik force-pushed the DECO-24125--fetch-git-details branch from 8729c19 to 05ff508Compare December 1, 2024 20:30

denik temporarily deployed to test-trigger-is December 1, 2024 20:30 — with GitHub Actions Inactive

shreyas-goenka reviewed Dec 1, 2024
View reviewed changes

Comment threadbundle/bundle.go Outdated
Comment threadbundle/config/mutator/load_git_details.go
Comment threadlibs/git/fileset.go Outdated
Comment threadlibs/git/info.go
Comment threadlibs/git/info.go Outdated
Comment threadlibs/git/view.go

Base automatically changed from DECO-24125--move-git-load-to-initialize to mainDecember 2, 2024 09:54

denik force-pushed the DECO-24125--fetch-git-details branch from 05ff508 to c3b02d9Compare December 2, 2024 10:29

denik temporarily deployed to test-trigger-is December 2, 2024 10:29 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 2, 2024 10:30 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 2, 2024 10:31 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 2, 2024 10:50 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 2, 2024 14:02 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 2, 2024 14:45 — with GitHub Actions Inactive

denik temporarily deployed to test-trigger-is December 3, 2024 08:53 — with GitHub Actions Inactive

denik requested a review from pietern December 3, 2024 08:53

andrewnester reviewed Dec 3, 2024
View reviewed changes

Comment threadinternal/git_fetch_test.go
Comment threadinternal/git_fetch_test.go Outdated

andrewnester approved these changes Dec 3, 2024
View reviewed changes

Switch to string from vfs.Path in the signature
a623cfd
It seems that because vfs.Path does filepath.Abs (OS-specific) transformation that mangles the path even when it's already in good state, e.g. /Workspace/Something and that causes the tests to fail on Windows.

denik temporarily deployed to test-trigger-is December 3, 2024 11:48 — with GitHub Actions Inactive

pietern reviewed Dec 4, 2024
View reviewed changes

s/.git/[leafName]
d0b088a
Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>

denik temporarily deployed to test-trigger-is December 4, 2024 11:13 — with GitHub Actions Inactive

clean up comment
5131488

denik temporarily deployed to test-trigger-is December 4, 2024 11:18 — with GitHub Actions Inactive

clean up GuessedWorktreeRoot field; let the caller do the guessing
1c3f5f2

denik temporarily deployed to test-trigger-is December 4, 2024 11:35 — with GitHub Actions Inactive

denik added 3 commits December 4, 2024 14:07

don't use result in case of an error
2d3ee18

s/GitRepositoryInfo/RepositoryInfo
a689396

use Join instead of +
a064d91

pietern approved these changes Dec 5, 2024
View reviewed changes

Comment threadcmd/sync/sync.go Outdated

lowercase variable
43da63b

denik mentioned this pull request Dec 5, 2024
Switch to folders.FindDirWithLeaf#1963
Merged

pietern mentioned this pull request Dec 5, 2024
[Release] Release v0.236.0 #1966
Merged

This was referenced Jan 20, 2025
Add acceptance for test for sync.paths equal to two dots #2196
Merged
Set WorktreeRoot to sync root outside git repo #2197
Merged

Uh oh!

Conversation

denik commented Nov 29, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Tests

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andrewnester left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pietern commented Dec 4, 2024

Uh oh!

Uh oh!

github-actionsBot commented Dec 5, 2024

Uh oh!

eng-dev-ecosystem-bot commented Dec 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

denik commented Nov 29, 2024•
edited
Loading