ADAPT1-1206 | moved regex validation to common utils

ps-dev · Jul 8, 2024 · 0ab6def · 0ab6def
1 parent f8154dd
commit 0ab6def
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/ingestors/kafka/src/main/scala/hydra/kafka/programs/TopicMetadataV2Validator.scala b/ingestors/kafka/src/main/scala/hydra/kafka/programs/TopicMetadataV2Validator.scala
@@ -9,6 +9,7 @@ import hydra.kafka.model.ContactMethod.Slack
 import hydra.kafka.model.DataClassification._
 import hydra.kafka.model.TopicMetadataV2Request.Subject
 import hydra.kafka.model._
+import hydra.kafka.util.ValidationUtils
 
 class TopicMetadataV2Validator[F[_] : Sync](metadataAlgebra: MetadataAlgebra[F], kafkaAdmin: KafkaAdminAlgebra[F]) extends Validator {
 
@@ -76,7 +77,7 @@ class TopicMetadataV2Validator[F[_] : Sync](metadataAlgebra: MetadataAlgebra[F],
       case MetadataAdditionalValidation.replacementTopics => valid
       case MetadataAdditionalValidation.contact if maybeSlackChannel.isDefined =>
         val slackChannel = maybeSlackChannel.get
-        val slackChannelValidation = slackChannel.matches("""^#[a-z][a-z_-]{0,78}$""")
+        val slackChannelValidation = ValidationUtils.isValidSlackChannel(slackChannel)
         validate(slackChannelValidation, TopicMetadataError.InvalidContactProvided(slackChannel))
     }
     resultOf(validations.pure)

diff --git a/ingestors/kafka/src/main/scala/hydra/kafka/services/TopicMetadataValidator.scala b/ingestors/kafka/src/main/scala/hydra/kafka/services/TopicMetadataValidator.scala
@@ -4,8 +4,7 @@ import hydra.common.validation.{AdditionalValidation, AdditionalValidationUtil,
 import hydra.core.marshallers.{GenericSchema, TopicMetadataRequest}
 import hydra.kafka.model.TopicMetadata
 import hydra.kafka.programs.TopicMetadataError
-import hydra.kafka.util.{KafkaUtils, MetadataUtils}
-import hydra.kafka.util.MetadataUtils
+import hydra.kafka.util.{KafkaUtils, MetadataUtils, ValidationUtils}
 
 import scala.util.{Failure, Success, Try}
 
@@ -70,7 +69,7 @@ object TopicMetadataValidator {
     }
 
   private def validContact(contactField: String): ValidationResponse = {
-    if (contactField.matches("""^#[a-z][a-z_-]{0,78}$""")) {
+    if (ValidationUtils.isValidSlackChannel(contactField)) {
       Valid
     } else {
       Invalid(InvalidContactProvided)

diff --git a/ingestors/kafka/src/main/scala/hydra/kafka/util/ValidationUtils.scala b/ingestors/kafka/src/main/scala/hydra/kafka/util/ValidationUtils.scala
@@ -0,0 +1,11 @@
+package hydra.kafka.util
+
+object ValidationUtils {
+
+  val slackChannelRegex: String = "^#[a-z][a-z_-]{0,78}$"
+
+  def isValidSlackChannel(slackChannel: String): Boolean = {
+    slackChannel.matches(slackChannelRegex)
+  }
+
+}