fix: [CI-5298]: fixed the plugin step identifier issue

Author: devkimittal

332-ci-manager/service/src/main/java/io/harness/ci/execution/integrationstage/K8InitializeStepUtils.java

@@ -900,49 +900,54 @@ public Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> getStepConne
 
     Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> map = new HashMap<>();
     for (ExecutionWrapperConfig executionWrapperConfig : executionWrappers) {
-      populateStepConnectorRefsUtil(executionWrapperConfig, ambiance, map);
+      populateStepConnectorRefsUtil(executionWrapperConfig, ambiance, map, null);
     }
     return map;
   }
 
   public void populateStepConnectorRefsUtil(ExecutionWrapperConfig executionWrapperConfig, Ambiance ambiance,
-      Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> map) {
+      Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> map, String stepGroupIdOfParent) {
     if (executionWrapperConfig.getStep() != null && !executionWrapperConfig.getStep().isNull()) {
       StepElementConfig stepElementConfig = getStepElementConfig(executionWrapperConfig);
-      map.putAll(getStepConnectorConversionInfo(stepElementConfig, ambiance));
+      map.putAll(getStepConnectorConversionInfo(stepElementConfig, ambiance, stepGroupIdOfParent));
     } else if (executionWrapperConfig.getParallel() != null && !executionWrapperConfig.getParallel().isNull()) {
       ParallelStepElementConfig parallelStepElementConfig = getParallelStepElementConfig(executionWrapperConfig);
       for (ExecutionWrapperConfig executionWrapper : parallelStepElementConfig.getSections()) {
-        populateStepConnectorRefsUtil(executionWrapper, ambiance, map);
+        populateStepConnectorRefsUtil(executionWrapper, ambiance, map, stepGroupIdOfParent);
       }
     } else if (executionWrapperConfig.getStepGroup() != null && !executionWrapperConfig.getStepGroup().isNull()) {
       StepGroupElementConfig stepGroupElementConfig =
           IntegrationStageUtils.getStepGroupElementConfig(executionWrapperConfig);
       for (ExecutionWrapperConfig executionWrapper : stepGroupElementConfig.getSteps()) {
-        populateStepConnectorRefsUtil(executionWrapper, ambiance, map);
+        populateStepConnectorRefsUtil(executionWrapper, ambiance, map, stepGroupElementConfig.getIdentifier());
       }
     }
   }
 
   private Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> getStepConnectorConversionInfo(
-      StepElementConfig stepElement, Ambiance ambiance) {
+      StepElementConfig stepElement, Ambiance ambiance, String stepGroupIdOfParent) {
     Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> map = new HashMap<>();
     if ((stepElement.getStepSpecType() instanceof PluginCompatibleStep)
         && (stepElement.getStepSpecType() instanceof WithConnectorRef)) {
-      map.put(stepElement.getIdentifier(), new ArrayList<>());
+      String stepIdentifier = stepElement.getIdentifier();
+      if (Strings.isNotBlank(stepGroupIdOfParent)) {
+        stepIdentifier = stepGroupIdOfParent + "_" + stepIdentifier;
+      }
+
+      map.put(stepIdentifier, new ArrayList<>());
       PluginCompatibleStep step = (PluginCompatibleStep) stepElement.getStepSpecType();
 
       String connectorRef = PluginSettingUtils.getConnectorRef(step);
       Map<EnvVariableEnum, String> envToSecretMap =
           PluginSettingUtils.getConnectorSecretEnvMap(step.getNonYamlInfo().getStepInfoType());
-      map.get(stepElement.getIdentifier())
+      map.get(stepIdentifier)
           .add(K8BuildJobEnvInfo.ConnectorConversionInfo.builder()
                    .connectorRef(connectorRef)
                    .envToSecretsMap(envToSecretMap)
                    .build());
       List<K8BuildJobEnvInfo.ConnectorConversionInfo> baseConnectorConversionInfo =
           this.getBaseImageConnectorConversionInfo(step, ambiance);
-      map.get(stepElement.getIdentifier()).addAll(baseConnectorConversionInfo);
+      map.get(stepIdentifier).addAll(baseConnectorConversionInfo);
     }
     return map;
   }

332-ci-manager/service/src/test/java/io/harness/ci/integrationstage/K8InitializeStepUtilsHelper.java

@@ -202,7 +202,7 @@ private static JsonNode getPluginStepElementConfigAsJsonNode() {
   public static JsonNode getDockerStepElementConfigAsJsonNode() {
     ObjectMapper mapper = new ObjectMapper();
     ObjectNode stepElementConfig = mapper.createObjectNode();
-    stepElementConfig.put("identifier", PLUGIN_STEP_ID);
+    stepElementConfig.put("identifier", "step-docker");
 
     stepElementConfig.put("type", "BuildAndPushDockerRegistry");
     stepElementConfig.put("name", "docker step");

332-ci-manager/service/src/test/java/io/harness/ci/integrationstage/K8InitializeStepUtilsTest.java

@@ -34,6 +34,9 @@
 import io.harness.rule.Owner;
 import io.harness.steps.matrix.StrategyExpansionData;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.inject.Inject;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -248,17 +251,31 @@ public void testGetStageCpuRequest() {
   public void testGetStepConnectorRefs() throws Exception {
     List<ExecutionWrapperConfig> wrapperConfigs =
         K8InitializeStepUtilsHelper.getExecutionWrapperConfigListWithStepGroup1();
+
+    ObjectMapper mapper = new ObjectMapper();
+    ObjectNode stepGroupElementConfig = mapper.createObjectNode();
+
+    ArrayNode arrayNode = mapper.createArrayNode();
+    arrayNode.add(
+        mapper.createObjectNode().set("step", K8InitializeStepUtilsHelper.getDockerStepElementConfigAsJsonNode()));
+
+    stepGroupElementConfig.put("identifier", "step-group1");
+    stepGroupElementConfig.put("steps", arrayNode);
+
+    wrapperConfigs.add(ExecutionWrapperConfig.builder().stepGroup(stepGroupElementConfig).build());
     wrapperConfigs.add(ExecutionWrapperConfig.builder()
                            .step(K8InitializeStepUtilsHelper.getDockerStepElementConfigAsJsonNode())
                            .build());
+
     ExecutionElementConfig executionElementConfig = ExecutionElementConfig.builder().steps(wrapperConfigs).build();
     IntegrationStageConfig integrationStageConfig =
         IntegrationStageConfigImpl.builder().execution(executionElementConfig).build();
     Ambiance ambiance = Ambiance.newBuilder().build();
     Map<String, List<K8BuildJobEnvInfo.ConnectorConversionInfo>> stepConnectorRefs =
         k8InitializeStepUtils.getStepConnectorRefs(integrationStageConfig, ambiance);
-    assertThat(stepConnectorRefs.size()).isEqualTo(1);
-    assertThat(stepConnectorRefs.containsKey("step-3")).isTrue();
+    assertThat(stepConnectorRefs.size()).isEqualTo(2);
+    assertThat(stepConnectorRefs.containsKey("step-docker")).isTrue();
+    assertThat(stepConnectorRefs.containsKey("step-group1_step-docker")).isTrue();
   }
 
   @Test