fix(scaffolder-backend): use the right key when initializing a Gitlab…

… client Signed-off-by: djamaile <rdjamaile@gmail.com>
backstage · Feb 3, 2022 · 2bd5f24 · 2bd5f24
1 parent d5b6653
commit 2bd5f24
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.changeset/seven-teachers-arrive.md b/.changeset/seven-teachers-arrive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+fix for the gitlab:publish action to use the `oauthToken` key when creating a Gilab client. This only happens if ctx.input.token is provided else the key `token` will be used.
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
@@ -112,10 +112,11 @@ export function createPublishGitlabAction(options: {
       }
 
       const token = ctx.input.token || integrationConfig.config.token!;
+      const tokenType = ctx.input.token ? 'oauthToken' : 'token';
 
       const client = new Gitlab({
         host: integrationConfig.config.baseUrl,
-        token,
+        [tokenType]: token,
       });
 
       let { id: targetNamespace } = (await client.Namespaces.show(owner)) as {

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
@@ -118,10 +118,11 @@ export const createPublishGitlabMergeRequestAction = (options: {
       }
 
       const token = ctx.input.token ?? integrationConfig.config.token!;
+      const tokenType = ctx.input.token ? 'oauthToken' : 'token';
 
       const api = new Gitlab({
         host: integrationConfig.config.baseUrl,
-        token,
+        [tokenType]: token,
       });
 
       const fileRoot = ctx.workspacePath;