Merge pull request #129 from atlanhq/pes-3334

PES-3334 : fix: update extraction of alias from sql file

Author: sharma-shreyas

adapters/integrations/gitlab-integration.js

@@ -779,23 +779,66 @@ ${content}`;
           CI_COMMIT_SHA,
           "getAssetName"
         );
-        var matches = regExp.exec(fileContents);
+        const startRegex =
+            /{{\s*config\s*\(/im;
+        const startMatch = fileContents.match(startRegex);
+        let configSection = ''
+        if (startMatch) {
+          const startIndex = startMatch.index;
+          const openParensIndex = fileContents.indexOf('(', startIndex) + 1;
+          let openParensCount = 1;
+          let endIndex = openParensIndex;
+
+          while (openParensCount > 0 && endIndex < fileContents.length) {
+            const char = fileContents[endIndex];
+
+            if (char === '(') {
+                openParensCount++;
+            } else if (char === ')') {
+                openParensCount--;
+            }
+            endIndex++;
+            }
+            
+            const endMarker = '}}';
+            const finalEndIndex = fileContents.indexOf(endMarker, endIndex) + endMarker.length;
 
-        logger.withInfo(
-          "Successfully executed regex matching",
-          integrationName,
-          CI_COMMIT_SHA,
-          "getAssetName"
-        );
+            configSection = fileContents.substring(startIndex, finalEndIndex);
+            logger.withInfo(
+              "Extracted config section",
+              integrationName,
+              CI_COMMIT_SHA,
+              "getAssetName"
+            );
 
-        if (matches) {
-          logger.withInfo(
-            `Found a match: ${matches[1].trim()}`,
-            integrationName,
-            CI_COMMIT_SHA,
-            "getAssetName"
-          );
-          return matches[1].trim();
+            if (configSection){
+              logger.withInfo(
+                "Executing final regex",
+                integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+              var matches = regExp.exec(configSection);
+
+              logger.withInfo(
+                "Successfully executed regex matching",
+                integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+            }
+            if (matches) {
+              logger.withInfo(
+                `Found a match: ${matches[1].trim()}`,
+                integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+              return matches[1].trim();
+            }
         }
       }
 

dist/index.js

@@ -34803,23 +34803,66 @@ ${content}`;
           CI_COMMIT_SHA,
           "getAssetName"
         );
-        var matches = regExp.exec(fileContents);
+        const startRegex =
+            /{{\s*config\s*\(/im;
+        const startMatch = fileContents.match(startRegex);
+        let configSection = ''
+        if (startMatch) {
+          const startIndex = startMatch.index;
+          const openParensIndex = fileContents.indexOf('(', startIndex) + 1;
+          let openParensCount = 1;
+          let endIndex = openParensIndex;
+
+          while (openParensCount > 0 && endIndex < fileContents.length) {
+            const char = fileContents[endIndex];
+
+            if (char === '(') {
+                openParensCount++;
+            } else if (char === ')') {
+                openParensCount--;
+            }
+            endIndex++;
+            }
+            
+            const endMarker = '}}';
+            const finalEndIndex = fileContents.indexOf(endMarker, endIndex) + endMarker.length;
 
-        logger_logger.withInfo(
-          "Successfully executed regex matching",
-          gitlab_integration_integrationName,
-          CI_COMMIT_SHA,
-          "getAssetName"
-        );
+            configSection = fileContents.substring(startIndex, finalEndIndex);
+            logger_logger.withInfo(
+              "Extracted config section",
+              gitlab_integration_integrationName,
+              CI_COMMIT_SHA,
+              "getAssetName"
+            );
 
-        if (matches) {
-          logger_logger.withInfo(
-            `Found a match: ${matches[1].trim()}`,
-            gitlab_integration_integrationName,
-            CI_COMMIT_SHA,
-            "getAssetName"
-          );
-          return matches[1].trim();
+            if (configSection){
+              logger_logger.withInfo(
+                "Executing final regex",
+                gitlab_integration_integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+              var matches = regExp.exec(configSection);
+
+              logger_logger.withInfo(
+                "Successfully executed regex matching",
+                gitlab_integration_integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+            }
+            if (matches) {
+              logger_logger.withInfo(
+                `Found a match: ${matches[1].trim()}`,
+                gitlab_integration_integrationName,
+                CI_COMMIT_SHA,
+                "getAssetName"
+              );
+
+              return matches[1].trim();
+            }
         }
       }