From 12b3da3d719320fbd4a323a2fbee129b3d3e8fa9 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 15 Aug 2024 21:49:27 -0500
Subject: [PATCH] fix(config): fix hash algo config (#11191)

---
 .../systemmetadata/ElasticSearchSystemMetadataService.java | 4 ++--
 .../systemmetadata/SystemMetadataServiceTestBase.java      | 2 +-
 .../common/ElasticSearchSystemMetadataServiceFactory.java  | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
index cdfc4e985293f..fe79ba75cb1d1 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/systemmetadata/ElasticSearchSystemMetadataService.java
@@ -52,6 +52,7 @@ public class ElasticSearchSystemMetadataService
   private final IndexConvention _indexConvention;
   private final ESSystemMetadataDAO _esDAO;
   private final ESIndexBuilder _indexBuilder;
+  @Nonnull private final String elasticIdHashAlgo;
 
   private static final String DOC_DELIMETER = "--";
   public static final String INDEX_NAME = "system_metadata_service_v1";
@@ -86,10 +87,9 @@ private String toDocument(SystemMetadata systemMetadata, String urn, String aspe
 
   private String toDocId(@Nonnull final String urn, @Nonnull final String aspect) {
     String rawDocId = urn + DOC_DELIMETER + aspect;
-    String hashAlgo = System.getenv("ELASTIC_ID_HASH_ALGO");
     try {
       byte[] bytesOfRawDocID = rawDocId.getBytes(StandardCharsets.UTF_8);
-      MessageDigest md = MessageDigest.getInstance(hashAlgo);
+      MessageDigest md = MessageDigest.getInstance(elasticIdHashAlgo);
       byte[] thedigest = md.digest(bytesOfRawDocID);
       return Base64.getEncoder().encodeToString(thedigest);
     } catch (NoSuchAlgorithmException e) {
diff --git a/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java b/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
index d843191bed741..af7005c93c46d 100644
--- a/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
+++ b/metadata-io/src/test/java/com/linkedin/metadata/systemmetadata/SystemMetadataServiceTestBase.java
@@ -54,7 +54,7 @@ private ElasticSearchSystemMetadataService buildService() {
     ESSystemMetadataDAO dao =
         new ESSystemMetadataDAO(getSearchClient(), _indexConvention, getBulkProcessor(), 1);
     return new ElasticSearchSystemMetadataService(
-        getBulkProcessor(), _indexConvention, dao, getIndexBuilder());
+        getBulkProcessor(), _indexConvention, dao, getIndexBuilder(), "MD5");
   }
 
   @Test
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
index d560fba399f34..fb48d64ce7ba9 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchSystemMetadataServiceFactory.java
@@ -6,6 +6,7 @@
 import javax.annotation.Nonnull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -19,7 +20,8 @@ public class ElasticSearchSystemMetadataServiceFactory {
 
   @Bean(name = "elasticSearchSystemMetadataService")
   @Nonnull
-  protected ElasticSearchSystemMetadataService getInstance() {
+  protected ElasticSearchSystemMetadataService getInstance(
+      @Value("${elasticsearch.idHashAlgo}") final String elasticIdHashAlgo) {
     return new ElasticSearchSystemMetadataService(
         components.getBulkProcessor(),
         components.getIndexConvention(),
@@ -28,6 +30,7 @@ protected ElasticSearchSystemMetadataService getInstance() {
             components.getIndexConvention(),
             components.getBulkProcessor(),
             components.getNumRetries()),
-        components.getIndexBuilder());
+        components.getIndexBuilder(),
+        elasticIdHashAlgo);
   }
 }