From 3eb878a8cfccad13d506712bfa47b2dfb189c398 Mon Sep 17 00:00:00 2001
From: Arun Kumar <104547029+arunpaladin@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:42:05 -0800
Subject: [PATCH] fix:[NEXT-378] Gap Policy fix

---
 .../awsrules/ec2/AssetTypeScannedBySourceRule.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/jobs/pacman-awsrules/src/main/java/com/tmobile/cloud/awsrules/ec2/AssetTypeScannedBySourceRule.java b/jobs/pacman-awsrules/src/main/java/com/tmobile/cloud/awsrules/ec2/AssetTypeScannedBySourceRule.java
index b01fb8a30..d2b5cec17 100644
--- a/jobs/pacman-awsrules/src/main/java/com/tmobile/cloud/awsrules/ec2/AssetTypeScannedBySourceRule.java
+++ b/jobs/pacman-awsrules/src/main/java/com/tmobile/cloud/awsrules/ec2/AssetTypeScannedBySourceRule.java
@@ -104,9 +104,6 @@ private void validatePolicyConfig(Map<String, String> policyParam) {
         }
     }
 
-    private String getElasticSearchURL(String source, String targetType) {
-        return PacmanUtils.getPacmanHost(PacmanRuleConstants.ES_URI) + "/" + source + "_" + targetType + "_opinions/_search";
-    }
 
     private String getDocID(Map<String, String> resourceAttributes) {
         return StringUtils.trim(resourceAttributes.get("_docid"));
@@ -124,7 +121,7 @@ private PolicyResult processPolicy(Map<String, String> policyParam, Map<String,
         if (PacmanRuleConstants.QUALYS.equalsIgnoreCase(plugin)) {
             String targetType = policyParam.get(PacmanSdkConstants.TARGET_TYPE);
             String source = policyParam.get(PacmanSdkConstants.DATA_SOURCE_KEY);
-            String opinionURL = getElasticSearchURL(source, targetType);
+            String opinionURL = getElasticSearchURLForOpinions(source, targetType);
             String docID = getDocID(resourceAttributes);
             // TODO: After adding the pluginServices field to the plugins table,
             //  ensure that pluginServiceName is created as a policy parameter in the plugin creation API.
@@ -147,7 +144,7 @@ private PolicyResult processPolicy(Map<String, String> policyParam, Map<String,
                 throw new RuleExecutionFailedExeption("Unable to determine: " + e.getMessage(), e);
             }
         } else {
-            String assetLookupIndex = policyParam.get(ASSET_LOOKUP_INDEX);
+            String assetLookupIndex = getElasticSearchURLForVul(policyParam.get(ASSET_LOOKUP_INDEX));
             String instanceID = getInstanceID(resourceAttributes, srcAssetKey);
             String vulnAssetLookupKey = policyParam.get(VULN_ASSET_LOOKUP_KEY);
             return processNonQualysPlugin(instanceID, assetLookupIndex, vulnAssetLookupKey, policyParam);
@@ -156,6 +153,13 @@ private PolicyResult processPolicy(Map<String, String> policyParam, Map<String,
         return agentStatusMessage != null ? createFailureResult(policyParam, agentStatusMessage) : null;
     }
 
+    private String getElasticSearchURLForOpinions(String source, String targetType) {
+        return PacmanUtils.getPacmanHost(PacmanRuleConstants.ES_URI) + "/" + source + "_" + targetType + "_opinions/_search";
+    }
+
+    private String getElasticSearchURLForVul(String vulIndex) {
+        return PacmanUtils.getPacmanHost(PacmanRuleConstants.ES_URI) + "/" + vulIndex + "/_search";
+    }
     private Map<String, Object> createFilterMap(String docID, String targetType) {
         Map<String, Object> mustFilter = new HashMap<>();
         mustFilter.put("_docId.keyword", docID);