feat: [CI-5543]: gitX migration for triggers

Author: devkimittal

pipeline-service/modules/ng-triggers/src/main/java/io/harness/ngtriggers/buildtriggers/helpers/BuildTriggerHelper.java

@@ -20,6 +20,7 @@
 import io.harness.exception.InvalidRequestException;
 import io.harness.expression.EngineExpressionEvaluator;
 import io.harness.jackson.JsonNodeUtils;
+import io.harness.ngtriggers.beans.config.NGTriggerConfigV2;
 import io.harness.ngtriggers.beans.dto.TriggerDetails;
 import io.harness.ngtriggers.beans.entity.NGTriggerEntity;
 import io.harness.ngtriggers.beans.source.NGTriggerSpecV2;
@@ -66,10 +67,12 @@
 public class BuildTriggerHelper {
   private PipelineServiceClient pipelineServiceClient;
 
-  public Optional<String> fetchPipelineForTrigger(NGTriggerEntity ngTriggerEntity) {
+  public Optional<String> fetchPipelineForTrigger(TriggerDetails triggerDetails) {
+    NGTriggerEntity ngTriggerEntity = triggerDetails.getNgTriggerEntity();
+    NGTriggerConfigV2 ngTriggerConfigV2 = triggerDetails.getNgTriggerConfigV2();
     PMSPipelineResponseDTO response = NGRestUtils.getResponse(pipelineServiceClient.getPipelineByIdentifier(
         ngTriggerEntity.getTargetIdentifier(), ngTriggerEntity.getAccountId(), ngTriggerEntity.getOrgIdentifier(),
-        ngTriggerEntity.getProjectIdentifier(), null, null, false));
+        ngTriggerEntity.getProjectIdentifier(), ngTriggerConfigV2.getPipelineBranchName(), null, false));
 
     return response != null ? Optional.of(response.getYamlPipeline()) : Optional.empty();
   }

pipeline-service/modules/ng-triggers/src/main/java/io/harness/ngtriggers/service/impl/NGTriggerServiceImpl.java

@@ -685,8 +685,7 @@ public MergeInputSetResponseDTOPMS validateInputSetsInternal(TriggerDetails trig
   }
 
   private void validatePipelineRef(TriggerDetails triggerDetails) {
-    NGTriggerEntity ngTriggerEntity = triggerDetails.getNgTriggerEntity();
-    Optional<String> pipelineYmlOptional = validationHelper.fetchPipelineForTrigger(ngTriggerEntity);
+    Optional<String> pipelineYmlOptional = validationHelper.fetchPipelineForTrigger(triggerDetails);
     if (pipelineYmlOptional.isPresent()) {
       String pipelineYaml = pipelineYmlOptional.get();
       String templateYaml = createRuntimeInputForm(pipelineYaml);

pipeline-service/modules/ng-triggers/src/main/java/io/harness/ngtriggers/validations/impl/PipelineRefValidator.java

@@ -32,7 +32,7 @@ public class PipelineRefValidator implements TriggerValidator {
   public ValidationResult validate(TriggerDetails triggerDetails) {
     ValidationResultBuilder builder = ValidationResult.builder().success(true);
     NGTriggerEntity ngTriggerEntity = triggerDetails.getNgTriggerEntity();
-    Optional<String> pipelineYmlOptional = validationHelper.fetchPipelineForTrigger(ngTriggerEntity);
+    Optional<String> pipelineYmlOptional = validationHelper.fetchPipelineForTrigger(triggerDetails);
 
     if (!pipelineYmlOptional.isPresent()) {
       String ref = new StringBuilder(128)

pipeline-service/modules/ng-triggers/src/test/java/io/harness/ngtriggers/validations/TriggerValidationHandlerTest.java

@@ -93,7 +93,7 @@ public void testPipelineRefValidator() {
     doReturn(Optional.empty())
         .doReturn(Optional.of("placeholder_for_actual_pipeline_yml"))
         .when(buildTriggerHelper)
-        .fetchPipelineForTrigger(ngTriggerEntity);
+        .fetchPipelineForTrigger(triggerDetails);
 
     PipelineRefValidator pipelineRefValidator = new PipelineRefValidator(buildTriggerHelper);
     ValidationResult validate =

pipeline-service/service/src/main/java/io/harness/pms/triggers/TriggerExecutionHelper.java

@@ -473,7 +473,7 @@ public String fetchInputSetYAML(TriggerDetails triggerDetails, TriggerWebhookEve
     NGTriggerConfigV2 triggerConfigV2 = triggerDetails.getNgTriggerConfigV2();
     String pipelineBranch = triggerConfigV2.getPipelineBranchName();
     if (isEmpty(triggerConfigV2.getInputSetRefs())) {
-      return null;
+      return triggerConfigV2.getInputYaml();
     }
 
     String branch = null;

scripts/gitxmigration/script.py

@@ -6,6 +6,7 @@
 from pymongo import MongoClient
 from enum import Enum
 import requests
+import yaml
 
 INPUT_ACCOUNT_ID = "kmpySmUISimoRrJL6NL73w"
 INPUT_ORG_ID = "default"
@@ -36,6 +37,9 @@ class DBKeys(Enum):
     BRANCH = "branch"
     OBJECT_ID_OF_YAML = "objectIdOfYaml"
     YAML = "yaml"
+    TARGET_IDENTIFIER = "targetIdentifier"
+    PIPELINE_BRANCH_NAME = "pipelineBranchName"
+    TRIGGER = "trigger"
     SETTINGS = "settings"
 
 
@@ -225,6 +229,32 @@ def delete_yaml_git_configs():
     }
     yaml_git_config_collection.delete_many(find_criteria)
 
+def update_triggers():
+    query = {
+        DBKeys.ACCOUNT_ID.value: INPUT_ACCOUNT_ID,
+        DBKeys.ORG_IDENTIFIER.value: INPUT_ORG_ID,
+        DBKeys.PROJECT_IDENTIFIER.value: INPUT_PROJECT_ID,
+    }
+    triggers = pms_db.triggersNG.find(query)
+    for record in triggers:
+        pipelineId = record.get(DBKeys.TARGET_IDENTIFIER.value);
+        pipelineQuery = {
+            DBKeys.ACCOUNT_ID.value: INPUT_ACCOUNT_ID,
+            DBKeys.ORG_IDENTIFIER.value: INPUT_ORG_ID,
+            DBKeys.PROJECT_IDENTIFIER.value: INPUT_PROJECT_ID,
+            DBKeys.IDENTIFIER.value: pipelineId,
+            DBKeys.IS_FROM_DEFAULT_BRANCH.value: True
+        }
+        pipeline = pms_db.pipelinesPMS.find_one(pipelineQuery)
+        if pipeline is None:
+            continue
+
+        pipelineBranchName = pipeline.get(DBKeys.BRANCH.value);
+
+        trigger_yaml = yaml.safe_load(record.get(DBKeys.YAML.value));
+        trigger_yaml.get(DBKeys.TRIGGER.value)[DBKeys.PIPELINE_BRANCH_NAME.value] = pipelineBranchName
+        record[DBKeys.YAML.value] = yaml.dump(trigger_yaml,  sort_keys=False);
+        pms_db.triggersNG.update_one({"_id": record.get("_id")}, {"$set": record}, upsert=False)
 
 if __name__ == "__main__":
     setup_mongo_client()
@@ -234,6 +264,7 @@ def delete_yaml_git_configs():
     delete_non_default_branch_entities()
     # enable_gitx_via_api()
     enable_new_gitx()
+    update_triggers()
     migrate_records_from_inline_to_remote()
     cleanup_connector_entities()
     # reset_git_sync_sdk_cache()