From ac439f8c1a60f7b5dd046caa88ad3ed93d9e0c51 Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Wed, 12 Feb 2025 16:14:30 +0000
Subject: [PATCH] Fix for regression deploying resources with PyPi and Maven
 library types (#2341)

## Changes

The CheckForSameNameLibraries mutator incorrectly assumed all resource
libraries define libraries as paths of the `string` type, but some
libraries, such as PyPi and Maven, define them as objects.

This PR addresses this issue. It was introduced in #2297.

## Tests

Added regression test.
---
 .../artifacts/same_name_libraries/databricks.yml      |  2 ++
 .../bundle/artifacts/same_name_libraries/output.txt   |  2 +-
 bundle/libraries/same_name_libraries.go               | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/acceptance/bundle/artifacts/same_name_libraries/databricks.yml b/acceptance/bundle/artifacts/same_name_libraries/databricks.yml
index a065bae76..837cd01e8 100644
--- a/acceptance/bundle/artifacts/same_name_libraries/databricks.yml
+++ b/acceptance/bundle/artifacts/same_name_libraries/databricks.yml
@@ -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:
diff --git a/acceptance/bundle/artifacts/same_name_libraries/output.txt b/acceptance/bundle/artifacts/same_name_libraries/output.txt
index 38cdd43c4..1253d9680 100644
--- a/acceptance/bundle/artifacts/same_name_libraries/output.txt
+++ b/acceptance/bundle/artifacts/same_name_libraries/output.txt
@@ -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
 
diff --git a/bundle/libraries/same_name_libraries.go b/bundle/libraries/same_name_libraries.go
index 88b96ab54..8de34cfec 100644
--- a/bundle/libraries/same_name_libraries.go
+++ b/bundle/libraries/same_name_libraries.go
@@ -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.