From 0da78e017fc974f7e4b634b11c4a2ce9b35a54b2 Mon Sep 17 00:00:00 2001 From: Ilya Katlinski Date: Tue, 10 Oct 2023 12:49:11 +0200 Subject: [PATCH] chore(comment): fix changeset and move gitlab error processing Signed-off-by: Ilya Katlinski --- .changeset/khaki-tools-tease.md | 2 +- .../src/scaffolder/actions/builtin/helpers.ts | 4 ---- .../src/scaffolder/actions/builtin/publish/gitlab.ts | 6 +++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.changeset/khaki-tools-tease.md b/.changeset/khaki-tools-tease.md index 9b193f9fd8..e4383c9e33 100644 --- a/.changeset/khaki-tools-tease.md +++ b/.changeset/khaki-tools-tease.md @@ -2,7 +2,7 @@ '@backstage/plugin-scaffolder-backend': minor --- -Updated `publish:gitlab`` action properties to support additional Gitlab project settings: +Updated `publish:gitlab` action properties to support additional Gitlab project settings: - general project settings provided by gitlab project create API (new `settings` property) - branch level settings to create additional branches and make them protected (new `branches` property) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts index 1ea3a13687..5ac92128ca 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts @@ -251,7 +251,3 @@ export function getGitCommitMessage( export function entityRefToName(name: string): string { return name.replace(/^.*[:/]/g, ''); } - -export function printGitlabError(error: any): string { - return JSON.stringify({ code: error.code, message: error.description }); -} diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts index 4933ad6e69..6d86841a20 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts @@ -18,7 +18,7 @@ import { InputError } from '@backstage/errors'; import { ScmIntegrationRegistry } from '@backstage/integration'; import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; import { Gitlab } from '@gitbeaker/node'; -import { initRepoAndPush, printGitlabError } from '../helpers'; +import { initRepoAndPush } from '../helpers'; import { getRepoSourceDirectory, parseRepoUrl } from './util'; import { Config } from '@backstage/config'; import { examples } from './gitlab.examples'; @@ -468,3 +468,7 @@ export function createPublishGitlabAction(options: { }, }); } + +function printGitlabError(error: any): string { + return JSON.stringify({ code: error.code, message: error.description }); +}