From c7f6424a268b126517341b6f57323b490fbc0395 Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Thu, 24 Feb 2022 16:01:29 -0500
Subject: [PATCH] fix(githubPrAction): properly construct repoUrl

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/smart-items-fry.md                                | 5 +++++
 .../scaffolder/actions/builtin/publish/githubPullRequest.ts  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/smart-items-fry.md

diff --git a/.changeset/smart-items-fry.md b/.changeset/smart-items-fry.md
new file mode 100644
index 0000000000..06ddd08979
--- /dev/null
+++ b/.changeset/smart-items-fry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Fix broken GitHub PR action due to malformed `repoUrl`
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
index 9efc11210a..e4458508ef 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
@@ -72,7 +72,7 @@ export const defaultClientFactory = async ({
   const octokitOptions = await getOctokitOptions({
     integrations,
     credentialsProvider: githubCredentialsProvider,
-    repoUrl: `https://${encodedHost}/${encodedOwner}/${encodedRepo}`,
+    repoUrl: `${encodedHost}?owner=${encodedOwner}&repo=${encodedRepo}`,
     token: providedToken,
   });