fix: [CDS-35637]: fix indexoutofbounds exception during instance sync in NG (#32513)

* [CDS-35637]: fix indexoutofbounds exception and pass instanceHandler using deployment type
* [CDS-35637]: return deployment type from PT response instead
* [CDS-35637]: moved constants class to higher module
* Update config.yml

Author: abhinavsingh1196

125-cd-nextgen/src/main/java/io/harness/cdng/creator/variables/ServiceVariableCreator.java

@@ -13,9 +13,9 @@
 import io.harness.annotations.dev.HarnessTeam;
 import io.harness.annotations.dev.OwnedBy;
 import io.harness.cdng.manifest.ManifestType;
-import io.harness.cdng.service.beans.ServiceSpecType;
 import io.harness.cdng.visitor.YamlTypes;
 import io.harness.exception.InvalidRequestException;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.pms.contracts.plan.YamlProperties;
 import io.harness.pms.sdk.core.variables.VariableCreatorHelper;
 import io.harness.pms.sdk.core.variables.beans.VariableCreationResponse;

125-cd-nextgen/src/main/java/io/harness/cdng/service/beans/KubernetesServiceSpec.java

@@ -18,6 +18,7 @@
 import io.harness.cdng.variables.beans.NGVariableOverrideSetWrapper;
 import io.harness.cdng.visitor.helpers.serviceconfig.KubernetesServiceSpecVisitorHelper;
 import io.harness.data.structure.EmptyPredicate;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.walktree.beans.VisitableChildren;
 import io.harness.walktree.visitor.SimpleVisitorHelper;
 import io.harness.walktree.visitor.Visitable;

125-cd-nextgen/src/main/java/io/harness/cdng/service/beans/NativeHelmServiceSpec.java

@@ -15,6 +15,7 @@
 import io.harness.cdng.variables.beans.NGVariableOverrideSetWrapper;
 import io.harness.cdng.visitor.helpers.serviceconfig.NativeHelmServiceSpecVisitorHelper;
 import io.harness.data.structure.EmptyPredicate;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.walktree.beans.VisitableChildren;
 import io.harness.walktree.visitor.SimpleVisitorHelper;
 import io.harness.walktree.visitor.Visitable;

125-cd-nextgen/src/main/java/io/harness/cdng/service/beans/ServiceDefinitionType.java

@@ -8,6 +8,7 @@
 package io.harness.cdng.service.beans;
 
 import io.harness.beans.ExecutionStrategyType;
+import io.harness.ng.core.k8s.ServiceSpecType;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

125-cd-nextgen/src/main/java/io/harness/cdng/service/beans/SshServiceSpec.java

@@ -18,6 +18,7 @@
 import io.harness.cdng.variables.beans.NGVariableOverrideSetWrapper;
 import io.harness.cdng.visitor.helpers.serviceconfig.SshServiceSpecVisitorHelper;
 import io.harness.data.structure.EmptyPredicate;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.walktree.beans.VisitableChildren;
 import io.harness.walktree.visitor.SimpleVisitorHelper;
 import io.harness.walktree.visitor.Visitable;

125-cd-nextgen/src/main/java/io/harness/cdng/service/beans/WinRmServiceSpec.java

@@ -18,6 +18,7 @@
 import io.harness.cdng.variables.beans.NGVariableOverrideSetWrapper;
 import io.harness.cdng.visitor.helpers.serviceconfig.WinRmServiceSpecVisitorHelper;
 import io.harness.data.structure.EmptyPredicate;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.walktree.beans.VisitableChildren;
 import io.harness.walktree.visitor.SimpleVisitorHelper;
 import io.harness.walktree.visitor.Visitable;

126-instance/src/main/java/io/harness/dtos/deploymentinfo/K8sDeploymentInfoDTO.java

@@ -10,7 +10,7 @@
 import static io.harness.annotations.dev.HarnessTeam.CDP;
 
 import io.harness.annotations.dev.OwnedBy;
-import io.harness.cdng.service.beans.ServiceSpecType;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.util.InstanceSyncKey;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

126-instance/src/main/java/io/harness/dtos/deploymentinfo/NativeHelmDeploymentInfoDTO.java

@@ -10,9 +10,9 @@
 import static io.harness.annotations.dev.HarnessTeam.CDP;
 
 import io.harness.annotations.dev.OwnedBy;
-import io.harness.cdng.service.beans.ServiceSpecType;
 import io.harness.delegate.task.helm.HelmChartInfo;
 import io.harness.k8s.model.HelmVersion;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.util.InstanceSyncKey;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

126-instance/src/main/java/io/harness/mappers/InstanceDetailsMapper.java

@@ -9,10 +9,10 @@
 
 import io.harness.annotations.dev.HarnessTeam;
 import io.harness.annotations.dev.OwnedBy;
-import io.harness.cdng.service.beans.ServiceSpecType;
 import io.harness.dtos.InstanceDTO;
 import io.harness.dtos.instanceinfo.K8sInstanceInfoDTO;
 import io.harness.models.InstanceDetailsDTO;
+import io.harness.ng.core.k8s.ServiceSpecType;
 import io.harness.service.instancesynchandler.AbstractInstanceSyncHandler;
 import io.harness.service.instancesynchandlerfactory.InstanceSyncHandlerFactoryService;
 

126-instance/src/main/java/io/harness/service/instancesync/InstanceSyncServiceImpl.java

@@ -9,10 +9,8 @@
 
 import io.harness.annotations.dev.HarnessTeam;
 import io.harness.annotations.dev.OwnedBy;
-import io.harness.cdng.service.beans.ServiceSpecType;
 import io.harness.delegate.beans.instancesync.InstanceSyncPerpetualTaskResponse;
 import io.harness.delegate.beans.instancesync.ServerInstanceInfo;
-import io.harness.delegate.beans.instancesync.info.K8sServerInstanceInfo;
 import io.harness.dtos.DeploymentSummaryDTO;
 import io.harness.dtos.InfrastructureMappingDTO;
 import io.harness.dtos.InstanceDTO;
@@ -128,8 +126,10 @@ public void processInstanceSyncForNewDeployment(DeploymentEvent deploymentEvent)
           InstanceSyncLocalCacheManager.setDeploymentSummary(
               deploymentSummaryDTO.getInstanceSyncKey(), deploymentSummaryDTO);
           // Sync only for deployment infos / instance sync handler keys from instances from server
+          AbstractInstanceSyncHandler instanceSyncHandler = instanceSyncHandlerFactoryService.getInstanceSyncHandler(
+              deploymentSummaryDTO.getDeploymentInfoDTO().getType());
           performInstanceSync(instanceSyncPerpetualTaskInfoDTO, infrastructureMappingDTO,
-              deploymentSummaryDTO.getServerInstanceInfoList(), true);
+              deploymentSummaryDTO.getServerInstanceInfoList(), instanceSyncHandler, true);
 
           log.info("Instance sync completed for infrastructure mapping id : {}", infrastructureMappingDTO.getId());
           return;
@@ -186,8 +186,10 @@ public void processInstanceSyncByPerpetualTask(String accountIdentifier, String
             AcquiredLock<?> acquiredLock = persistentLocker.waitToAcquireLock(InstanceSyncConstants.INSTANCE_SYNC_PREFIX
                     + instanceSyncPerpetualTaskInfoDTO.getInfrastructureMappingId(),
                 InstanceSyncConstants.INSTANCE_SYNC_LOCK_TIMEOUT, InstanceSyncConstants.INSTANCE_SYNC_WAIT_TIMEOUT)) {
+          AbstractInstanceSyncHandler instanceSyncHandler = instanceSyncHandlerFactoryService.getInstanceSyncHandler(
+              instanceSyncPerpetualTaskResponse.getDeploymentType());
           performInstanceSync(instanceSyncPerpetualTaskInfoDTO, infrastructureMappingDTO.get(),
-              instanceSyncPerpetualTaskResponse.getServerInstanceDetails(), false);
+              instanceSyncPerpetualTaskResponse.getServerInstanceDetails(), instanceSyncHandler, false);
           log.info("Instance Sync completed");
         } catch (Exception exception) {
           log.error("Exception occured during instance sync", exception);
@@ -203,10 +205,11 @@ public void processInstanceSyncByPerpetualTask(String accountIdentifier, String
    */
   private void performInstanceSync(InstanceSyncPerpetualTaskInfoDTO instanceSyncPerpetualTaskInfoDTO,
       InfrastructureMappingDTO infrastructureMappingDTO, List<ServerInstanceInfo> serverInstanceInfoList,
-      boolean isNewDeploymentSync) {
+      AbstractInstanceSyncHandler instanceSyncHandler, boolean isNewDeploymentSync) {
     // Prepare final list of instances to be added / deleted / updated
-    Map<OperationsOnInstances, List<InstanceDTO>> instancesToBeModified = handleInstanceSync(
-        instanceSyncPerpetualTaskInfoDTO, infrastructureMappingDTO, serverInstanceInfoList, isNewDeploymentSync);
+    Map<OperationsOnInstances, List<InstanceDTO>> instancesToBeModified =
+        handleInstanceSync(instanceSyncPerpetualTaskInfoDTO, infrastructureMappingDTO, serverInstanceInfoList,
+            instanceSyncHandler, isNewDeploymentSync);
     processInstances(instancesToBeModified);
   }
 
@@ -225,9 +228,7 @@ private void processInstances(Map<OperationsOnInstances, List<InstanceDTO>> inst
   Map<OperationsOnInstances, List<InstanceDTO>> handleInstanceSync(
       InstanceSyncPerpetualTaskInfoDTO instanceSyncPerpetualTaskInfoDTO,
       InfrastructureMappingDTO infrastructureMappingDTO, List<ServerInstanceInfo> serverInstanceInfoList,
-      boolean isNewDeploymentSync) {
-    AbstractInstanceSyncHandler instanceSyncHandler = instanceSyncHandlerFactoryService.getInstanceSyncHandler(
-        getServerInstanceInfoType(serverInstanceInfoList.get(0)));
+      AbstractInstanceSyncHandler instanceSyncHandler, boolean isNewDeploymentSync) {
     List<InstanceDTO> instancesInDB = instanceService.getActiveInstancesByInfrastructureMappingId(
         infrastructureMappingDTO.getAccountIdentifier(), infrastructureMappingDTO.getOrgIdentifier(),
         infrastructureMappingDTO.getProjectIdentifier(), infrastructureMappingDTO.getId(), System.currentTimeMillis());
@@ -591,12 +592,4 @@ private void logServerInstances(List<ServerInstanceInfo> serverInstanceInfoList)
         serverInstanceInfo -> stringBuilder.append(serverInstanceInfo.toString()).append(" :: "));
     log.info("Server Instances in the perpetual task response : {}", stringBuilder.toString());
   }
-
-  private String getServerInstanceInfoType(ServerInstanceInfo serverInstanceInfo) {
-    if (serverInstanceInfo instanceof K8sServerInstanceInfo) {
-      return ServiceSpecType.KUBERNETES;
-    }
-
-    return ServiceSpecType.NATIVE_HELM; // as of now only 2 types K8s and Native Helm
-  }
 }