From 8ee5b6f3dd7da14a8f0495a31ab7fe38cd4bad46 Mon Sep 17 00:00:00 2001
From: Balasundaram <balabtech@hotmail.com>
Date: Wed, 8 Dec 2021 16:34:09 -0500
Subject: [PATCH] Adding changes for PR review comments III

Signed-off-by: Balasundaram <balabtech@hotmail.com>
---
 plugins/scaffolder-backend/package.json         |  4 ++--
 .../builtin/publish/gitlabMergeRequest.ts       | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index fe5d61d4d3..21f554779f 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -40,8 +40,8 @@
     "@backstage/plugin-scaffolder-common": "^0.1.1",
     "@backstage/plugin-scaffolder-backend-module-cookiecutter": "^0.1.3",
     "@backstage/types": "^0.1.1",
-    "@gitbeaker/core": "^30.2.0",
-    "@gitbeaker/node": "^30.2.0",
+    "@gitbeaker/core": "^35.1.0",
+    "@gitbeaker/node": "^35.1.0",
     "@octokit/rest": "^18.5.3",
     "@octokit/webhooks": "^9.14.1",
     "@types/express": "^4.17.6",
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
index 8238d040b2..b333b5234d 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
@@ -17,7 +17,8 @@ import { createTemplateAction } from '../../createTemplateAction';
 import { readFile } from 'fs-extra';
 import { Gitlab } from '@gitbeaker/node';
 import globby from 'globby';
-import { CommitAction } from '@gitbeaker/core/dist/types/services/Commits';
+import { Types } from '@gitbeaker/core';
+
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { InputError } from '@backstage/errors';
 import { parseRepoUrl } from './util';
@@ -96,7 +97,11 @@ export const createPublishGitlabMergeRequestAction = (options: {
       const { host } = parseRepoUrl(repoUrl, integrations);
       const integrationConfig = integrations.gitlab.byHost(host);
 
-      const actions: CommitAction[] = [];
+      /*	  const a : Types.CommitAction = {
+		  action: 'create',
+		  filePath: ''
+	  };*/
+      const actions: Types.CommitAction[] = [];
 
       const destinationBranch = ctx.input.branchName;
 
@@ -147,9 +152,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
           ctx.input.projectid,
           destinationBranch,
           String(defaultBranch),
-        ).then(branchResponse => {
-          return branchResponse;
-        });
+        );
       } catch (e) {
         throw new InputError(`The branch creation failed ${e}`);
       }
@@ -168,13 +171,13 @@ export const createPublishGitlabMergeRequestAction = (options: {
       }
 
       try {
-        const mergeRequestUrl: any = await api.MergeRequests.create(
+        const mergeRequestUrl = await api.MergeRequests.create(
           ctx.input.projectid,
           destinationBranch,
           String(defaultBranch),
           ctx.input.title,
           { description: ctx.input.description },
-        ).then(mergeRequest => {
+        ).then((mergeRequest: { web_url: string }) => {
           return mergeRequest.web_url;
         });
         ctx.output('projectid', ctx.input.projectid);