Fix merge strategy parsing and default value (#1376)

tinglesoftware · Oct 1, 2024 · f7c491c · f7c491c
1 parent b27101f
commit f7c491c
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/extension/tasks/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts
@@ -119,10 +119,20 @@ export class DependabotOutputProcessor implements IDependabotUpdateOutputProcess
           autoComplete: this.taskInputs.setAutoComplete
             ? {
                 ignorePolicyConfigIds: this.taskInputs.autoCompleteIgnoreConfigIds,
-                mergeStrategy:
-                  GitPullRequestMergeStrategy[
-                    this.taskInputs.mergeStrategy as keyof typeof GitPullRequestMergeStrategy
-                  ],
+                mergeStrategy: (() => {
+                  switch (this.taskInputs.mergeStrategy) {
+                    case 'noFastForward':
+                      return GitPullRequestMergeStrategy.NoFastForward;
+                    case 'squash':
+                      return GitPullRequestMergeStrategy.Squash;
+                    case 'rebase':
+                      return GitPullRequestMergeStrategy.Rebase;
+                    case 'rebaseMerge':
+                      return GitPullRequestMergeStrategy.RebaseMerge;
+                    default:
+                      return GitPullRequestMergeStrategy.Squash;
+                  }
+                })(),
               }
             : undefined,
           assignees: update.config.assignees,