From 6e47fb65685b27807a568eca5eeead84dea60aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikael=20=C3=96stberg?= <mikael.ostberg@telenor.se>
Date: Wed, 9 Dec 2020 15:31:43 +0100
Subject: [PATCH] Use parseGitUri

---
 plugins/catalog-import/src/util/useGithubRepos.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/catalog-import/src/util/useGithubRepos.ts b/plugins/catalog-import/src/util/useGithubRepos.ts
index 740f0581b1..30e77e18a8 100644
--- a/plugins/catalog-import/src/util/useGithubRepos.ts
+++ b/plugins/catalog-import/src/util/useGithubRepos.ts
@@ -18,6 +18,7 @@ import * as YAML from 'yaml';
 import { useApi, configApiRef } from '@backstage/core';
 import { catalogImportApiRef } from '../api/CatalogImportApi';
 import { ConfigSpec } from '../components/ImportComponentPage';
+import parseGitUri from 'git-url-parse';
 
 // TODO: (O5ten) Refactor into a core API instead of direct usage like this
 // https://github.com/backstage/backstage/pull/3613#issuecomment-7408929430
@@ -28,9 +29,12 @@ export function useGithubRepos() {
   const config = useApi(configApiRef);
 
   const submitPrToRepo = async (selectedRepo: ConfigSpec) => {
-    const [hostname, ownerName, repoName] = selectedRepo.location
-      .split('/')
-      .slice(-3);
+    const {
+      name: repoName,
+      owner: ownerName,
+      resource: hostname,
+    } = parseGitUri(selectedRepo.location);
+
     const configs = readGitHubIntegrationConfigs(
       config.getOptionalConfigArray('integrations.github') ?? [],
     );