review

Author: adutra

polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/RootCredentialsSet.java

@@ -18,6 +18,8 @@
  */
 package org.apache.polaris.core.persistence.bootstrap;
 
+import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -110,6 +112,9 @@ static RootCredentialsSet fromList(List<String> credentialsList) {
    * # etc.
    * </pre>
    *
+   * Multiple YAMl documents are also supported; all documents will be merged into a single set of
+   * credentials.
+   *
    * <p>The expected JSON format is:
    *
    * <pre>
@@ -126,9 +131,15 @@ static RootCredentialsSet fromList(List<String> credentialsList) {
    * </pre>
    */
   static RootCredentialsSet fromUrl(URL url) {
-    try {
-      ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-      return mapper.readValue(url, RootCredentialsSet.class);
+    YAMLFactory factory = new YAMLFactory();
+    ObjectMapper mapper = new ObjectMapper(factory).configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+    try (var parser = factory.createParser(url)) {
+      var values = mapper.readValues(parser, RootCredentialsSet.class);
+      var builder = ImmutableRootCredentialsSet.builder();
+      while (values.hasNext()) {
+        builder.putAllCredentials(values.next().credentials());
+      }
+      return builder.build();
     } catch (Exception e) {
       throw new IllegalArgumentException("Failed to read credentials file: " + url, e);
     }

polaris-core/src/test/java/org/apache/polaris/core/persistence/bootstrap/RootCredentialsSetTest.java

@@ -90,25 +90,21 @@ void getSecretsValidSystemProperty() {
 
   @Test
   void getSecretsValidJson() {
-    URL resource =
-        getClass().getResource("/org/apache/polaris/core/persistence/bootstrap/credentials.json");
+    URL resource = getClass().getResource("credentials.json");
     RootCredentialsSet set = RootCredentialsSet.fromUrl(resource);
     assertCredentials(set);
   }
 
   @Test
   void getSecretsValidYaml() {
-    URL resource =
-        getClass().getResource("/org/apache/polaris/core/persistence/bootstrap/credentials.yaml");
+    URL resource = getClass().getResource("credentials.yaml");
     RootCredentialsSet set = RootCredentialsSet.fromUrl(resource);
     assertCredentials(set);
   }
 
   @Test
   void getSecretsInvalidJson() {
-    URL resource =
-        getClass()
-            .getResource("/org/apache/polaris/core/persistence/bootstrap/credentials-invalid.json");
+    URL resource = getClass().getResource("credentials-invalid.json");
     assertThatThrownBy(() -> RootCredentialsSet.fromUrl(resource))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Failed to read credentials file")
@@ -120,9 +116,7 @@ void getSecretsInvalidJson() {
 
   @Test
   void getSecretsInvalidYaml() {
-    URL resource =
-        getClass()
-            .getResource("/org/apache/polaris/core/persistence/bootstrap/credentials-invalid.yaml");
+    URL resource = getClass().getResource("credentials-invalid.yaml");
     assertThatThrownBy(() -> RootCredentialsSet.fromUrl(resource))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Failed to read credentials file")

polaris-core/src/test/resources/org/apache/polaris/core/persistence/bootstrap/credentials.json

@@ -5,6 +5,7 @@
   },
   "realm2": {
     "client-id": "client2",
-    "client-secret": "secret2"
+    "client-secret": "secret2",
+    "extra-field": "extra-value"
   }
 }

polaris-core/src/test/resources/org/apache/polaris/core/persistence/bootstrap/credentials.yaml

@@ -20,6 +20,8 @@
 realm1:
   client-id: client1
   client-secret: secret1
+---
 realm2:
   client-id: client2
-  client-secret: secret2
+  client-secret: secret2
+  extra-field: extra-value

quarkus/admin/src/test/java/org/apache/polaris/admintool/BootstrapCommandTest.java

@@ -35,10 +35,10 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.Objects;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 @QuarkusMainTest
 @WithTestResource(
@@ -51,9 +51,9 @@ class BootstrapCommandTest {
   private static Path yaml;
 
   @BeforeAll
-  static void prepareFiles() throws IOException {
-    json = copyResource("/org/apache/polaris/admintool/credentials.json");
-    yaml = copyResource("/org/apache/polaris/admintool/credentials.yaml");
+  static void prepareFiles(@TempDir Path temp) throws IOException {
+    json = copyResource(temp, "credentials.json");
+    yaml = copyResource(temp, "credentials.yaml");
   }
 
   @Test
@@ -132,13 +132,12 @@ public void testBootstrapFromInvalidFile(QuarkusMainLauncher launcher) {
         .contains("Bootstrap encountered errors during operation.");
   }
 
-  private static Path copyResource(String resource) throws IOException {
-    URL jsonSource = Objects.requireNonNull(BootstrapCommandTest.class.getResource(resource));
-    Path file = Files.createTempFile("credentials", "tmp");
-    file.toFile().deleteOnExit();
-    try (InputStream is = jsonSource.openStream()) {
-      Files.copy(is, file, StandardCopyOption.REPLACE_EXISTING);
+  private static Path copyResource(Path temp, String resource) throws IOException {
+    URL source = Objects.requireNonNull(BootstrapCommandTest.class.getResource(resource));
+    Path dest = temp.resolve(resource);
+    try (InputStream in = source.openStream()) {
+      Files.copy(in, dest);
     }
-    return file;
+    return dest;
   }
 }