From 06ab5218f9e8b17bbcc46a359cb3df1c60c7262f Mon Sep 17 00:00:00 2001 From: Patrick Jungermann Date: Sun, 10 Apr 2022 02:33:42 +0200 Subject: [PATCH] feat: add new integrations bitbucketCloud/Server to ScaffolderClient Relates-to: #9923 Signed-off-by: Patrick Jungermann --- .changeset/breezy-days-prove.md | 5 +++++ plugins/scaffolder/src/api.ts | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .changeset/breezy-days-prove.md diff --git a/.changeset/breezy-days-prove.md b/.changeset/breezy-days-prove.md new file mode 100644 index 0000000000..d3bc3c169e --- /dev/null +++ b/.changeset/breezy-days-prove.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': minor +--- + +Add new bitbucket(Cloud/Server) integrations to ScaffolderClient. diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts index 818ee7971b..6fc456e1fe 100644 --- a/plugins/scaffolder/src/api.ts +++ b/plugins/scaffolder/src/api.ts @@ -75,7 +75,15 @@ export class ScaffolderClient implements ScaffolderApi { ): Promise { const integrations = [ ...this.scmIntegrationsApi.azure.list(), - ...this.scmIntegrationsApi.bitbucket.list(), + ...this.scmIntegrationsApi.bitbucket + .list() + .filter( + item => + !this.scmIntegrationsApi.bitbucketCloud.byHost(item.config.host) && + !this.scmIntegrationsApi.bitbucketServer.byHost(item.config.host), + ), + ...this.scmIntegrationsApi.bitbucketCloud.list(), + ...this.scmIntegrationsApi.bitbucketServer.list(), ...this.scmIntegrationsApi.github.list(), ...this.scmIntegrationsApi.gitlab.list(), ]