chore: fixing issue with api-extractor reports

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder-backend/report.api.md

@@ -9,14 +9,27 @@ import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-n
 import { AuditorService } from '@backstage/backend-plugin-api';
 import { AuthService } from '@backstage/backend-plugin-api';
 import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
-import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
-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 { createGithubActionsDispatchAction as createGithubActionsDispatchAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubDeployKeyAction as createGithubDeployKeyAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubEnvironmentAction as createGithubEnvironmentAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubIssuesLabelAction as createGithubIssuesLabelAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { CreateGithubPullRequestActionOptions as CreateGithubPullRequestActionOptions_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubRepoCreateAction as createGithubRepoCreateAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubRepoPushAction as createGithubRepoPushAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createGithubWebhookAction as createGithubWebhookAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createPublishAzureAction as createPublishAzureAction_2 } from '@backstage/plugin-scaffolder-backend-module-azure';
+import { createPublishBitbucketAction as createPublishBitbucketAction_2 } from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+import { createPublishBitbucketCloudAction as createPublishBitbucketCloudAction_2 } from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+import { createPublishBitbucketServerAction as createPublishBitbucketServerAction_2 } from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
+import { createPublishBitbucketServerPullRequestAction as createPublishBitbucketServerPullRequestAction_2 } from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
+import { createPublishGerritAction as createPublishGerritAction_2 } from '@backstage/plugin-scaffolder-backend-module-gerrit';
+import { createPublishGerritReviewAction as createPublishGerritReviewAction_2 } from '@backstage/plugin-scaffolder-backend-module-gerrit';
+import { createPublishGithubAction as createPublishGithubAction_2 } from '@backstage/plugin-scaffolder-backend-module-github';
+import { createPublishGitlabAction as createPublishGitlabAction_2 } from '@backstage/plugin-scaffolder-backend-module-gitlab';
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { Duration } from 'luxon';
@@ -25,9 +38,6 @@ import { executeShellCommand as executeShellCommand_2 } from '@backstage/plugin-
 import { ExecuteShellCommandOptions } from '@backstage/plugin-scaffolder-node';
 import express from 'express';
 import { fetchContents as fetchContents_2 } from '@backstage/plugin-scaffolder-node';
-import * as gerrit from '@backstage/plugin-scaffolder-backend-module-gerrit';
-import * as github from '@backstage/plugin-scaffolder-backend-module-github';
-import * as gitlab from '@backstage/plugin-scaffolder-backend-module-gitlab';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { HumanDuration } from '@backstage/types';
 import { IdentityApi } from '@backstage/plugin-auth-node';
@@ -265,57 +275,57 @@ export const createFilesystemRenameAction: () => TemplateAction_2<
 >;
 
 // @public @deprecated (undocumented)
-export const createGithubActionsDispatchAction: typeof github.createGithubActionsDispatchAction;
+export const createGithubActionsDispatchAction: typeof createGithubActionsDispatchAction_2;
 
 // @public @deprecated (undocumented)
-export const createGithubDeployKeyAction: typeof github.createGithubDeployKeyAction;
+export const createGithubDeployKeyAction: typeof createGithubDeployKeyAction_2;
 
 // @public @deprecated (undocumented)
-export const createGithubEnvironmentAction: typeof github.createGithubEnvironmentAction;
+export const createGithubEnvironmentAction: typeof createGithubEnvironmentAction_2;
 
 // @public @deprecated (undocumented)
-export const createGithubIssuesLabelAction: typeof github.createGithubIssuesLabelAction;
+export const createGithubIssuesLabelAction: typeof createGithubIssuesLabelAction_2;
 
 // @public @deprecated (undocumented)
 export type CreateGithubPullRequestActionOptions =
-  github.CreateGithubPullRequestActionOptions;
+  CreateGithubPullRequestActionOptions_2;
 
 // @public @deprecated (undocumented)
-export const createGithubRepoCreateAction: typeof github.createGithubRepoCreateAction;
+export const createGithubRepoCreateAction: typeof createGithubRepoCreateAction_2;
 
 // @public @deprecated (undocumented)
-export const createGithubRepoPushAction: typeof github.createGithubRepoPushAction;
+export const createGithubRepoPushAction: typeof createGithubRepoPushAction_2;
 
 // @public @deprecated (undocumented)
-export const createGithubWebhookAction: typeof github.createGithubWebhookAction;
+export const createGithubWebhookAction: typeof createGithubWebhookAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishAzureAction: typeof azure.createPublishAzureAction;
+export const createPublishAzureAction: typeof createPublishAzureAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketAction: typeof bitbucket.createPublishBitbucketAction;
+export const createPublishBitbucketAction: typeof createPublishBitbucketAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketCloudAction: typeof bitbucketCloud.createPublishBitbucketCloudAction;
+export const createPublishBitbucketCloudAction: typeof createPublishBitbucketCloudAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerAction: typeof bitbucketServer.createPublishBitbucketServerAction;
+export const createPublishBitbucketServerAction: typeof createPublishBitbucketServerAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
+export const createPublishBitbucketServerPullRequestAction: typeof createPublishBitbucketServerPullRequestAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishGerritAction: typeof gerrit.createPublishGerritAction;
+export const createPublishGerritAction: typeof createPublishGerritAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishGerritReviewAction: typeof gerrit.createPublishGerritReviewAction;
+export const createPublishGerritReviewAction: typeof createPublishGerritReviewAction_2;
 
 // @public @deprecated (undocumented)
-export const createPublishGithubAction: typeof github.createPublishGithubAction;
+export const createPublishGithubAction: typeof createPublishGithubAction_2;
 
 // @public @deprecated (undocumented)
 export const createPublishGithubPullRequestAction: (
-  options: github.CreateGithubPullRequestActionOptions,
+  options: CreateGithubPullRequestActionOptions_2,
 ) => TemplateAction_2<
   {
     title: string;
@@ -332,11 +342,7 @@ export const createPublishGithubPullRequestAction: (
     commitMessage?: string | undefined;
     update?: boolean | undefined;
     forceFork?: boolean | undefined;
-    gitAuthorName?: string | undefined
-    /**
-     * @public
-     * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
-     */;
+    gitAuthorName?: string | undefined;
     gitAuthorEmail?: string | undefined;
     forceEmptyGitAuthor?: boolean | undefined;
   },
@@ -344,7 +350,7 @@ export const createPublishGithubPullRequestAction: (
 >;
 
 // @public @deprecated (undocumented)
-export const createPublishGitlabAction: typeof gitlab.createPublishGitlabAction;
+export const createPublishGitlabAction: typeof createPublishGitlabAction_2;
 
 // @public @deprecated (undocumented)
 export const createPublishGitlabMergeRequestAction: (options: {

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

@@ -13,134 +13,151 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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';
+import {
+  createGithubActionsDispatchAction as githubActionsDispatch,
+  createGithubDeployKeyAction as githubDeployKey,
+  createGithubEnvironmentAction as githubEnvironment,
+  createGithubIssuesLabelAction as githubIssuesLabel,
+  CreateGithubPullRequestActionOptions as GithubPullRequestActionOptions,
+  createGithubRepoCreateAction as githubRepoCreate,
+  createGithubRepoPushAction as githubRepoPush,
+  createGithubWebhookAction as githubWebhook,
+  createPublishGithubAction as publishGithub,
+  createPublishGithubPullRequestAction as publishGithubPullRequest,
+} from '@backstage/plugin-scaffolder-backend-module-github';
+
+import {
+  createPublishGitlabAction as publishGitlab,
+  createPublishGitlabMergeRequestAction as publishGitlabMergeRequest,
+} from '@backstage/plugin-scaffolder-backend-module-gitlab';
+
+import { createPublishAzureAction as publishAzure } from '@backstage/plugin-scaffolder-backend-module-azure';
+
+import { createPublishBitbucketAction as publishBitbucket } from '@backstage/plugin-scaffolder-backend-module-bitbucket';
+
+import { createPublishBitbucketCloudAction as publishBitbucketCloud } from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
+
+import {
+  createPublishBitbucketServerAction as publishBitbucketServer,
+  createPublishBitbucketServerPullRequestAction as publishBitbucketServerPullRequest,
+} from '@backstage/plugin-scaffolder-backend-module-bitbucket-server';
+
+import {
+  createPublishGerritAction as publishGerrit,
+  createPublishGerritReviewAction as publishGerritReview,
+} from '@backstage/plugin-scaffolder-backend-module-gerrit';
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubActionsDispatchAction =
-  github.createGithubActionsDispatchAction;
+export const createGithubActionsDispatchAction = githubActionsDispatch;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubDeployKeyAction = github.createGithubDeployKeyAction;
+export const createGithubDeployKeyAction = githubDeployKey;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubEnvironmentAction =
-  github.createGithubEnvironmentAction;
+export const createGithubEnvironmentAction = githubEnvironment;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubIssuesLabelAction =
-  github.createGithubIssuesLabelAction;
+export const createGithubIssuesLabelAction = githubIssuesLabel;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
 export type CreateGithubPullRequestActionOptions =
-  github.CreateGithubPullRequestActionOptions;
+  GithubPullRequestActionOptions;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubRepoCreateAction = github.createGithubRepoCreateAction;
+export const createGithubRepoCreateAction = githubRepoCreate;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubRepoPushAction = github.createGithubRepoPushAction;
+export const createGithubRepoPushAction = githubRepoPush;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createGithubWebhookAction = github.createGithubWebhookAction;
+export const createGithubWebhookAction = githubWebhook;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createPublishGithubAction = github.createPublishGithubAction;
+export const createPublishGithubAction = publishGithub;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-github` instead
  */
-export const createPublishGithubPullRequestAction =
-  github.createPublishGithubPullRequestAction;
+export const createPublishGithubPullRequestAction = publishGithubPullRequest;
 
 /**
  * @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;
+export const createPublishBitbucketAction = publishBitbucket;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-cloud` instead
  */
-export const createPublishBitbucketCloudAction =
-  bitbucketCloud.createPublishBitbucketCloudAction;
+export const createPublishBitbucketCloudAction = publishBitbucketCloud;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
-export const createPublishBitbucketServerAction =
-  bitbucketServer.createPublishBitbucketServerAction;
+export const createPublishBitbucketServerAction = publishBitbucketServer;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-bitbucket-server` instead
  */
 export const createPublishBitbucketServerPullRequestAction =
-  bitbucketServer.createPublishBitbucketServerPullRequestAction;
+  publishBitbucketServerPullRequest;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-azure` instead
  */
-export const createPublishAzureAction = azure.createPublishAzureAction;
+export const createPublishAzureAction = publishAzure;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gerrit` instead
  */
-export const createPublishGerritAction = gerrit.createPublishGerritAction;
+export const createPublishGerritAction = publishGerrit;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gerrit` instead
  */
-export const createPublishGerritReviewAction =
-  gerrit.createPublishGerritReviewAction;
+export const createPublishGerritReviewAction = publishGerritReview;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gitlab` instead
  */
-export const createPublishGitlabAction = gitlab.createPublishGitlabAction;
+export const createPublishGitlabAction = publishGitlab;
 
 /**
  * @public
  * @deprecated use import from `@backstage/plugin-scaffolder-backend-module-gitlab` instead
  */
-export const createPublishGitlabMergeRequestAction =
-  gitlab.createPublishGitlabMergeRequestAction;
+export const createPublishGitlabMergeRequestAction = publishGitlabMergeRequest;