From 272651291c9a429c10ab7f6893ff37b7f497c58c Mon Sep 17 00:00:00 2001 From: John Redwood Date: Sun, 19 Oct 2025 20:55:35 +1100 Subject: [PATCH] fix: #31333 gitlabProjectDeployTokenCreate doesn't support oauth tokens Signed-off-by: John Redwood --- .../src/actions/gitlabProjectDeployTokenCreate.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts index ad7f98483d..d35475c36d 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabProjectDeployTokenCreate.ts @@ -17,8 +17,8 @@ import { InputError } from '@backstage/errors'; import { ScmIntegrationRegistry } from '@backstage/integration'; import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; -import { DeployTokenScope, Gitlab } from '@gitbeaker/rest'; -import { getToken } from '../util'; +import { DeployTokenScope } from '@gitbeaker/rest'; +import { getClient, parseRepoUrl } from '../util'; import { examples } from './gitlabProjectDeployTokenCreate.examples'; /** @@ -78,8 +78,7 @@ export const createGitlabProjectDeployTokenAction = (options: { }, async handler(ctx) { ctx.logger.info(`Creating Token for Project "${ctx.input.projectId}"`); - const { projectId, name, username, scopes } = ctx.input; - const { token, integrationConfig } = getToken(ctx.input, integrations); + const { projectId, name, username, scopes, repoUrl, token } = ctx.input; if (scopes.length === 0) { throw new InputError( @@ -87,10 +86,8 @@ export const createGitlabProjectDeployTokenAction = (options: { ); } - const api = new Gitlab({ - host: integrationConfig.config.baseUrl, - token: token, - }); + const { host } = parseRepoUrl(repoUrl, integrations); + const api = getClient({ host, integrations, token }); const { deployToken, deployUsername } = await ctx.checkpoint({ key: `create.deploy.token.${projectId}.${name}`,