Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows style file paths in fs cp command #1118

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Conversation

shreyas-goenka
Copy link
Contributor

@shreyas-goenka shreyas-goenka commented Jan 11, 2024

Changes

Copying a local file in windows to remote directory in DBFS would fail if the path was specified as a windows style path (compared to a UNIX style path). This PR fixes that.

Note, UNIX style paths will continue to work because filepath.Base respects both / and \ as file separators. See: IsPathSeparator in https://go.dev/src/os/path_windows.go.

Fixes issue: #1109.

Tests

Integration test and manually

C:\Users\shreyas.goenka>Desktop\cli.exe fs cp .\Desktop\foo.txt dbfs:/Users/shreyas.goenka@databricks.com
.\Desktop\foo.txt -> dbfs:/Users/shreyas.goenka@databricks.com/foo.txt

C:\Users\shreyas.goenka>Desktop\cli.exe fs cat  dbfs:/Users/shreyas.goenka@databricks.com/foo.txt
hello, world

@codecov-commenter
Copy link

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (7dcdadd) 49.24% compared to head (c61706d) 49.18%.

Files Patch % Lines
cmd/fs/cp.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1118      +/-   ##
==========================================
- Coverage   49.24%   49.18%   -0.06%     
==========================================
  Files         273      273              
  Lines       10570    10570              
==========================================
- Hits         5205     5199       -6     
- Misses       4810     4815       +5     
- Partials      555      556       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shreyas-goenka shreyas-goenka changed the title Fix fs cp command when a windows path is used for the source file Fix windows style local file paths in fs cp command Jan 11, 2024
@shreyas-goenka shreyas-goenka changed the title Fix windows style local file paths in fs cp command Fix allowing windows style file paths in fs cp command Jan 11, 2024
@shreyas-goenka shreyas-goenka changed the title Fix allowing windows style file paths in fs cp command Fix windows style file paths in fs cp command Jan 11, 2024
@shreyas-goenka shreyas-goenka added this pull request to the merge queue Jan 11, 2024
Merged via the queue into main with commit 2c0d067 Jan 11, 2024
4 checks passed
@shreyas-goenka shreyas-goenka deleted the fix-fs-cp-windows branch January 11, 2024 18:55
andrewnester added a commit that referenced this pull request Jan 17, 2024
CLI:
 * Fix windows style file paths in fs cp command ([#1118](#1118)).
 * Do not require positional arguments if they should be provided in JSON ([#1125](#1125)).
 * Always require path parameters as positional arguments ([#1129](#1129)).

Bundles:
 * Add debug log line for when bundle init is run from non-TTY interface ([#1117](#1117)).
 * Added `databricks bundle generate job` command ([#1043](#1043)).
 * Support passing job parameters to bundle run ([#1115](#1115)).

Dependency updates:
 * Bump golang.org/x/oauth2 from 0.15.0 to 0.16.0 ([#1124](#1124)).
@andrewnester andrewnester mentioned this pull request Jan 17, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jan 17, 2024
CLI:
* Fix windows style file paths in fs cp command
([#1118](#1118)).
* Do not require positional arguments if they should be provided in JSON
([#1125](#1125)).
* Always require path parameters as positional arguments
([#1129](#1129)).

Bundles:
* Add debug log line for when bundle init is run from non-TTY interface
([#1117](#1117)).
* Added `databricks bundle generate job` command
([#1043](#1043)).
* Support passing job parameters to bundle run
([#1115](#1115)).

Dependency updates:
* Bump golang.org/x/oauth2 from 0.15.0 to 0.16.0
([#1124](#1124)).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants