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.

Sign up for GitHub

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 for regression deploying resources with PyPi and Maven library types #2341

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Fix for regression deploying resources with PyPi and Maven library types #2341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions acceptance/bundle/artifacts/same_name_libraries/databricks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ resources:
package_name: my_default_python
libraries:
- whl: ./whl1/dist/*.whl
- pypi:
package: test_package
- task_key: task2
new_cluster: ${var.cluster}
python_wheel_task:
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/artifacts/same_name_libraries/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Error: Duplicate local library name my_default_python-0.0.1-py3-none-any.whl
at resources.jobs.test.tasks[0].libraries[0].whl
resources.jobs.test.tasks[1].libraries[0].whl
in databricks.yml:36:15
databricks.yml:43:15
databricks.yml:45:15

Local library names must be unique

Expand Down
11 changes: 8 additions & 3 deletions bundle/libraries/same_name_libraries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ func (c checkForSameNameLibraries) Apply(ctx context.Context, b *bundle.Bundle)
var err error
for _, pattern := range patterns {
v, err = dyn.MapByPattern(v, pattern, func(p dyn.Path, lv dyn.Value) (dyn.Value, error) {
libPath := lv.MustString()
libFullPath, ok := lv.AsString()
// If the value is not a string, skip the check because it's not whl or jar type which defines the library
// as a string versus PyPi or Maven which defines the library as a map.
if !ok {
return v, nil
}

// If not local library, skip the check
if !IsLibraryLocal(libPath) {
if !IsLibraryLocal(libFullPath) {
return lv, nil
}

libFullPath := lv.MustString()
lib := filepath.Base(libFullPath)
// If the same basename was seen already but full path is different
// then it's a duplicate. Add the location to the location list.
Expand Down