Respect commit SHA if provided (cloudposse#19)

zdmytriv · web-flow · commit 32e686802019 · 2023-09-06T00:29:54.000+03:00
diff --git a/dist/index.js b/dist/index.js
@@ -62260,7 +62260,7 @@ class GetTerraformPlanUseCase {
                 const { commitSHA, component, isMergeCommit, stack, planPath, pr, repoName, repoOwner, } = req;
                 let plan;
                 let metadata;
-                if (isMergeCommit) {
+                if (commitSHA && commitSHA != '' && isMergeCommit) {
                     if (!pr) {
                         return (0, infrastructure_1.left)(new infrastructure_1.AppError.UnexpectedError("PR is required for merge commits"));
                     }
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/useCases/getPlan/useCase.ts b/src/useCases/getPlan/useCase.ts
@@ -70,7 +70,7 @@ export class GetTerraformPlanUseCase
       let plan: Uint8Array;
       let metadata: TerraformPlan;
 
-      if (isMergeCommit) {
+      if (commitSHA && commitSHA != '' && isMergeCommit) {
         if (!pr) {
           return left(
             new AppError.UnexpectedError("PR is required for merge commits")

Original file line number	Diff line number	Diff line change
`@@ -62260,7 +62260,7 @@ class GetTerraformPlanUseCase {`
`62260`	`62260`	`const { commitSHA, component, isMergeCommit, stack, planPath, pr, repoName, repoOwner, } = req;`
`62261`	`62261`	`let plan;`
`62262`	`62262`	`let metadata;`
`62263`		`- if (isMergeCommit) {`
	`62263`	`+ if (commitSHA && commitSHA != '' && isMergeCommit) {`
`62264`	`62264`	`if (!pr) {`
`62265`	`62265`	`return (0, infrastructure_1.left)(new infrastructure_1.AppError.UnexpectedError("PR is required for merge commits"));`
`62266`	`62266`	`}`