From 11e0f625583f09a24c960103ef9cecd10878a5d2 Mon Sep 17 00:00:00 2001 From: Sergey Shevchenko Date: Wed, 17 May 2023 11:37:51 +0300 Subject: [PATCH 1/2] fix: Fix Fix wrong gitlabUrl format in repoUrl input description Signed-off-by: Sergey Shevchenko --- .changeset/modern-dancers-sit.md | 5 +++++ .../src/scaffolder/actions/builtin/publish/gitlab.ts | 1 + .../scaffolder/actions/builtin/publish/gitlabMergeRequest.ts | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .changeset/modern-dancers-sit.md diff --git a/.changeset/modern-dancers-sit.md b/.changeset/modern-dancers-sit.md new file mode 100644 index 0000000000..2f933cf8e2 --- /dev/null +++ b/.changeset/modern-dancers-sit.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': minor +--- + +Fix wrong gitlabUrl format in repoUrl input 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 a621d27d55..4045fd6958 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts @@ -57,6 +57,7 @@ export function createPublishGitlabAction(options: { repoUrl: { title: 'Repository Location', type: 'string', + description: `Accepts the format 'gitlab.com?repo=project_name&owner=group_name' where 'project_name' is the repository name and 'group_name' is a group or username`, }, repoVisibility: { title: 'Repository Visibility', 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 06e056cda3..d802147922 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts @@ -57,7 +57,7 @@ export const createPublishGitlabMergeRequestAction = (options: { repoUrl: { type: 'string', title: 'Repository Location', - description: `Accepts the format 'gitlab.com/group_name/project_name' where 'project_name' is the repository name and 'group_name' is a group or username`, + description: `Accepts the format 'gitlab.com?repo=project_name&owner=group_name' where 'project_name' is the repository name and 'group_name' is a group or username`, }, /** @deprecated projectID is passed as query parameters in the repoUrl */ projectid: { From e6073b7ef3a6af050bfcc6d972e9a0c0773314c3 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 31 May 2023 17:25:18 +0200 Subject: [PATCH 2/2] Update .changeset/modern-dancers-sit.md Signed-off-by: Patrik Oldsberg --- .changeset/modern-dancers-sit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/modern-dancers-sit.md b/.changeset/modern-dancers-sit.md index 2f933cf8e2..5894352707 100644 --- a/.changeset/modern-dancers-sit.md +++ b/.changeset/modern-dancers-sit.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-scaffolder-backend': minor +'@backstage/plugin-scaffolder-backend': patch --- Fix wrong gitlabUrl format in repoUrl input description