chore(scaffolder): split bitbucket module into bitbucket-cloud/-server modules

Relates-to: PR #22323
Signed-off-by: Patrick Jungermann <Patrick.Jungermann@gmail.com>

.changeset/cold-cheetahs-pull.md

@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-server': minor
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+New scaffolder module `@backstage/plugin-scaffolder-backend-module-bitbucket-server`.
+
+Extracted from `@backstage/plugin-scaffolder-backend-module-bitbucket`
+and replaces its actions related to Bitbucket Server.
+
+- `publish:bitbucketServer`
+- `publish:bitbucketServer:pull-request`

.changeset/flat-roses-happen.md

@@ -0,0 +1,17 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket': minor
+---
+
+Split `@backstage/plugin-scaffolder-backend-module-bitbucket` into
+`@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` and
+`@backstage/plugin-scaffolder-backend-module-bitbucket-server`.
+
+`@backstage/plugin-scaffolder-backend-module-bitbucket` was **deprecated** in favor of these two replacements.
+
+Please use any of the two replacements depending on your needs.
+
+```diff
+- backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket'));
++ backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket-cloud'));
++ backend.add(import('@backstage/plugin-scaffolder-backend-module-bitbucket-server'));
+```

.changeset/shiny-apes-glow.md

@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': minor
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+New scaffolder module `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud`.
+
+Extracted from `@backstage/plugin-scaffolder-backend-module-bitbucket`
+and replaces its actions related to Bitbucket Cloud.
+
+- `publish:bitbucketCloud`
+- `bitbucket:pipelines:run`

plugins/scaffolder-backend-module-bitbucket-cloud/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);

plugins/scaffolder-backend-module-bitbucket-cloud/README.md

@@ -0,0 +1,11 @@
+# @backstage/plugin-scaffolder-backend-module-bitbucket
+
+The [Bitbucket Cloud](https://bitbucket.org) module for
+[@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+
+_This plugin was created through the Backstage CLI_
+
+## Actions
+
+- `publish:bitbucketCloud`
+- `bitbucket:pipelines:run`

plugins/scaffolder-backend-module-bitbucket-cloud/api-report.md

@@ -0,0 +1,44 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud"
+
+> 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';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+// @public
+const bitbucketCloudModule: () => BackendFeature;
+export default bitbucketCloudModule;
+
+// @public
+export const createBitbucketPipelinesRunAction: (options: {
+  integrations: ScmIntegrationRegistry;
+}) => TemplateAction<
+  {
+    workspace: string;
+    repo_slug: string;
+    body?: object | undefined;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+
+// @public
+export function createPublishBitbucketCloudAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    description?: string | undefined;
+    defaultBranch?: string | undefined;
+    repoVisibility?: 'private' | 'public' | undefined;
+    sourcePath?: string | undefined;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+```

plugins/scaffolder-backend-module-bitbucket-cloud/catalog-info.yaml

@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-bitbucket-cloud
+  title: '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud'
+  description: The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers

plugins/scaffolder-backend-module-bitbucket-cloud/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
+  "description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
+  "version": "0.0.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "fs-extra": "10.1.0",
+    "node-fetch": "^2.6.7",
+    "yaml": "^2.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist"
+  ]
+}

plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/index.ts

@@ -13,8 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './bitbucket';
 export * from './bitbucketCloud';
-export * from './bitbucketServer';
-export * from './bitbucketServerPullRequest';
 export { createBitbucketPipelinesRunAction } from './bitbucketCloudPipelinesRun';

plugins/scaffolder-backend-module-bitbucket-cloud/src/index.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A module for the scaffolder backend that lets you interact with Bitbucket Cloud
+ *
+ * @packageDocumentation
+ */
+
+export * from './actions';
+export { bitbucketCloudModule as default } from './module';

plugins/scaffolder-backend-module-bitbucket-cloud/src/module.ts

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import {
+  createBitbucketPipelinesRunAction,
+  createPublishBitbucketCloudAction,
+} from './actions';
+import { ScmIntegrations } from '@backstage/integration';
+
+/**
+ * @public
+ * The Bitbucket Cloud Module for the Scaffolder Backend
+ */
+export const bitbucketCloudModule = createBackendModule({
+  moduleId: 'bitbucketCloud',
+  pluginId: 'scaffolder',
+  register({ registerInit }) {
+    registerInit({
+      deps: {
+        scaffolder: scaffolderActionsExtensionPoint,
+        config: coreServices.rootConfig,
+      },
+      async init({ scaffolder, config }) {
+        const integrations = ScmIntegrations.fromConfig(config);
+
+        scaffolder.addActions(
+          createPublishBitbucketCloudAction({ integrations, config }),
+          createBitbucketPipelinesRunAction({ integrations }),
+        );
+      },
+    });
+  },
+});

plugins/scaffolder-backend-module-bitbucket-server/.eslintrc.js

@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);

plugins/scaffolder-backend-module-bitbucket-server/README.md

@@ -0,0 +1,9 @@
+# @backstage/plugin-scaffolder-backend-module-bitbucket-server
+
+The Bitbucket Server module for
+[@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+
+## Actions
+
+- `publish:bitbucketServer`
+- `publish:bitbucketServer:pull-request`

plugins/scaffolder-backend-module-bitbucket-server/api-report.md

@@ -0,0 +1,51 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-bitbucket-server"
+
+> 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';
+import { ScmIntegrationRegistry } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+// @public
+const bitbucketServerModule: () => BackendFeature;
+export default bitbucketServerModule;
+
+// @public
+export function createPublishBitbucketServerAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    description?: string | undefined;
+    defaultBranch?: string | undefined;
+    repoVisibility?: 'private' | 'public' | undefined;
+    sourcePath?: string | undefined;
+    enableLFS?: boolean | undefined;
+    token?: string | undefined;
+    gitCommitMessage?: string | undefined;
+    gitAuthorName?: string | undefined;
+    gitAuthorEmail?: string | undefined;
+  },
+  JsonObject
+>;
+
+// @public
+export function createPublishBitbucketServerPullRequestAction(options: {
+  integrations: ScmIntegrationRegistry;
+  config: Config;
+}): TemplateAction<
+  {
+    repoUrl: string;
+    title: string;
+    description?: string | undefined;
+    targetBranch?: string | undefined;
+    sourceBranch: string;
+    token?: string | undefined;
+  },
+  JsonObject
+>;
+```

plugins/scaffolder-backend-module-bitbucket-server/catalog-info.yaml

@@ -0,0 +1,10 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: backstage-plugin-scaffolder-backend-module-bitbucket-server
+  title: '@backstage/plugin-scaffolder-backend-module-bitbucket-server'
+  description: The Bitbucket Server module for @backstage/plugin-scaffolder-backend
+spec:
+  lifecycle: experimental
+  type: backstage-backend-plugin-module
+  owner: maintainers

plugins/scaffolder-backend-module-bitbucket-server/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
+  "description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
+  "version": "0.0.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public"
+  },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
+  "exports": {
+    ".": "./src/index.ts",
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "package.json": [
+        "package.json"
+      ]
+    }
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/backend-common": "workspace:^",
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "fs-extra": "10.1.0",
+    "node-fetch": "^2.6.7",
+    "yaml": "^2.0.0"
+  },
+  "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "msw": "^1.0.0"
+  },
+  "files": [
+    "dist"
+  ]
+}

plugins/scaffolder-backend-module-bitbucket-server/src/actions/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './bitbucketServer';
+export * from './bitbucketServerPullRequest';

plugins/scaffolder-backend-module-bitbucket-server/src/index.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A module for the scaffolder backend that lets you interact with Bitbucket Server
+ *
+ * @packageDocumentation
+ */
+
+export * from './actions';
+export { bitbucketServerModule as default } from './module';

plugins/scaffolder-backend-module-bitbucket-server/src/module.ts

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
+import {
+  createPublishBitbucketServerAction,
+  createPublishBitbucketServerPullRequestAction,
+} from './actions';
+import { ScmIntegrations } from '@backstage/integration';
+
+/**
+ * @public
+ * The Bitbucket Server Module for the Scaffolder Backend
+ */
+export const bitbucketServerModule = createBackendModule({
+  moduleId: 'bitbucketServer',
+  pluginId: 'scaffolder',
+  register({ registerInit }) {
+    registerInit({
+      deps: {
+        scaffolder: scaffolderActionsExtensionPoint,
+        config: coreServices.rootConfig,
+      },
+      async init({ scaffolder, config }) {
+        const integrations = ScmIntegrations.fromConfig(config);
+
+        scaffolder.addActions(
+          createPublishBitbucketServerAction({ integrations, config }),
+          createPublishBitbucketServerPullRequestAction({
+            integrations,
+            config,
+          }),
+        );
+      },
+    });
+  },
+});

plugins/scaffolder-backend-module-bitbucket/README.md

@@ -1,5 +1,8 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket
 
-The bitbucket module for [@backstage/plugin-scaffolder-backend](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend).
+**Deprecated!**
 
-_This plugin was created through the Backstage CLI_
+Please use one of the following modules instead:
+
+- [@backstage/plugin-scaffolder-backend-module-bitbucket-cloud](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-cloud)
+- [@backstage/plugin-scaffolder-backend-module-bitbucket-server](https://www.npmjs.com/package/@backstage/plugin-scaffolder-backend-module-bitbucket-server).

plugins/scaffolder-backend-module-bitbucket/api-report.md

@@ -4,16 +4,18 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import { Config } from '@backstage/config';
 import { JsonObject } from '@backstage/types';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
-// @public
+// @public @deprecated
 const bitbucketModule: () => BackendFeature;
 export default bitbucketModule;
 
-// @public
+// @public @deprecated (undocumented)
 export const createBitbucketPipelinesRunAction: (options: {
   integrations: ScmIntegrationRegistry;
 }) => TemplateAction<
@@ -46,55 +48,12 @@ export function createPublishBitbucketAction(options: {
   JsonObject
 >;
 
-// @public
-export function createPublishBitbucketCloudAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    description?: string | undefined;
-    defaultBranch?: string | undefined;
-    repoVisibility?: 'private' | 'public' | undefined;
-    sourcePath?: string | undefined;
-    token?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketCloudAction: typeof bitbucketCloud.createPublishBitbucketCloudAction;
 
-// @public
-export function createPublishBitbucketServerAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    description?: string | undefined;
-    defaultBranch?: string | undefined;
-    repoVisibility?: 'private' | 'public' | undefined;
-    sourcePath?: string | undefined;
-    enableLFS?: boolean | undefined;
-    token?: string | undefined;
-    gitCommitMessage?: string | undefined;
-    gitAuthorName?: string | undefined;
-    gitAuthorEmail?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketServerAction: typeof bitbucketServer.createPublishBitbucketServerAction;
 
-// @public
-export function createPublishBitbucketServerPullRequestAction(options: {
-  integrations: ScmIntegrationRegistry;
-  config: Config;
-}): TemplateAction<
-  {
-    repoUrl: string;
-    title: string;
-    description?: string | undefined;
-    targetBranch?: string | undefined;
-    sourceBranch: string;
-    token?: string | undefined;
-  },
-  JsonObject
->;
+// @public @deprecated (undocumented)
+export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
 ```

plugins/scaffolder-backend-module-bitbucket/package.json

@@ -2,6 +2,7 @@
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
   "description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
   "version": "0.1.2-next.1",
+  "deprecated": true,
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -37,6 +38,8 @@
     "@backstage/config": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "10.1.0",
     "node-fetch": "^2.6.7",

plugins/scaffolder-backend-module-bitbucket/src/actions/bitbucket.ts

@@ -202,7 +202,7 @@ const performEnableLFS = async (opts: {
  * Creates a new action that initializes a git repository of the content in the workspace
  * and publishes it to Bitbucket.
  * @public
- * @deprecated in favor of createPublishBitbucketCloudAction and createPublishBitbucketServerAction
+ * @deprecated in favor of "createPublishBitbucketCloudAction" by \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud and "createPublishBitbucketServerAction" by \@backstage/plugin-scaffolder-backend-module-bitbucket-server
  */
 export function createPublishBitbucketAction(options: {
   integrations: ScmIntegrationRegistry;

plugins/scaffolder-backend-module-bitbucket/src/deprecated.ts

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
+
+export { createPublishBitbucketAction } from './actions/bitbucket';
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ */
+export const createPublishBitbucketCloudAction =
+  bitbucketCloud.createPublishBitbucketCloudAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
+ */
+export const createBitbucketPipelinesRunAction =
+  bitbucketCloud.createBitbucketPipelinesRunAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ */
+export const createPublishBitbucketServerAction =
+  bitbucketServer.createPublishBitbucketServerAction;
+
+/**
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
+ */
+export const createPublishBitbucketServerPullRequestAction =
+  bitbucketServer.createPublishBitbucketServerPullRequestAction;

plugins/scaffolder-backend-module-bitbucket/src/index.ts

@@ -20,5 +20,5 @@
  * @packageDocumentation
  */
 
-export * from './actions';
+export * from './deprecated';
 export { bitbucketModule as default } from './module';

plugins/scaffolder-backend-module-bitbucket/src/module.ts

@@ -23,12 +23,13 @@ import {
   createPublishBitbucketCloudAction,
   createPublishBitbucketServerAction,
   createPublishBitbucketServerPullRequestAction,
-} from './actions';
+} from './deprecated';
 import { ScmIntegrations } from '@backstage/integration';
 
 /**
- * @public
  * The Bitbucket Module for the Scaffolder Backend
+ * @public
+ * @deprecated use module by \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud or \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const bitbucketModule = createBackendModule({
   moduleId: 'bitbucket',

plugins/scaffolder-backend/api-report.md

@@ -6,6 +6,8 @@
 import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-node';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { Duration } from 'luxon';
@@ -238,13 +240,13 @@ export const createPublishAzureAction: typeof azure.createPublishAzureAction;
 export const createPublishBitbucketAction: typeof bitbucket.createPublishBitbucketAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketCloudAction: typeof bitbucket.createPublishBitbucketCloudAction;
+export const createPublishBitbucketCloudAction: typeof bitbucketCloud.createPublishBitbucketCloudAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerAction: typeof bitbucket.createPublishBitbucketServerAction;
+export const createPublishBitbucketServerAction: typeof bitbucketServer.createPublishBitbucketServerAction;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerPullRequestAction: typeof bitbucket.createPublishBitbucketServerPullRequestAction;
+export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
 
 // @public @deprecated (undocumented)
 export const createPublishGerritAction: typeof gerrit.createPublishGerritAction;

plugins/scaffolder-backend/package.json

@@ -61,6 +61,8 @@
     "@backstage/plugin-permission-node": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^",
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-github": "workspace:^",
     "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^",

plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts

@@ -55,13 +55,17 @@ import {
 
 import { createPublishAzureAction } from '@backstage/plugin-scaffolder-backend-module-azure';
 
+import { createPublishBitbucketAction } from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+
 import {
-  createPublishBitbucketAction,
   createPublishBitbucketCloudAction,
+  createBitbucketPipelinesRunAction,
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+
+import {
   createPublishBitbucketServerAction,
   createPublishBitbucketServerPullRequestAction,
-  createBitbucketPipelinesRunAction,
-} from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 
 import {
   createPublishGerritAction,

plugins/scaffolder-backend/src/scaffolder/actions/deprecated.ts

@@ -17,6 +17,8 @@ import * as github from '@backstage/plugin-scaffolder-backend-module-github';
 import * as gitlab from '@backstage/plugin-scaffolder-backend-module-gitlab';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import * as bitbucketServer from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
 import * as gerrit from '@backstage/plugin-scaffolder-backend-module-gerrit';
 
 /**
@@ -75,28 +77,28 @@ export const createPublishGithubPullRequestAction =
   github.createPublishGithubPullRequestAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use "createPublishBitbucketCloudAction" from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud or "createPublishBitbucketServerAction" from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketAction =
   bitbucket.createPublishBitbucketAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-cloud instead
  */
 export const createPublishBitbucketCloudAction =
-  bitbucket.createPublishBitbucketCloudAction;
+  bitbucketCloud.createPublishBitbucketCloudAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketServerAction =
-  bitbucket.createPublishBitbucketServerAction;
+  bitbucketServer.createPublishBitbucketServerAction;
 
 /**
- * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket instead
+ * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-bitbucket-server instead
  */
 export const createPublishBitbucketServerPullRequestAction =
-  bitbucket.createPublishBitbucketServerPullRequestAction;
+  bitbucketServer.createPublishBitbucketServerPullRequestAction;
 
 /**
  * @public @deprecated use import from \@backstage/plugin-scaffolder-backend-module-azure instead

yarn.lock

@@ -8285,6 +8285,44 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:plugins/scaffolder-backend-module-bitbucket-cloud":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud@workspace:plugins/scaffolder-backend-module-bitbucket-cloud"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    fs-extra: 10.1.0
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:plugins/scaffolder-backend-module-bitbucket-server":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket-server@workspace:plugins/scaffolder-backend-module-bitbucket-server"
+  dependencies:
+    "@backstage/backend-common": "workspace:^"
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    fs-extra: 10.1.0
+    msw: ^1.0.0
+    node-fetch: ^2.6.7
+    yaml: ^2.0.0
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:^, @backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-bitbucket@workspace:plugins/scaffolder-backend-module-bitbucket"
@@ -8296,6 +8334,8 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^"
     "@backstage/plugin-scaffolder-node": "workspace:^"
     fs-extra: 10.1.0
     msw: ^1.0.0
@@ -8485,6 +8525,8 @@ __metadata:
     "@backstage/plugin-permission-node": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-azure": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-bitbucket": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud": "workspace:^"
+    "@backstage/plugin-scaffolder-backend-module-bitbucket-server": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-gerrit": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-github": "workspace:^"
     "@backstage/plugin-scaffolder-backend-module-gitlab": "workspace:^"