namespaces: allow '+' in names (#2023)

Signed-off-by: Maciej Obuchowski <obuchowski.maciej@gmail.com>
MarquezProject · Jun 24, 2022 · 2783f4e · 2783f4e
1 parent f1645f9
commit 2783f4e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/api/src/main/java/marquez/common/models/NamespaceName.java b/api/src/main/java/marquez/common/models/NamespaceName.java
@@ -21,15 +21,15 @@ public final class NamespaceName {
   private static final int MIN_SIZE = 1;
   private static final int MAX_SIZE = 1024;
   private static final Pattern PATTERN =
-      Pattern.compile(String.format("^[a-zA-Z:;=/0-9_\\-\\.@]{%d,%d}$", MIN_SIZE, MAX_SIZE));
+      Pattern.compile(String.format("^[a-zA-Z:;=/0-9_\\-\\.@+]{%d,%d}$", MIN_SIZE, MAX_SIZE));
 
   @Getter private final String value;
 
   public NamespaceName(@NonNull final String value) {
     checkArgument(
         PATTERN.matcher(value).matches(),
         "namespace '%s' must contain only letters (a-z, A-Z), numbers (0-9), "
-            + "underscores (_), at (@), dashes (-), colons (:), equals (=), semicolons (;), slashes (/) "
+            + "underscores (_), at (@), plus (+), dashes (-), colons (:), equals (=), semicolons (;), slashes (/) "
             + "or dots (.) with a maximum length of %s characters.",
         value,
         MAX_SIZE);

diff --git a/api/src/main/java/marquez/db/OpenLineageDao.java b/api/src/main/java/marquez/db/OpenLineageDao.java
@@ -411,7 +411,7 @@ default String getUrlOrNull(String uri) {
   }
 
   default String formatNamespaceName(String namespace) {
-    return namespace.replaceAll("[^a-z:/A-Z0-9\\-_.@]", "_");
+    return namespace.replaceAll("[^a-z:/A-Z0-9\\-_.@+]", "_");
   }
 
   default JobType getJobType(Job job) {

diff --git a/api/src/test/java/marquez/common/models/NamespaceNameTest.java b/api/src/test/java/marquez/common/models/NamespaceNameTest.java
@@ -19,7 +19,8 @@ public class NamespaceNameTest {
         "sqlserver://synapse-test-test001.sql.azuresynapse.net;databaseName=TESTPOOL1;",
         "\u003D",
         "@",
-        "abfss://something@.something-else.core.windows.net"
+        "abfss://something@.something-else.core.windows.net",
+        "databricks+connector://asdf-123456-7890.cloud.databricks.com"
       })
   void testValidNamespaceName(String name) {
     assertThat(NamespaceName.of(name).getValue()).isEqualTo(name);