Merge branch 'main' into samikshya-chand_data/discoveryUrl

Author: samikshya-db

NEXT_CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### Bug Fixes
 
+* Fixed `selectSparkVersion()` method to use contains() instead of equals() for spark version matching.
+
 ### Documentation
 
 ### Internal Changes

databricks-sdk-java/src/main/java/com/databricks/sdk/mixin/ClustersExt.java

@@ -50,7 +50,7 @@ public String selectSparkVersion(SparkVersionSelector selector) throws IllegalAr
         matches = version.getName().contains("LTS") || version.getKey().contains("-esr-");
       }
       if (matches && selector.sparkVersion != null) {
-        matches = ("Apache Spark " + selector.sparkVersion).equals(version.getName());
+        matches = version.getName().contains("Apache Spark " + selector.sparkVersion);
       }
       if (matches) {
         versions.add(version.getKey());

databricks-sdk-java/src/test/java/com/databricks/sdk/integration/EncryptionKeysIT.java

@@ -1,23 +1,24 @@
 package com.databricks.sdk.integration;
 
+import com.databricks.sdk.AccountClient;
+import com.databricks.sdk.integration.framework.CollectionUtils;
 import com.databricks.sdk.integration.framework.EnvContext;
 import com.databricks.sdk.integration.framework.EnvTest;
+import com.databricks.sdk.service.provisioning.CustomerManagedKey;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 @EnvContext("account")
 @DisabledIfEnvironmentVariable(named = "ARM_CLIENT_ID", matches = ".*")
 @ExtendWith(EnvTest.class)
 public class EncryptionKeysIT {
-  // TODO: Enable this test when the test account is updated to support this.
-  // Either by upgrading the test account tier to Enterprise or by adding this
-  // feature to the test account.
-  // @Test
-  // void lists(AccountClient a) {
-  //   Iterable<CustomerManagedKey> list = a.encryptionKeys().list();
+  @Test
+  void lists(AccountClient a) {
+    Iterable<CustomerManagedKey> list = a.encryptionKeys().list();
 
-  //   java.util.List<CustomerManagedKey> all = CollectionUtils.asList(list);
+    java.util.List<CustomerManagedKey> all = CollectionUtils.asList(list);
 
-  //   CollectionUtils.assertUnique(all);
-  // }
+    CollectionUtils.assertUnique(all);
+  }
 }

databricks-sdk-java/src/test/java/com/databricks/sdk/mixin/ClustersExtTest.java

@@ -118,4 +118,29 @@ void nullComparisonTest() {
     String nodeType = clustersExt.selectNodeType(new NodeTypeSelector().withLocalDisk());
     assertEquals("testId1", nodeType);
   }
+
+  private GetSparkVersionsResponse testGetSparkVersionsWithSparkVersion() {
+    Collection<SparkVersion> versions = new ArrayList<>();
+    // Mock realistic Databricks Runtime version based on actual API response format
+    // The key point: version name contains more than just "Apache Spark X.Y.Z"
+    versions.add(
+        new SparkVersion()
+            .setName("13.3 LTS (includes Apache Spark 3.4.1, Scala 2.12)")
+            .setKey("13.3.x-scala2.12"));
+    return new GetSparkVersionsResponse().setVersions(versions);
+  }
+
+  @Test
+  void sparkVersionWithSparkVersionParameter() {
+    ClustersExt clustersExt = new ClustersExt(clustersMock);
+    Mockito.doReturn(testGetSparkVersionsWithSparkVersion()).when(clustersMock).sparkVersions();
+
+    // Test that sparkVersion parameter works with realistic API response format
+    // This tests the contains() fix - the version name is "13.3 LTS (includes Apache Spark 3.4.1,
+    // Scala 2.12)"
+    // not just "Apache Spark 3.4.1", so equals() would fail but contains() works
+    String sparkVersion =
+        clustersExt.selectSparkVersion(new SparkVersionSelector().withSparkVersion("3.4.1"));
+    assertEquals("13.3.x-scala2.12", sparkVersion);
+  }
 }