dummy changes for trigger creation

devkimittal · devkimittal · commit e3a25f948a93 · 2022-05-12T20:48:44.000+05:30
diff --git a/800-pipeline-service/src/main/java/io/harness/pms/triggers/webhook/helpers/TriggerEventExecutionHelper.java b/800-pipeline-service/src/main/java/io/harness/pms/triggers/webhook/helpers/TriggerEventExecutionHelper.java
@@ -126,7 +126,10 @@ private TriggerEventResponse triggerPipelineExecution(TriggerWebhookEvent trigge
     NGTriggerEntity ngTriggerEntity = triggerDetails.getNgTriggerEntity();
     try {
       runtimeInputYaml = triggerDetails.getNgTriggerConfigV2().getInputYaml();
-
+      if(triggerDetails.getNgTriggerConfigV2().getInputSetRef() != null){
+        // get branch from payload
+        // fetch inputyaml using branch, inputsetref, pipelineid
+      }
       PlanExecution response = triggerExecutionHelper.resolveRuntimeInputAndSubmitExecutionRequest(
           triggerDetails, triggerPayload, triggerWebhookEvent, payload);
       return generateEventHistoryForSuccess(
diff --git a/810-ng-triggers/src/main/java/io/harness/ngtriggers/beans/config/NGTriggerConfigV2.java b/810-ng-triggers/src/main/java/io/harness/ngtriggers/beans/config/NGTriggerConfigV2.java
@@ -29,6 +29,8 @@ public class NGTriggerConfigV2 implements NGTriggerInterface {
   String pipelineIdentifier;
   Map<String, String> tags;
   String inputYaml;
+  String branch; //newly added
+  String inputSetRef; //newly added
   NGTriggerSourceV2 source;
   @Builder.Default Boolean enabled = Boolean.TRUE;
 }
diff --git a/810-ng-triggers/src/main/java/io/harness/ngtriggers/buildtriggers/helpers/BuildTriggerHelper.java b/810-ng-triggers/src/main/java/io/harness/ngtriggers/buildtriggers/helpers/BuildTriggerHelper.java
@@ -18,15 +18,20 @@
 import io.harness.exception.InvalidArgumentsException;
 import io.harness.exception.InvalidRequestException;
 import io.harness.expression.EngineExpressionEvaluator;
+import io.harness.gitsync.sdk.EntityGitDetails;
 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;
 import io.harness.ngtriggers.beans.source.artifact.BuildAware;
 import io.harness.ngtriggers.buildtriggers.helpers.dtos.BuildTriggerOpsData;
+import io.harness.ngtriggers.mapper.NGTriggerElementMapper;
 import io.harness.pipeline.remote.PipelineServiceClient;
+import io.harness.pms.inputset.MergeInputSetResponseDTOPMS;
 import io.harness.pms.merger.YamlConfig;
 import io.harness.pms.merger.fqn.FQN;
+import io.harness.pms.ngpipeline.inputset.beans.resource.MergeInputSetRequestDTOPMS;
 import io.harness.pms.pipeline.PMSPipelineResponseDTO;
 import io.harness.pms.pipeline.TemplatesResolvedPipelineResponseDTO;
 import io.harness.pms.yaml.YamlUtils;
@@ -58,11 +63,25 @@
 @OwnedBy(PIPELINE)
 public class BuildTriggerHelper {
   private PipelineServiceClient pipelineServiceClient;
+  private NGTriggerElementMapper ngTriggerElementMapper;
 
   public Optional<String> fetchPipelineForTrigger(NGTriggerEntity ngTriggerEntity) {
+    NGTriggerConfigV2 triggerConfigV2 = ngTriggerElementMapper.toTriggerConfigV2(ngTriggerEntity);
     PMSPipelineResponseDTO response = NGRestUtils.getResponse(pipelineServiceClient.getPipelineByIdentifier(
         ngTriggerEntity.getTargetIdentifier(), ngTriggerEntity.getAccountId(), ngTriggerEntity.getOrgIdentifier(),
         ngTriggerEntity.getProjectIdentifier(), null, null, false));
+    EntityGitDetails gitDetails = response.getGitDetails();
+    String pipelineBranch = triggerConfigV2.getBranch();
+    String branch = gitDetails.getBranch();
+    String repo = gitDetails.getRepoIdentifier();
+    if (Strings.isNotBlank(pipelineBranch)) {
+      if (!(pipelineBranch.startsWith("<+") && pipelineBranch.endsWith(">"))) {
+        branch = pipelineBranch;
+      }
+    }
+    response = NGRestUtils.getResponse(pipelineServiceClient.getPipelineByIdentifier(
+        ngTriggerEntity.getTargetIdentifier(), ngTriggerEntity.getAccountId(), ngTriggerEntity.getOrgIdentifier(),
+        ngTriggerEntity.getProjectIdentifier(), branch, repo, false));
 
     return response != null ? Optional.of(response.getYamlPipeline()) : Optional.empty();
   }
@@ -387,4 +406,31 @@ public void verifyStageAndBuildRef(TriggerDetails triggerDetails, String fieldNa
       throw new InvalidArgumentsException(msg.toString());
     }
   }
+
+  public Optional<String> fetchInputSetForTrigger(NGTriggerEntity ngTriggerEntity) {
+    NGTriggerConfigV2 triggerConfigV2 = ngTriggerElementMapper.toTriggerConfigV2(ngTriggerEntity);
+    String pipelineBranch = triggerConfigV2.getBranch();
+    String branch = null;
+    if (Strings.isNotBlank(pipelineBranch)) {
+      if (!(pipelineBranch.startsWith("<+") && pipelineBranch.endsWith(">"))) {
+        branch = pipelineBranch;
+      }
+    }
+    String inputSetRef = triggerConfigV2.getInputSetRef();
+    String inputSetId = getInputsetId(inputSetRef);
+    List<String> inputSetRefs = new ArrayList<>();
+    inputSetRefs.add(inputSetId);
+    MergeInputSetRequestDTOPMS mergeInputSetRequestDTOPMS =
+        MergeInputSetRequestDTOPMS.builder().inputSetReferences(inputSetRefs).build();
+    MergeInputSetResponseDTOPMS response =
+        NGRestUtils.getResponse(pipelineServiceClient.getMergeInputSetFromPipelineTemplate(
+            ngTriggerEntity.getAccountId(), ngTriggerEntity.getOrgIdentifier(), ngTriggerEntity.getProjectIdentifier(),
+            ngTriggerEntity.getTargetIdentifier(), branch, null, branch, null, false, mergeInputSetRequestDTOPMS));
+
+    return response != null ? Optional.of(response.getPipelineYaml()) : Optional.empty();
+  }
+
+  private String getInputsetId(String inputSetRef) {
+    return inputSetRef.split("pipeline.")[1];
+  }
 }
diff --git a/810-ng-triggers/src/main/java/io/harness/ngtriggers/service/impl/NGTriggerServiceImpl.java b/810-ng-triggers/src/main/java/io/harness/ngtriggers/service/impl/NGTriggerServiceImpl.java
@@ -20,6 +20,7 @@
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
+import com.fasterxml.jackson.databind.node.TextNode;
 import io.harness.annotations.dev.OwnedBy;
 import io.harness.common.NGExpressionUtils;
 import io.harness.connector.ConnectorResourceClient;
@@ -591,8 +592,7 @@ private void validatePipelineRef(TriggerDetails triggerDetails) {
     if (pipelineYmlOptional.isPresent()) {
       String pipelineYaml = pipelineYmlOptional.get();
       String templateYaml = createRuntimeInputForm(pipelineYaml);
-      String triggerYaml = triggerDetails.getNgTriggerEntity().getYaml();
-      String triggerPipelineYml = getPipelineComponent(triggerYaml);
+      String triggerPipelineYml = getPipelineComponent(ngTriggerEntity);
       Map<FQN, String> invalidFQNs = getInvalidFQNsInTrigger(templateYaml, triggerPipelineYml);
       if (EmptyPredicate.isEmpty(invalidFQNs)) {
         return;
@@ -608,7 +608,8 @@ private void validatePipelineRef(TriggerDetails triggerDetails) {
     }
   }
 
-  private String getPipelineComponent(String triggerYml) {
+  private String getPipelineComponent(NGTriggerEntity ngTriggerEntity ) {
+    String triggerYml = ngTriggerEntity.getYaml();
     try {
       if (EmptyPredicate.isEmpty(triggerYml)) {
         return triggerYml;
@@ -619,7 +620,14 @@ private String getPipelineComponent(String triggerYml) {
         throw new InvalidRequestException("Invalid Trigger Yaml.");
       }
       JsonNode inputYaml = innerMap.get(INPUT_YAML);
-      if (inputYaml == null) {
+      JsonNode inputSetRef = innerMap.get("inputSetRef");
+      if (inputSetRef != null) {
+        Optional<String> inputSetYmlOptional = validationHelper.fetchInputSetForTrigger(ngTriggerEntity);
+        if(inputSetYmlOptional.isPresent()){
+          inputYaml = new TextNode(inputSetYmlOptional.get());
+        }
+      }
+      if (inputYaml == null ) {
         throw new InvalidRequestException("Invalid Trigger Yaml.");
       }
       JsonNode pipelineNode = YamlUtils.readTree(inputYaml.asText()).getNode().getCurrJsonNode();
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/GeneratorFactoryTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/GeneratorFactoryTest.java
@@ -54,7 +54,7 @@ public class GeneratorFactoryTest extends CategoryTest {
   @Before
   public void setUp() throws IOException {
     MockitoAnnotations.initMocks(this);
-    buildTriggerHelper = new BuildTriggerHelper(null);
+    buildTriggerHelper = new BuildTriggerHelper(null, null);
     httpHelmPollingItemGenerator = new HttpHelmPollingItemGenerator(buildTriggerHelper);
     s3HelmPollingItemGenerator = new S3HelmPollingItemGenerator(buildTriggerHelper);
     GCSHelmPollingItemGenerator gcsHelmPollingItemGenerator = new GCSHelmPollingItemGenerator(buildTriggerHelper);
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/DockerRegistryPollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/DockerRegistryPollingItemGeneratorTest.java
@@ -37,7 +37,7 @@
 
 @OwnedBy(PIPELINE)
 public class DockerRegistryPollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   DockerRegistryPollingItemGenerator dockerRegistryPollingItemGenerator =
       new DockerRegistryPollingItemGenerator(buildTriggerHelper);
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/EcrPollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/EcrPollingItemGeneratorTest.java
@@ -37,7 +37,7 @@
 
 @OwnedBy(PIPELINE)
 public class EcrPollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   EcrPollingItemGenerator ecrPollingItemGenerator = new EcrPollingItemGenerator(buildTriggerHelper);
   String ecr_pipeline_artifact_snippet_runtime_all;
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/GcrPollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/artifacts/GcrPollingItemGeneratorTest.java
@@ -37,7 +37,7 @@
 
 @OwnedBy(PIPELINE)
 public class GcrPollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   GcrPollingItemGenerator gcrPollingItemGenerator = new GcrPollingItemGenerator(buildTriggerHelper);
   String gcr_pipeline_artifact_snippet_runtime_all;
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmGcsPollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmGcsPollingItemGeneratorTest.java
@@ -38,7 +38,7 @@
 
 @OwnedBy(PIPELINE)
 public class HelmGcsPollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   GCSHelmPollingItemGenerator gcsHelmPollingItemGenerator = new GCSHelmPollingItemGenerator(buildTriggerHelper);
   String helm_gcs_pipeline_manifest_snippet_runtime_all;
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmHttpPollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmHttpPollingItemGeneratorTest.java
@@ -37,7 +37,7 @@
 
 @OwnedBy(PIPELINE)
 public class HelmHttpPollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   HttpHelmPollingItemGenerator httpHelmPollingItemGenerator = new HttpHelmPollingItemGenerator(buildTriggerHelper);
   String helm_http_pipeline_manifest_snippet_runtime_all;
diff --git a/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmS3PollingItemGeneratorTest.java b/810-ng-triggers/src/test/java/io/harness/ngtriggers/buildtriggers/helper/generator/manifests/HelmS3PollingItemGeneratorTest.java
@@ -37,7 +37,7 @@
 
 @OwnedBy(PIPELINE)
 public class HelmS3PollingItemGeneratorTest extends CategoryTest {
-  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null);
+  BuildTriggerHelper buildTriggerHelper = new BuildTriggerHelper(null, null);
   @InjectMocks NGTriggerElementMapper ngTriggerElementMapper;
   S3HelmPollingItemGenerator s3HelmPollingItemGenerator = new S3HelmPollingItemGenerator(buildTriggerHelper);
   String helm_s3_pipeline_manifest_snippet_runtime_all;
diff --git a/888-pms-client/src/main/java/io/harness/pipeline/remote/PipelineServiceClient.java b/888-pms-client/src/main/java/io/harness/pipeline/remote/PipelineServiceClient.java
@@ -17,6 +17,7 @@
 import io.harness.ng.core.dto.ResponseDTO;
 import io.harness.pms.inputset.MergeInputSetResponseDTOPMS;
 import io.harness.pms.inputset.MergeInputSetTemplateRequestDTO;
+import io.harness.pms.ngpipeline.inputset.beans.resource.MergeInputSetRequestDTOPMS;
 import io.harness.pms.pipeline.PMSPipelineResponseDTO;
 import io.harness.pms.pipeline.PMSPipelineSummaryResponseDTO;
 import io.harness.pms.pipeline.PipelineFilterPropertiesDto;
@@ -57,6 +58,17 @@ Call<ResponseDTO<MergeInputSetResponseDTOPMS>> getMergeInputSetFromPipelineTempl
       @Query("getDefaultFromOtherRepo") Boolean defaultFromOtherRepo,
       @Body MergeInputSetTemplateRequestDTO mergeInputSetTemplateRequestDTO);
 
+  @POST(PIPELINE_INPUT_SET_ENDPOINT + "merge/")
+  Call<ResponseDTO<MergeInputSetResponseDTOPMS>> getMergeInputSetFromPipelineTemplate(
+      @Query(value = NGCommonEntityConstants.ACCOUNT_KEY) String accountIdentifier,
+      @Query(value = NGCommonEntityConstants.ORG_KEY) String orgIdentifier,
+      @Query(value = NGCommonEntityConstants.PROJECT_KEY) String projectIdentifier,
+      @Query(value = NGCommonEntityConstants.PIPELINE_KEY) String pipelineIdentifier,
+      @Query("pipelineBranch") String pipelineBranch, @Query("pipelineRepoID") String pipelineRepoID,
+      @Query("branch") String branch, @Query("repoIdentifier") String yamlGitConfigId,
+      @Query("getDefaultFromOtherRepo") Boolean defaultFromOtherRepo,
+      @Body MergeInputSetRequestDTOPMS mergeInputSetRequestDTO);
+
   @GET(PIPELINE_ENDPOINT + "{pipelineIdentifier}")
   Call<ResponseDTO<PMSPipelineResponseDTO>> getPipelineByIdentifier(
       @Path(value = NGCommonEntityConstants.PIPELINE_KEY) String pipelineIdentifier,
diff --git a/900-git-sync-sdk/src/main/java/io/harness/gitsync/persistance/GitAwarePersistenceNewImpl.java b/900-git-sync-sdk/src/main/java/io/harness/gitsync/persistance/GitAwarePersistenceNewImpl.java
@@ -236,12 +236,26 @@ public <B extends GitSyncableEntity, Y extends YamlDTO> Optional<B> findOne(
 
   private <B extends GitSyncableEntity> Criteria createGitSyncCriteriaForRepoAndBranch(
       String repo, String branch, Boolean isFindDefaultFromOtherBranches, Class<B> entityClass) {
+    if (branch != null && !branch.equals(DEFAULT) && (repo == null || repo.equals(DEFAULT))) {
+      return getBranchCeriteria(branch, isFindDefaultFromOtherBranches, entityClass);
+    }
     if (repo == null || branch == null || repo.equals(DEFAULT) || branch.equals(DEFAULT)) {
       return getCriteriaWhenGitSyncNotEnabled(entityClass);
     }
     return getRepoAndBranchCriteria(repo, branch, isFindDefaultFromOtherBranches, entityClass);
   }
 
+  private Criteria getBranchCeriteria(String branch, Boolean isFindDefaultFromOtherBranches, Class entityClass) {
+    final GitSdkEntityHandlerInterface gitSdkEntityHandlerInterface =
+        gitPersistenceHelperServiceMap.get(entityClass.getCanonicalName());
+    Criteria criteria = new Criteria().and(gitSdkEntityHandlerInterface.getBranchKey()).is(branch);
+    if (isFindDefaultFromOtherBranches != null && isFindDefaultFromOtherBranches) {
+      return new Criteria().orOperator(
+          criteria, Criteria.where(gitSdkEntityHandlerInterface.getIsFromDefaultBranchKey()).is(true));
+    }
+    return criteria;
+  }
+
   @Override
   public <B extends GitSyncableEntity, Y extends YamlDTO> List<B> find(Criteria criteria, Pageable pageable,
       String projectIdentifier, String orgIdentifier, String accountId, Class<B> entityClass) {
diff --git a/970-ng-commons/src/main/java/io/harness/pms/ngpipeline/inputset/beans/resource/MergeInputSetRequestDTOPMS.java b/970-ng-commons/src/main/java/io/harness/pms/ngpipeline/inputset/beans/resource/MergeInputSetRequestDTOPMS.java

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public class NGTriggerConfigV2 implements NGTriggerInterface {`
`29`	`29`	`String pipelineIdentifier;`
`30`	`30`	`Map<String, String> tags;`
`31`	`31`	`String inputYaml;`
	`32`	`+ String branch; //newly added`
	`33`	`+ String inputSetRef; //newly added`
`32`	`34`	`NGTriggerSourceV2 source;`
`33`	`35`	`@Builder.Default Boolean enabled = Boolean.TRUE;`
`34`	`36`	`}`