From 7ed2f0d500d95ac46065b4b42d255c9aba0e68fd Mon Sep 17 00:00:00 2001 From: Ken Liang Date: Wed, 1 May 2024 14:51:27 -0400 Subject: [PATCH 1/9] Add additional settings Add squash options and merge method to scaffolder Signed-off-by: Ken Liang Signed-off-by: Zhi Liang --- .../src/actions/gitlab.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts index 22f875ca8d..8649c75323 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts @@ -56,6 +56,8 @@ export function createPublishGitlabAction(options: { auto_devops_enabled?: boolean; ci_config_path?: string; description?: string; + merge_method?: 'merge' | 'rebase_merge' | 'ff'; + squash_option?: 'default_off' | 'default_on' | 'never' | 'always'; topics?: string[]; visibility?: 'private' | 'internal' | 'public'; }; @@ -169,6 +171,16 @@ export function createPublishGitlabAction(options: { description: 'Short project description', type: 'string', }, + merge_method: { + title: 'Merge Method to use', + description: 'Merge Methods (merge, rebase_merge, ff)', + type: 'string', + }, + squash_option: { + title: 'Squash option', + description: 'Set squash option for the project (never, always, default_on, default_off', + type: 'string', + }, topics: { title: 'Topic labels', description: 'Topic labels to apply on the repository', From f884b3d6ab47dd304166da0db0cf4c975e74136e Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 15:33:54 -0400 Subject: [PATCH 2/9] add example for ff merge and squash Signed-off-by: Zhi Liang --- .../src/actions/gitlab.examples.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts index ad032e9017..534177abf6 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts @@ -87,6 +87,25 @@ export const examples: TemplateExample[] = [ ], }), }, + { + description: 'Initializes a GitLab repository with fast forward merge and always squash settings.', + example: yaml.stringify({ + steps: [ + { + id: 'publish', + action: 'publish:gitlab', + name: 'Publish to GitLab', + input: { + repoUrl: 'gitlab.com?repo=project_name&owner=group_name', + settings: { + merge_method: 'ff', + squash_option: 'always', + }, + }, + }, + ], + }), + }, { description: 'Initializes a GitLab repository with branch settings.', example: yaml.stringify({ From e11a28631a9f3e969270702386e3cbd2e98edb42 Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 15:35:01 -0400 Subject: [PATCH 3/9] fix up enum and typos Signed-off-by: Zhi Liang --- .../scaffolder-backend-module-gitlab/src/actions/gitlab.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts index 8649c75323..3dd6cb324d 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts @@ -175,11 +175,13 @@ export function createPublishGitlabAction(options: { title: 'Merge Method to use', description: 'Merge Methods (merge, rebase_merge, ff)', type: 'string', + enum: ['merge', 'rebase_merge', 'ff'], }, squash_option: { title: 'Squash option', - description: 'Set squash option for the project (never, always, default_on, default_off', + description: 'Set squash option for the project (never, always, default_on, default_off)', type: 'string', + enum: ['default_off', 'default_on', 'never', 'always'], }, topics: { title: 'Topic labels', From 69c57590850f0abeb182d059a9cc8a649d3dc6d7 Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 18:11:39 -0400 Subject: [PATCH 4/9] prettier Signed-off-by: Zhi Liang --- .../src/actions/gitlab.examples.ts | 3 ++- plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts index 534177abf6..9746bfabe2 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.examples.ts @@ -88,7 +88,8 @@ export const examples: TemplateExample[] = [ }), }, { - description: 'Initializes a GitLab repository with fast forward merge and always squash settings.', + description: + 'Initializes a GitLab repository with fast forward merge and always squash settings.', example: yaml.stringify({ steps: [ { diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts index 3dd6cb324d..020e8a9c18 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts @@ -179,7 +179,8 @@ export function createPublishGitlabAction(options: { }, squash_option: { title: 'Squash option', - description: 'Set squash option for the project (never, always, default_on, default_off)', + description: + 'Set squash option for the project (never, always, default_on, default_off)', type: 'string', enum: ['default_off', 'default_on', 'never', 'always'], }, From 8fa8a00916413909c12c142dd6c9290f7857a076 Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 18:15:19 -0400 Subject: [PATCH 5/9] Add merge_method and squash_option for project creation Signed-off-by: Zhi Liang --- .changeset/dirty-chairs-march.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/dirty-chairs-march.md diff --git a/.changeset/dirty-chairs-march.md b/.changeset/dirty-chairs-march.md new file mode 100644 index 0000000000..8b4e677b8a --- /dev/null +++ b/.changeset/dirty-chairs-march.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend-module-gitlab': patch +--- + +Add merge_method and squash_option for project creation From c1483e4b4fad92b9e84c8e0d56f8ba77336dd27e Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 19:05:46 -0400 Subject: [PATCH 6/9] add merge_method and squash_options Signed-off-by: Zhi Liang --- .../api-report.md | 308 ++++++++---------- 1 file changed, 141 insertions(+), 167 deletions(-) diff --git a/plugins/scaffolder-backend-module-gitlab/api-report.md b/plugins/scaffolder-backend-module-gitlab/api-report.md index 4fb965eb13..f054136f94 100644 --- a/plugins/scaffolder-backend-module-gitlab/api-report.md +++ b/plugins/scaffolder-backend-module-gitlab/api-report.md @@ -3,6 +3,7 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts + import { BackendFeature } from '@backstage/backend-plugin-api'; import { Config } from '@backstage/config'; import { JsonObject } from '@backstage/types'; @@ -11,188 +12,160 @@ import { TemplateAction } from '@backstage/plugin-scaffolder-node'; // @public export const createGitlabGroupEnsureExistsAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - path: string[]; - repoUrl: string; - token?: string | undefined; - }, - { - groupId?: number | undefined; - } ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +path: string[]; +repoUrl: string; +token?: string | undefined; +}, { +groupId?: number | undefined; +}>; // @public export const createGitlabIssueAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - title: string; - repoUrl: string; - projectId: number; - token?: string | undefined; - assignees?: number[] | undefined; - confidential?: boolean | undefined; - description?: string | undefined; - createdAt?: string | undefined; - dueDate?: string | undefined; - discussionToResolve?: string | undefined; - epicId?: number | undefined; - labels?: string | undefined; - issueType?: IssueType | undefined; - mergeRequestToResolveDiscussionsOf?: number | undefined; - milestoneId?: number | undefined; - weight?: number | undefined; - }, - { - issueUrl: string; - issueId: number; - issueIid: number; - } ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +title: string; +repoUrl: string; +projectId: number; +token?: string | undefined; +assignees?: number[] | undefined; +confidential?: boolean | undefined; +description?: string | undefined; +createdAt?: string | undefined; +dueDate?: string | undefined; +discussionToResolve?: string | undefined; +epicId?: number | undefined; +labels?: string | undefined; +issueType?: IssueType | undefined; +mergeRequestToResolveDiscussionsOf?: number | undefined; +milestoneId?: number | undefined; +weight?: number | undefined; +}, { +issueUrl: string; +issueId: number; +issueIid: number; +}>; // @public export const createGitlabProjectAccessTokenAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - repoUrl: string; - projectId: string | number; - token?: string | undefined; - name?: string | undefined; - accessLevel?: number | undefined; - scopes?: string[] | undefined; - expiresAt?: string | undefined; - }, - { - access_token: string; - } ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +repoUrl: string; +projectId: string | number; +token?: string | undefined; +name?: string | undefined; +accessLevel?: number | undefined; +scopes?: string[] | undefined; +expiresAt?: string | undefined; +}, { +access_token: string; +}>; // @public export const createGitlabProjectDeployTokenAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - name: string; - repoUrl: string; - projectId: string | number; - token?: string | undefined; - username?: string | undefined; - scopes?: string[] | undefined; - }, - { - user: string; - deploy_token: string; - } ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +name: string; +repoUrl: string; +projectId: string | number; +token?: string | undefined; +username?: string | undefined; +scopes?: string[] | undefined; +}, { +user: string; +deploy_token: string; +}>; // @public export const createGitlabProjectVariableAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - key: string; - value: string; - repoUrl: string; - projectId: string | number; - variableType: string; - token?: string | undefined; - variableProtected?: boolean | undefined; - masked?: boolean | undefined; - raw?: boolean | undefined; - environmentScope?: string | undefined; - }, - JsonObject ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +key: string; +value: string; +repoUrl: string; +projectId: string | number; +variableType: string; +token?: string | undefined; +variableProtected?: boolean | undefined; +masked?: boolean | undefined; +raw?: boolean | undefined; +environmentScope?: string | undefined; +}, JsonObject>; // @public export const createGitlabRepoPushAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - repoUrl: string; - branchName: string; - commitMessage: string; - sourcePath?: string | undefined; - targetPath?: string | undefined; - token?: string | undefined; - commitAction?: 'update' | 'delete' | 'create' | undefined; - }, - JsonObject ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +repoUrl: string; +branchName: string; +commitMessage: string; +sourcePath?: string | undefined; +targetPath?: string | undefined; +token?: string | undefined; +commitAction?: "update" | "create" | "delete" | undefined; +}, JsonObject>; // @public export function createPublishGitlabAction(options: { - integrations: ScmIntegrationRegistry; - config: Config; -}): TemplateAction< - { - repoUrl: string; - defaultBranch?: string | undefined; - repoVisibility?: 'internal' | 'private' | 'public' | undefined; - sourcePath?: string | undefined; - token?: string | undefined; - gitCommitMessage?: string | undefined; - gitAuthorName?: string | undefined; - gitAuthorEmail?: string | undefined; - setUserAsOwner?: boolean | undefined; - topics?: string[] | undefined; - settings?: - | { - path?: string | undefined; - auto_devops_enabled?: boolean | undefined; - ci_config_path?: string | undefined; - description?: string | undefined; - topics?: string[] | undefined; - visibility?: 'internal' | 'private' | 'public' | undefined; - } - | undefined; - branches?: - | { - name: string; - protect?: boolean | undefined; - create?: boolean | undefined; - ref?: string | undefined; - }[] - | undefined; - projectVariables?: - | { - key: string; - value: string; - description?: string | undefined; - variable_type?: string | undefined; - protected?: boolean | undefined; - masked?: boolean | undefined; - raw?: boolean | undefined; - environment_scope?: string | undefined; - }[] - | undefined; - }, - JsonObject ->; + integrations: ScmIntegrationRegistry; + config: Config; +}): TemplateAction< { +repoUrl: string; +defaultBranch?: string | undefined; +repoVisibility?: "internal" | "private" | "public" | undefined; +sourcePath?: string | undefined; +token?: string | undefined; +gitCommitMessage?: string | undefined; +gitAuthorName?: string | undefined; +gitAuthorEmail?: string | undefined; +setUserAsOwner?: boolean | undefined; +topics?: string[] | undefined; +settings?: { +path?: string | undefined; +auto_devops_enabled?: boolean | undefined; +ci_config_path?: string | undefined; +description?: string | undefined; +merge_method?: "merge" | "ff" | "rebase_merge" | undefined; +squash_option?: "always" | "never" | "default_on" | "default_off" | undefined; +topics?: string[] | undefined; +visibility?: "internal" | "private" | "public" | undefined; +} | undefined; +branches?: { +name: string; +protect?: boolean | undefined; +create?: boolean | undefined; +ref?: string | undefined; +}[] | undefined; +projectVariables?: { +key: string; +value: string; +description?: string | undefined; +variable_type?: string | undefined; +protected?: boolean | undefined; +masked?: boolean | undefined; +raw?: boolean | undefined; +environment_scope?: string | undefined; +}[] | undefined; +}, JsonObject>; // @public export const createPublishGitlabMergeRequestAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< - { - repoUrl: string; - title: string; - description: string; - branchName: string; - targetBranchName?: string | undefined; - sourcePath?: string | undefined; - targetPath?: string | undefined; - token?: string | undefined; - commitAction?: 'update' | 'delete' | 'create' | undefined; - projectid?: string | undefined; - removeSourceBranch?: boolean | undefined; - assignee?: string | undefined; - }, - JsonObject ->; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< { +repoUrl: string; +title: string; +description: string; +branchName: string; +targetBranchName?: string | undefined; +sourcePath?: string | undefined; +targetPath?: string | undefined; +token?: string | undefined; +commitAction?: "update" | "create" | "delete" | undefined; +projectid?: string | undefined; +removeSourceBranch?: boolean | undefined; +assignee?: string | undefined; +}, JsonObject>; // @public const gitlabModule: () => BackendFeature; @@ -200,11 +173,12 @@ export default gitlabModule; // @public export enum IssueType { - // (undocumented) - INCIDENT = 'incident', - // (undocumented) - ISSUE = 'issue', - // (undocumented) - TEST = 'test_case', + // (undocumented) + INCIDENT = "incident", + // (undocumented) + ISSUE = "issue", + // (undocumented) + TEST = "test_case" } + ``` From f5f7edafd613e28efbd1eb0f685c5f76238d6412 Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Wed, 1 May 2024 19:22:17 -0400 Subject: [PATCH 7/9] fix changelog method Signed-off-by: Zhi Liang --- .changeset/dirty-chairs-march.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/dirty-chairs-march.md b/.changeset/dirty-chairs-march.md index 8b4e677b8a..c4e22657a6 100644 --- a/.changeset/dirty-chairs-march.md +++ b/.changeset/dirty-chairs-march.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder-backend-module-gitlab': patch --- -Add merge_method and squash_option for project creation +Add merge method and squash option for project creation From 31695c4a13b6a0fe78a048a8b82c7e94aa8a86ce Mon Sep 17 00:00:00 2001 From: Zhi Liang Date: Thu, 2 May 2024 10:09:48 -0400 Subject: [PATCH 8/9] fix prettier formatting Signed-off-by: Zhi Liang --- .../api-report.md | 315 ++++++++++-------- 1 file changed, 174 insertions(+), 141 deletions(-) diff --git a/plugins/scaffolder-backend-module-gitlab/api-report.md b/plugins/scaffolder-backend-module-gitlab/api-report.md index f054136f94..1f43509047 100644 --- a/plugins/scaffolder-backend-module-gitlab/api-report.md +++ b/plugins/scaffolder-backend-module-gitlab/api-report.md @@ -3,7 +3,6 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts - import { BackendFeature } from '@backstage/backend-plugin-api'; import { Config } from '@backstage/config'; import { JsonObject } from '@backstage/types'; @@ -12,160 +11,195 @@ import { TemplateAction } from '@backstage/plugin-scaffolder-node'; // @public export const createGitlabGroupEnsureExistsAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -path: string[]; -repoUrl: string; -token?: string | undefined; -}, { -groupId?: number | undefined; -}>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + path: string[]; + repoUrl: string; + token?: string | undefined; + }, + { + groupId?: number | undefined; + } +>; // @public export const createGitlabIssueAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -title: string; -repoUrl: string; -projectId: number; -token?: string | undefined; -assignees?: number[] | undefined; -confidential?: boolean | undefined; -description?: string | undefined; -createdAt?: string | undefined; -dueDate?: string | undefined; -discussionToResolve?: string | undefined; -epicId?: number | undefined; -labels?: string | undefined; -issueType?: IssueType | undefined; -mergeRequestToResolveDiscussionsOf?: number | undefined; -milestoneId?: number | undefined; -weight?: number | undefined; -}, { -issueUrl: string; -issueId: number; -issueIid: number; -}>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + title: string; + repoUrl: string; + projectId: number; + token?: string | undefined; + assignees?: number[] | undefined; + confidential?: boolean | undefined; + description?: string | undefined; + createdAt?: string | undefined; + dueDate?: string | undefined; + discussionToResolve?: string | undefined; + epicId?: number | undefined; + labels?: string | undefined; + issueType?: IssueType | undefined; + mergeRequestToResolveDiscussionsOf?: number | undefined; + milestoneId?: number | undefined; + weight?: number | undefined; + }, + { + issueUrl: string; + issueId: number; + issueIid: number; + } +>; // @public export const createGitlabProjectAccessTokenAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -repoUrl: string; -projectId: string | number; -token?: string | undefined; -name?: string | undefined; -accessLevel?: number | undefined; -scopes?: string[] | undefined; -expiresAt?: string | undefined; -}, { -access_token: string; -}>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + repoUrl: string; + projectId: string | number; + token?: string | undefined; + name?: string | undefined; + accessLevel?: number | undefined; + scopes?: string[] | undefined; + expiresAt?: string | undefined; + }, + { + access_token: string; + } +>; // @public export const createGitlabProjectDeployTokenAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -name: string; -repoUrl: string; -projectId: string | number; -token?: string | undefined; -username?: string | undefined; -scopes?: string[] | undefined; -}, { -user: string; -deploy_token: string; -}>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + name: string; + repoUrl: string; + projectId: string | number; + token?: string | undefined; + username?: string | undefined; + scopes?: string[] | undefined; + }, + { + user: string; + deploy_token: string; + } +>; // @public export const createGitlabProjectVariableAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -key: string; -value: string; -repoUrl: string; -projectId: string | number; -variableType: string; -token?: string | undefined; -variableProtected?: boolean | undefined; -masked?: boolean | undefined; -raw?: boolean | undefined; -environmentScope?: string | undefined; -}, JsonObject>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + key: string; + value: string; + repoUrl: string; + projectId: string | number; + variableType: string; + token?: string | undefined; + variableProtected?: boolean | undefined; + masked?: boolean | undefined; + raw?: boolean | undefined; + environmentScope?: string | undefined; + }, + JsonObject +>; // @public export const createGitlabRepoPushAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -repoUrl: string; -branchName: string; -commitMessage: string; -sourcePath?: string | undefined; -targetPath?: string | undefined; -token?: string | undefined; -commitAction?: "update" | "create" | "delete" | undefined; -}, JsonObject>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + repoUrl: string; + branchName: string; + commitMessage: string; + sourcePath?: string | undefined; + targetPath?: string | undefined; + token?: string | undefined; + commitAction?: 'update' | 'create' | 'delete' | undefined; + }, + JsonObject +>; // @public export function createPublishGitlabAction(options: { - integrations: ScmIntegrationRegistry; - config: Config; -}): TemplateAction< { -repoUrl: string; -defaultBranch?: string | undefined; -repoVisibility?: "internal" | "private" | "public" | undefined; -sourcePath?: string | undefined; -token?: string | undefined; -gitCommitMessage?: string | undefined; -gitAuthorName?: string | undefined; -gitAuthorEmail?: string | undefined; -setUserAsOwner?: boolean | undefined; -topics?: string[] | undefined; -settings?: { -path?: string | undefined; -auto_devops_enabled?: boolean | undefined; -ci_config_path?: string | undefined; -description?: string | undefined; -merge_method?: "merge" | "ff" | "rebase_merge" | undefined; -squash_option?: "always" | "never" | "default_on" | "default_off" | undefined; -topics?: string[] | undefined; -visibility?: "internal" | "private" | "public" | undefined; -} | undefined; -branches?: { -name: string; -protect?: boolean | undefined; -create?: boolean | undefined; -ref?: string | undefined; -}[] | undefined; -projectVariables?: { -key: string; -value: string; -description?: string | undefined; -variable_type?: string | undefined; -protected?: boolean | undefined; -masked?: boolean | undefined; -raw?: boolean | undefined; -environment_scope?: string | undefined; -}[] | undefined; -}, JsonObject>; + integrations: ScmIntegrationRegistry; + config: Config; +}): TemplateAction< + { + repoUrl: string; + defaultBranch?: string | undefined; + repoVisibility?: 'internal' | 'private' | 'public' | undefined; + sourcePath?: string | undefined; + token?: string | undefined; + gitCommitMessage?: string | undefined; + gitAuthorName?: string | undefined; + gitAuthorEmail?: string | undefined; + setUserAsOwner?: boolean | undefined; + topics?: string[] | undefined; + settings?: + | { + path?: string | undefined; + auto_devops_enabled?: boolean | undefined; + ci_config_path?: string | undefined; + description?: string | undefined; + merge_method?: 'merge' | 'ff' | 'rebase_merge' | undefined; + squash_option?: + | 'always' + | 'never' + | 'default_on' + | 'default_off' + | undefined; + topics?: string[] | undefined; + visibility?: 'internal' | 'private' | 'public' | undefined; + } + | undefined; + branches?: + | { + name: string; + protect?: boolean | undefined; + create?: boolean | undefined; + ref?: string | undefined; + }[] + | undefined; + projectVariables?: + | { + key: string; + value: string; + description?: string | undefined; + variable_type?: string | undefined; + protected?: boolean | undefined; + masked?: boolean | undefined; + raw?: boolean | undefined; + environment_scope?: string | undefined; + }[] + | undefined; + }, + JsonObject +>; // @public export const createPublishGitlabMergeRequestAction: (options: { - integrations: ScmIntegrationRegistry; -}) => TemplateAction< { -repoUrl: string; -title: string; -description: string; -branchName: string; -targetBranchName?: string | undefined; -sourcePath?: string | undefined; -targetPath?: string | undefined; -token?: string | undefined; -commitAction?: "update" | "create" | "delete" | undefined; -projectid?: string | undefined; -removeSourceBranch?: boolean | undefined; -assignee?: string | undefined; -}, JsonObject>; + integrations: ScmIntegrationRegistry; +}) => TemplateAction< + { + repoUrl: string; + title: string; + description: string; + branchName: string; + targetBranchName?: string | undefined; + sourcePath?: string | undefined; + targetPath?: string | undefined; + token?: string | undefined; + commitAction?: 'update' | 'create' | 'delete' | undefined; + projectid?: string | undefined; + removeSourceBranch?: boolean | undefined; + assignee?: string | undefined; + }, + JsonObject +>; // @public const gitlabModule: () => BackendFeature; @@ -173,12 +207,11 @@ export default gitlabModule; // @public export enum IssueType { - // (undocumented) - INCIDENT = "incident", - // (undocumented) - ISSUE = "issue", - // (undocumented) - TEST = "test_case" + // (undocumented) + INCIDENT = 'incident', + // (undocumented) + ISSUE = 'issue', + // (undocumented) + TEST = 'test_case', } - ``` From f73bd268715c913f68375517e230108e2ba997df Mon Sep 17 00:00:00 2001 From: blam Date: Mon, 6 May 2024 15:40:07 +0200 Subject: [PATCH 9/9] chore: update api-reports Signed-off-by: blam --- plugins/scaffolder-backend-module-gitlab/api-report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder-backend-module-gitlab/api-report.md b/plugins/scaffolder-backend-module-gitlab/api-report.md index 1f43509047..ca98aa558b 100644 --- a/plugins/scaffolder-backend-module-gitlab/api-report.md +++ b/plugins/scaffolder-backend-module-gitlab/api-report.md @@ -118,7 +118,7 @@ export const createGitlabRepoPushAction: (options: { sourcePath?: string | undefined; targetPath?: string | undefined; token?: string | undefined; - commitAction?: 'update' | 'create' | 'delete' | undefined; + commitAction?: 'update' | 'delete' | 'create' | undefined; }, JsonObject >; @@ -193,7 +193,7 @@ export const createPublishGitlabMergeRequestAction: (options: { sourcePath?: string | undefined; targetPath?: string | undefined; token?: string | undefined; - commitAction?: 'update' | 'create' | 'delete' | undefined; + commitAction?: 'update' | 'delete' | 'create' | undefined; projectid?: string | undefined; removeSourceBranch?: boolean | undefined; assignee?: string | undefined;