Skip to content

Commit 3308ebc

Browse files
committed
Merge branch 'fix/m1m1x/gogs-git-url-parsing' of github.com:kubero-dev/kubero into fix/m1m1x/gogs-git-url-parsing
2 parents 8f76be4 + 537a63e commit 3308ebc

File tree

3 files changed

+44
-0
lines changed

3 files changed

+44
-0
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"dotenv": "^16.0.1",
2929
"express": "^4.18.1",
3030
"express-session": "^1.17.3",
31+
"git-url-parse": "^13.1.0",
3132
"gitea-js": "^1.2.0",
3233
"kubernetes-client": "^9.0.0",
3334
"lodash.get": "^4.4.2",

src/git/gogs.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export class GogsApi extends Repo {
2121
}
2222

2323
protected async getRepository(gitrepo: string): Promise<IRepository> {
24+
const GitUrlParse = require("git-url-parse");
25+
2426
let ret: IRepository = {
2527
status: 500,
2628
statusText: 'error',

yarn.lock

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2359,6 +2359,21 @@ getpass@^0.1.1:
23592359
dependencies:
23602360
assert-plus "^1.0.0"
23612361

2362+
git-up@^7.0.0:
2363+
version "7.0.0"
2364+
resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467"
2365+
integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==
2366+
dependencies:
2367+
is-ssh "^1.4.0"
2368+
parse-url "^8.1.0"
2369+
2370+
git-url-parse@^13.1.0:
2371+
version "13.1.0"
2372+
resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.0.tgz#07e136b5baa08d59fabdf0e33170de425adf07b4"
2373+
integrity sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==
2374+
dependencies:
2375+
git-up "^7.0.0"
2376+
23622377
gitea-js@^1.2.0:
23632378
version "1.20.1"
23642379
resolved "https://registry.yarnpkg.com/gitea-js/-/gitea-js-1.20.1.tgz#a382c8c56a869fedb11bc7889a5effea1bbbfede"
@@ -2619,6 +2634,13 @@ is-plain-object@^5.0.0:
26192634
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
26202635
integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
26212636

2637+
is-ssh@^1.4.0:
2638+
version "1.4.0"
2639+
resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
2640+
integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
2641+
dependencies:
2642+
protocols "^2.0.1"
2643+
26222644
is-stream@^2.0.0:
26232645
version "2.0.1"
26242646
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -3591,6 +3613,20 @@ parse-json@^5.2.0:
35913613
json-parse-even-better-errors "^2.3.0"
35923614
lines-and-columns "^1.1.6"
35933615

3616+
parse-path@^7.0.0:
3617+
version "7.0.0"
3618+
resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
3619+
integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==
3620+
dependencies:
3621+
protocols "^2.0.0"
3622+
3623+
parse-url@^8.1.0:
3624+
version "8.1.0"
3625+
resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d"
3626+
integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==
3627+
dependencies:
3628+
parse-path "^7.0.0"
3629+
35943630
parseurl@~1.3.3:
35953631
version "1.3.3"
35963632
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -3720,6 +3756,11 @@ prompts@^2.0.1:
37203756
kleur "^3.0.3"
37213757
sisteransi "^1.0.5"
37223758

3759+
protocols@^2.0.0, protocols@^2.0.1:
3760+
version "2.0.1"
3761+
resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
3762+
integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
3763+
37233764
proxy-addr@~2.0.7:
37243765
version "2.0.7"
37253766
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"

0 commit comments

Comments
 (0)