From ed30d2cb7a4744b532630d5005f05cfe23d74d8b Mon Sep 17 00:00:00 2001
From: Tavi Nolan <Tavi.Nolan@fmr.com>
Date: Wed, 17 Apr 2024 15:38:21 +0100
Subject: [PATCH] Fixed imports

Signed-off-by: Tavi Nolan <Tavi.Nolan@fmr.com>
---
 .../src/actions/githubPullRequest.ts             | 16 ++++++++--------
 .../src/actions/githubWebhook.ts                 |  7 +++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
index 99e442f74a..de70f56399 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubPullRequest.ts
@@ -14,25 +14,24 @@
  * limitations under the License.
  */
 
-import { CustomErrorBase, InputError } from '@backstage/errors';
+import path from 'path';
 import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
 import {
-  SerializedFile,
   createTemplateAction,
   parseRepoUrl,
+  SerializedFile,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
-
-import { Logger } from 'winston';
 import { Octokit } from 'octokit';
-import { createPullRequest } from 'octokit-plugin-create-pull-request';
-import { examples } from './githubPullRequest.examples';
-import { getOctokitOptions } from './helpers';
-import path from 'path';
+import { CustomErrorBase, InputError } from '@backstage/errors';
 import { resolveSafeChildPath } from '@backstage/backend-common';
+import { createPullRequest } from 'octokit-plugin-create-pull-request';
+import { getOctokitOptions } from './helpers';
+import { examples } from './githubPullRequest.examples';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 export type Encoding = 'utf-8' | 'base64';
 
@@ -321,6 +320,7 @@ export const createPublishGithubPullRequestAction = (
         ]),
       );
 
+      // If this is a dry run, log and return
       if (ctx.isDryRun) {
         ctx.logger.info(`Performing dry run of creating pull request`);
         ctx.output('targetBranchName', branchName);
diff --git a/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.ts b/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.ts
index 91db9c0534..e188cdf0cb 100644
--- a/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.ts
+++ b/plugins/scaffolder-backend-module-github/src/actions/githubWebhook.ts
@@ -18,16 +18,15 @@ import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
-import { InputError, assertError } from '@backstage/errors';
 import {
   createTemplateAction,
   parseRepoUrl,
 } from '@backstage/plugin-scaffolder-node';
-
-import { Octokit } from 'octokit';
 import { emitterEventNames } from '@octokit/webhooks';
-import { examples } from './githubWebhook.examples';
+import { assertError, InputError } from '@backstage/errors';
+import { Octokit } from 'octokit';
 import { getOctokitOptions } from './helpers';
+import { examples } from './githubWebhook.examples';
 
 /**
  * Creates new action that creates a webhook for a repository on GitHub.