From 2878c65ceb6e7df6ffb7b70b0869a234d9d0280b Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:32:33 -0600
Subject: [PATCH] =?UTF-8?q?fix(structuredProps)=20Add=20validation=20that?=
 =?UTF-8?q?=20ID=20and=20qualifiedName=20have=20no=E2=80=A6=20(#11930)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PropertyDefinitionValidator.java          | 19 ++++++++++
 .../PropertyDefinitionValidatorTest.java      | 36 +++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java b/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
index ae5472af62..6e047c12da 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/structuredproperties/validation/PropertyDefinitionValidator.java
@@ -89,6 +89,9 @@ public class PropertyDefinitionValidator extends AspectPayloadValidator {
           item.getAspect(StructuredPropertyDefinition.class);
 
       versionFormatCheck(item, newDefinition.getVersion()).ifPresent(exceptions::addException);
+      urnIdCheck(item).ifPresent(exceptions::addException);
+      qualifiedNameCheck(item, newDefinition.getQualifiedName())
+          .ifPresent(exceptions::addException);
 
       if (item.getPreviousSystemAspect() != null) {
 
@@ -192,4 +195,20 @@ public class PropertyDefinitionValidator extends AspectPayloadValidator {
     }
     return Optional.empty();
   }
+
+  private static Optional<AspectValidationException> urnIdCheck(MCPItem item) {
+    if (item.getUrn().getId().contains(" ")) {
+      return Optional.of(AspectValidationException.forItem(item, "Urn ID cannot have spaces"));
+    }
+    return Optional.empty();
+  }
+
+  private static Optional<AspectValidationException> qualifiedNameCheck(
+      MCPItem item, @Nonnull String qualifiedName) {
+    if (qualifiedName.contains(" ")) {
+      return Optional.of(
+          AspectValidationException.forItem(item, "Qualified names cannot have spaces"));
+    }
+    return Optional.empty();
+  }
 }
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java b/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
index 2af731a511..18949f0566 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/structuredproperties/validators/PropertyDefinitionValidatorTest.java
@@ -397,4 +397,40 @@ public class PropertyDefinitionValidatorTest {
             .count(),
         0);
   }
+
+  @Test
+  public void testUrnIdWithSpace()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:test me out.foo.bar");
+    StructuredPropertyDefinition newProperty = new StructuredPropertyDefinition();
+    newProperty.setEntityTypes(new UrnArray(Urn.createFromString("urn:li:logicalEntity:dataset")));
+    newProperty.setDisplayName("oldProp");
+    newProperty.setQualifiedName("foo.bar");
+    newProperty.setCardinality(PropertyCardinality.MULTIPLE);
+    newProperty.setValueType(Urn.createFromString("urn:li:logicalType:STRING"));
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        1);
+  }
+
+  @Test
+  public void testQualifiedNameWithSpace()
+      throws URISyntaxException, CloneNotSupportedException, AspectValidationException {
+    Urn propertyUrn = UrnUtils.getUrn("urn:li:structuredProperty:foo.bar");
+    StructuredPropertyDefinition newProperty = new StructuredPropertyDefinition();
+    newProperty.setEntityTypes(new UrnArray(Urn.createFromString("urn:li:logicalEntity:dataset")));
+    newProperty.setDisplayName("oldProp");
+    newProperty.setQualifiedName("foo.bar with spaces");
+    newProperty.setCardinality(PropertyCardinality.MULTIPLE);
+    newProperty.setValueType(Urn.createFromString("urn:li:logicalType:STRING"));
+    assertEquals(
+        PropertyDefinitionValidator.validateDefinitionUpserts(
+                TestMCP.ofOneMCP(propertyUrn, null, newProperty, entityRegistry),
+                mockRetrieverContext)
+            .count(),
+        1);
+  }
 }