@eclipse-che/che-devworkspace-generator 0.0.1-ea73e8b → 7.69.0-8717dbc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/bitbucket/bitbucket-module.d.ts +12 -0
- package/lib/bitbucket/bitbucket-module.js +21 -0
- package/lib/bitbucket/bitbucket-module.js.map +1 -0
- package/lib/bitbucket/bitbucket-resolver.d.ts +17 -0
- package/lib/bitbucket/bitbucket-resolver.js +56 -0
- package/lib/bitbucket/bitbucket-resolver.js.map +1 -0
- package/lib/bitbucket/bitbucket-url.d.ts +22 -0
- package/lib/bitbucket/bitbucket-url.js +38 -0
- package/lib/bitbucket/bitbucket-url.js.map +1 -0
- package/lib/bitbucket-server/bitbucket-server-module.d.ts +12 -0
- package/lib/bitbucket-server/bitbucket-server-module.js +21 -0
- package/lib/bitbucket-server/bitbucket-server-module.js.map +1 -0
- package/lib/bitbucket-server/bitbucket-server-resolver.d.ts +17 -0
- package/lib/bitbucket-server/bitbucket-server-resolver.js +64 -0
- package/lib/bitbucket-server/bitbucket-server-resolver.js.map +1 -0
- package/lib/bitbucket-server/bitbucket-server-url.d.ts +24 -0
- package/lib/bitbucket-server/bitbucket-server-url.js +43 -0
- package/lib/bitbucket-server/bitbucket-server-url.js.map +1 -0
- package/lib/github/github-module.js +3 -1
- package/lib/github/github-module.js.map +1 -1
- package/lib/github/github-resolver.d.ts +6 -7
- package/lib/github/github-resolver.js +6 -3
- package/lib/github/github-resolver.js.map +1 -1
- package/lib/github/github-url.d.ts +2 -4
- package/lib/github/github-url.js +0 -3
- package/lib/github/github-url.js.map +1 -1
- package/lib/inversify/inversify-binding.js +6 -0
- package/lib/inversify/inversify-binding.js.map +1 -1
- package/lib/main.js +8 -8
- package/lib/main.js.map +1 -1
- package/lib/resolve/git-url-resolver.d.ts +5 -0
- package/lib/resolve/git-url-resolver.js +43 -0
- package/lib/resolve/git-url-resolver.js.map +1 -0
- package/lib/resolve/resolve-module.d.ts +12 -0
- package/lib/resolve/resolve-module.js +19 -0
- package/lib/resolve/resolve-module.js.map +1 -0
- package/lib/resolve/resolver.d.ts +22 -0
- package/lib/resolve/resolver.js +12 -0
- package/lib/resolve/resolver.js.map +1 -0
- package/lib/resolve/url.d.ts +35 -0
- package/lib/resolve/url.js +12 -0
- package/lib/resolve/url.js.map +1 -0
- package/lib/types.d.ts +13 -0
- package/lib/types.js +17 -0
- package/lib/types.js.map +1 -0
- package/package.json +1 -1
- package/src/bitbucket/bitbucket-module.ts +21 -0
- package/src/bitbucket/bitbucket-resolver.ts +46 -0
- package/src/bitbucket/bitbucket-url.ts +41 -0
- package/src/bitbucket-server/bitbucket-server-module.ts +21 -0
- package/src/bitbucket-server/bitbucket-server-resolver.ts +53 -0
- package/src/bitbucket-server/bitbucket-server-url.ts +51 -0
- package/src/github/github-module.ts +4 -1
- package/src/github/github-resolver.ts +13 -7
- package/src/github/github-url.ts +3 -4
- package/src/inversify/inversify-binding.ts +6 -0
- package/src/main.ts +8 -8
- package/src/resolve/git-url-resolver.ts +30 -0
- package/src/resolve/resolve-module.ts +18 -0
- package/src/resolve/resolver.ts +25 -0
- package/src/resolve/url.ts +40 -0
- package/src/types.ts +14 -0
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
exports.__esModule = true;
|
|
9
|
+
exports.GitUrlResolver = void 0;
|
|
10
|
+
/**********************************************************************
|
|
11
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
12
|
+
*
|
|
13
|
+
* This program and the accompanying materials are made
|
|
14
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
15
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
16
|
+
*
|
|
17
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
18
|
+
***********************************************************************/
|
|
19
|
+
var inversify_1 = require("inversify");
|
|
20
|
+
var types_1 = require("../types");
|
|
21
|
+
var Resolver = types_1.TYPES.Resolver;
|
|
22
|
+
var GitUrlResolver = /** @class */ (function () {
|
|
23
|
+
function GitUrlResolver() {
|
|
24
|
+
}
|
|
25
|
+
GitUrlResolver.prototype.resolve = function (link) {
|
|
26
|
+
var resolver = this.resolvers.find(function (r) { return r.isValid(link); });
|
|
27
|
+
if (resolver) {
|
|
28
|
+
return resolver.resolve(link);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
throw new Error('Can not resolver the URL');
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
__decorate([
|
|
35
|
+
(0, inversify_1.multiInject)(Resolver)
|
|
36
|
+
], GitUrlResolver.prototype, "resolvers");
|
|
37
|
+
GitUrlResolver = __decorate([
|
|
38
|
+
(0, inversify_1.injectable)()
|
|
39
|
+
], GitUrlResolver);
|
|
40
|
+
return GitUrlResolver;
|
|
41
|
+
}());
|
|
42
|
+
exports.GitUrlResolver = GitUrlResolver;
|
|
43
|
+
//# sourceMappingURL=git-url-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-url-resolver.js","sourceRoot":"","sources":["../../src/resolve/git-url-resolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAoD;AAEpD,kCAAiC;AAGzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAG3B;IAAA;IAYA,CAAC;IARC,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAf,CAAe,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;IACH,CAAC;IATD;QADC,IAAA,uBAAW,EAAC,QAAQ,CAAC;6CACQ;IAFnB,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAY1B;IAAD,qBAAC;CAAA,AAZD,IAYC;AAZY,wCAAc"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { ContainerModule } from 'inversify';
|
|
11
|
+
declare const resolveModule: ContainerModule;
|
|
12
|
+
export { resolveModule };
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports.resolveModule = void 0;
|
|
4
|
+
/**********************************************************************
|
|
5
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
6
|
+
*
|
|
7
|
+
* This program and the accompanying materials are made
|
|
8
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
9
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
10
|
+
*
|
|
11
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
12
|
+
***********************************************************************/
|
|
13
|
+
var inversify_1 = require("inversify");
|
|
14
|
+
var git_url_resolver_1 = require("./git-url-resolver");
|
|
15
|
+
var resolveModule = new inversify_1.ContainerModule(function (bind) {
|
|
16
|
+
bind(git_url_resolver_1.GitUrlResolver).toSelf().inSingletonScope();
|
|
17
|
+
});
|
|
18
|
+
exports.resolveModule = resolveModule;
|
|
19
|
+
//# sourceMappingURL=resolve-module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-module.js","sourceRoot":"","sources":["../../src/resolve/resolve-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,uDAAoD;AAEpD,IAAM,aAAa,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC9D,IAAI,CAAC,iCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC,CAAC,CAAC;AAEM,sCAAa"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { Url } from './url';
|
|
11
|
+
export interface Resolver {
|
|
12
|
+
/**
|
|
13
|
+
* Validates the string url for belonging to a specific Git provider.
|
|
14
|
+
* @param url string representation of Url.
|
|
15
|
+
*/
|
|
16
|
+
isValid(url: string): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Resolves repository string URL to a {@class Url} object.
|
|
19
|
+
* @param url string representation of Url.
|
|
20
|
+
*/
|
|
21
|
+
resolve(url: string): Url;
|
|
22
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**********************************************************************
|
|
3
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
4
|
+
*
|
|
5
|
+
* This program and the accompanying materials are made
|
|
6
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
7
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
8
|
+
*
|
|
9
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
10
|
+
***********************************************************************/
|
|
11
|
+
exports.__esModule = true;
|
|
12
|
+
//# sourceMappingURL=resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/resolve/resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
/**
|
|
11
|
+
* Url object
|
|
12
|
+
*/
|
|
13
|
+
export interface Url {
|
|
14
|
+
/**
|
|
15
|
+
* Provides RAW file content url
|
|
16
|
+
* @param path file path
|
|
17
|
+
*/
|
|
18
|
+
getContentUrl(path: string): any;
|
|
19
|
+
/**
|
|
20
|
+
* Provides repositories Url
|
|
21
|
+
*/
|
|
22
|
+
getUrl(): string;
|
|
23
|
+
/**
|
|
24
|
+
* Provides Git clone url
|
|
25
|
+
*/
|
|
26
|
+
getCloneUrl(): string;
|
|
27
|
+
/**
|
|
28
|
+
* Provides repository name
|
|
29
|
+
*/
|
|
30
|
+
getRepoName(): string;
|
|
31
|
+
/**
|
|
32
|
+
* Provides branch name if initialised.
|
|
33
|
+
*/
|
|
34
|
+
getBranchName(): string;
|
|
35
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**********************************************************************
|
|
3
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
4
|
+
*
|
|
5
|
+
* This program and the accompanying materials are made
|
|
6
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
7
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
8
|
+
*
|
|
9
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
10
|
+
***********************************************************************/
|
|
11
|
+
exports.__esModule = true;
|
|
12
|
+
//# sourceMappingURL=url.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/resolve/url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE"}
|
package/lib/types.d.ts
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
declare const TYPES: {
|
|
11
|
+
Resolver: symbol;
|
|
12
|
+
};
|
|
13
|
+
export { TYPES };
|
package/lib/types.js
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports.TYPES = void 0;
|
|
4
|
+
/**********************************************************************
|
|
5
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
6
|
+
*
|
|
7
|
+
* This program and the accompanying materials are made
|
|
8
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
9
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
10
|
+
*
|
|
11
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
12
|
+
***********************************************************************/
|
|
13
|
+
var TYPES = {
|
|
14
|
+
Resolver: Symbol["for"]('Resolver')
|
|
15
|
+
};
|
|
16
|
+
exports.TYPES = TYPES;
|
|
17
|
+
//# sourceMappingURL=types.js.map
|
package/lib/types.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,IAAM,KAAK,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC,KAAG,CAAA,CAAC,UAAU,CAAC;CACjC,CAAC;AAEO,sBAAK"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { ContainerModule, interfaces } from 'inversify';
|
|
11
|
+
|
|
12
|
+
import { BitbucketResolver } from './bitbucket-resolver';
|
|
13
|
+
import { TYPES } from '../types';
|
|
14
|
+
|
|
15
|
+
const { Resolver } = TYPES;
|
|
16
|
+
|
|
17
|
+
const bitbucketModule = new ContainerModule((bind: interfaces.Bind) => {
|
|
18
|
+
bind(Resolver).to(BitbucketResolver).inSingletonScope();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
export { bitbucketModule };
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
|
|
11
|
+
import { BitbucketUrl } from './bitbucket-url';
|
|
12
|
+
import { injectable } from 'inversify';
|
|
13
|
+
import { Url } from '../resolve/url';
|
|
14
|
+
import { Resolver } from '../resolve/resolver';
|
|
15
|
+
|
|
16
|
+
@injectable()
|
|
17
|
+
export class BitbucketResolver implements Resolver {
|
|
18
|
+
// eslint-disable-next-line max-len
|
|
19
|
+
static readonly BITBUCKET_URL_PATTERN: RegExp =
|
|
20
|
+
/^https:\/\/.*@?bitbucket\.org\/(?<workspaceId>[^\/]+)\/(?<repoName>[^\/]+)(\/(src|branch)\/(?<branchName>[^\/]+))?\/?$/;
|
|
21
|
+
|
|
22
|
+
isValid(url: string): boolean {
|
|
23
|
+
return BitbucketResolver.BITBUCKET_URL_PATTERN.test(url);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
resolve(url: string): Url {
|
|
27
|
+
const match = BitbucketResolver.BITBUCKET_URL_PATTERN.exec(url);
|
|
28
|
+
if (!match) {
|
|
29
|
+
throw new Error(`Invalid bitbucket URL: ${url}`);
|
|
30
|
+
}
|
|
31
|
+
const workspaceId = this.getGroup(match, 'workspaceId');
|
|
32
|
+
let repoName = this.getGroup(match, 'repoName');
|
|
33
|
+
if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
|
|
34
|
+
repoName = repoName.substring(0, repoName.length - 4);
|
|
35
|
+
}
|
|
36
|
+
const branchName = this.getGroup(match, 'branchName', 'HEAD');
|
|
37
|
+
return new BitbucketUrl(workspaceId, repoName, branchName);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
private getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string) {
|
|
41
|
+
if (match.groups && match.groups[groupName]) {
|
|
42
|
+
return match.groups[groupName];
|
|
43
|
+
}
|
|
44
|
+
return defaultValue;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
|
|
11
|
+
import { Url } from '../resolve/url';
|
|
12
|
+
|
|
13
|
+
export class BitbucketUrl implements Url {
|
|
14
|
+
private static readonly BITBUCKET_URL = 'https://bitbucket.org';
|
|
15
|
+
|
|
16
|
+
constructor(
|
|
17
|
+
private readonly workspaceId: string,
|
|
18
|
+
private readonly repoName: string,
|
|
19
|
+
private readonly branchName: string
|
|
20
|
+
) {}
|
|
21
|
+
|
|
22
|
+
getContentUrl(path: string): string {
|
|
23
|
+
return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}/raw/${this.branchName}/${path}`;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
getUrl(): string {
|
|
27
|
+
return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}/src/${this.branchName}`;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
getCloneUrl(): string {
|
|
31
|
+
return `${BitbucketUrl.BITBUCKET_URL}/${this.workspaceId}/${this.repoName}.git`;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
getRepoName(): string {
|
|
35
|
+
return this.repoName;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
getBranchName(): string {
|
|
39
|
+
return this.branchName;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { ContainerModule, interfaces } from 'inversify';
|
|
11
|
+
|
|
12
|
+
import { BitbucketServerResolver } from './bitbucket-server-resolver';
|
|
13
|
+
import { TYPES } from '../types';
|
|
14
|
+
|
|
15
|
+
const { Resolver } = TYPES;
|
|
16
|
+
|
|
17
|
+
const bitbucketServerModule = new ContainerModule((bind: interfaces.Bind) => {
|
|
18
|
+
bind(Resolver).to(BitbucketServerResolver).inSingletonScope();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
export { bitbucketServerModule };
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
|
|
11
|
+
import { BitbucketServerUrl } from './bitbucket-server-url';
|
|
12
|
+
import { injectable } from 'inversify';
|
|
13
|
+
import { Url } from '../resolve/url';
|
|
14
|
+
import { Resolver } from '../resolve/resolver';
|
|
15
|
+
|
|
16
|
+
@injectable()
|
|
17
|
+
export class BitbucketServerResolver implements Resolver {
|
|
18
|
+
// eslint-disable-next-line max-len
|
|
19
|
+
static readonly BITBUCKET_URL_PATTERNS: RegExp[] = [
|
|
20
|
+
/^(?<scheme>https?):\/\/(?<host>.*)\/scm\/~(?<user>[^\/]+)\/(?<repo>.*).git$/,
|
|
21
|
+
/^(?<scheme>https?):\/\/(?<host>.*)\/users\/(?<user>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
|
|
22
|
+
/^(?<scheme>https?):\/\/(?<host>.*)\/scm\/(?<project>[^\/~]+)\/(?<repo>[^\/]+).git$/,
|
|
23
|
+
/^(?<scheme>https?):\/\/(?<host>.*)\/projects\/(?<project>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
|
|
24
|
+
];
|
|
25
|
+
|
|
26
|
+
isValid(url: string): boolean {
|
|
27
|
+
return BitbucketServerResolver.BITBUCKET_URL_PATTERNS.some(p => p.test(url));
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
resolve(url: string): Url {
|
|
31
|
+
const regExp = BitbucketServerResolver.BITBUCKET_URL_PATTERNS.find(p => p.test(url));
|
|
32
|
+
if (!regExp) {
|
|
33
|
+
throw new Error(`Invalid bitbucket-server URL: ${url}`);
|
|
34
|
+
}
|
|
35
|
+
const match = regExp.exec(url);
|
|
36
|
+
const scheme = this.getGroup(match, 'scheme');
|
|
37
|
+
const hostName = this.getGroup(match, 'host');
|
|
38
|
+
const user = this.getGroup(match, 'user');
|
|
39
|
+
const project = this.getGroup(match, 'project');
|
|
40
|
+
const repo = this.getGroup(match, 'repo');
|
|
41
|
+
let branch = this.getGroup(match, 'branch');
|
|
42
|
+
if (branch !== undefined && branch.startsWith('refs%2Fheads%2F')) {
|
|
43
|
+
branch = branch.substring(15);
|
|
44
|
+
}
|
|
45
|
+
return new BitbucketServerUrl(scheme, hostName, user, project, repo, branch);
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
private getGroup(match: RegExpExecArray, groupName: string): string | undefined {
|
|
49
|
+
if (match.groups && match.groups[groupName]) {
|
|
50
|
+
return match.groups[groupName];
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
|
|
11
|
+
import { Url } from '../resolve/url';
|
|
12
|
+
|
|
13
|
+
export class BitbucketServerUrl implements Url {
|
|
14
|
+
constructor(
|
|
15
|
+
private readonly scheme: string,
|
|
16
|
+
private readonly hostName: string,
|
|
17
|
+
private readonly user: string | undefined,
|
|
18
|
+
private readonly project: string | undefined,
|
|
19
|
+
private readonly repo: string,
|
|
20
|
+
private readonly branch: string | undefined
|
|
21
|
+
) {}
|
|
22
|
+
|
|
23
|
+
getContentUrl(path: string): string {
|
|
24
|
+
const isUser = this.user !== undefined;
|
|
25
|
+
return `${this.scheme}://${this.hostName}/${isUser ? 'users' : 'projects'}/${
|
|
26
|
+
isUser ? this.user : this.project
|
|
27
|
+
}/repos/${this.repo}/raw/${path}${this.branch !== undefined ? '?/at=' + this.branch : ''}`;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
getUrl(): string {
|
|
31
|
+
const isUser = this.user !== undefined;
|
|
32
|
+
return `${this.scheme}://${this.hostName}/${isUser ? 'users' : 'projects'}/${
|
|
33
|
+
isUser ? this.user : this.project
|
|
34
|
+
}/repos/${this.repo}${this.branch !== undefined ? '/browse?at=' + this.branch : ''}`;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
getCloneUrl(): string {
|
|
38
|
+
const isUser = this.user !== undefined;
|
|
39
|
+
return `${this.scheme}://${this.hostName}/scm/${isUser ? '~' + this.user : this.project.toLowerCase()}/${
|
|
40
|
+
this.repo
|
|
41
|
+
}.git`;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
getRepoName(): string {
|
|
45
|
+
return this.repo;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
getBranchName(): string {
|
|
49
|
+
return this.branch;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
@@ -10,9 +10,12 @@
|
|
|
10
10
|
import { ContainerModule, interfaces } from 'inversify';
|
|
11
11
|
|
|
12
12
|
import { GithubResolver } from './github-resolver';
|
|
13
|
+
import { TYPES } from '../types';
|
|
14
|
+
|
|
15
|
+
const { Resolver } = TYPES;
|
|
13
16
|
|
|
14
17
|
const githubModule = new ContainerModule((bind: interfaces.Bind) => {
|
|
15
|
-
bind(
|
|
18
|
+
bind(Resolver).to(GithubResolver).inSingletonScope();
|
|
16
19
|
});
|
|
17
20
|
|
|
18
21
|
export { githubModule };
|
|
@@ -10,17 +10,20 @@
|
|
|
10
10
|
|
|
11
11
|
import { GithubUrl } from './github-url';
|
|
12
12
|
import { injectable } from 'inversify';
|
|
13
|
+
import { Url } from '../resolve/url';
|
|
14
|
+
import { Resolver } from '../resolve/resolver';
|
|
13
15
|
|
|
14
|
-
/**
|
|
15
|
-
* Provides a github URL object allowing to interact
|
|
16
|
-
*/
|
|
17
16
|
@injectable()
|
|
18
|
-
export class GithubResolver {
|
|
17
|
+
export class GithubResolver implements Resolver {
|
|
19
18
|
// eslint-disable-next-line max-len
|
|
20
19
|
static readonly GITHUB_URL_PATTERN =
|
|
21
20
|
/^(?<scheme>https?):\/\/(?<host>github(\..+)?\.[^\/]+)\/(?<repoUser>[^\/]+)\/(?<repoName>[^\/]+)((\/)|\/(blob|tree)\/(?<branchName>[^\/]+)(?:\/(?<subFolder>.*))?)?$/;
|
|
22
21
|
|
|
23
|
-
|
|
22
|
+
isValid(url: string): boolean {
|
|
23
|
+
return GithubResolver.GITHUB_URL_PATTERN.test(url);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
resolve(link: string): Url {
|
|
24
27
|
const match = GithubResolver.GITHUB_URL_PATTERN.exec(link);
|
|
25
28
|
if (!match) {
|
|
26
29
|
throw new Error(`Invalid github URL: ${link}`);
|
|
@@ -28,13 +31,16 @@ export class GithubResolver {
|
|
|
28
31
|
const scheme = this.getGroup(match, 'scheme');
|
|
29
32
|
const hostName = this.getGroup(match, 'host');
|
|
30
33
|
const repoUser = this.getGroup(match, 'repoUser');
|
|
31
|
-
|
|
34
|
+
let repoName = this.getGroup(match, 'repoName');
|
|
35
|
+
if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
|
|
36
|
+
repoName = repoName.substring(0, repoName.length - 4);
|
|
37
|
+
}
|
|
32
38
|
const branchName = this.getGroup(match, 'branchName', 'HEAD');
|
|
33
39
|
const subFolder = this.getGroup(match, 'subFolder');
|
|
34
40
|
return new GithubUrl(scheme, hostName, repoUser, repoName, branchName, subFolder);
|
|
35
41
|
}
|
|
36
42
|
|
|
37
|
-
getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string) {
|
|
43
|
+
private getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string) {
|
|
38
44
|
if (match.groups && match.groups[groupName]) {
|
|
39
45
|
return match.groups[groupName];
|
|
40
46
|
}
|
package/src/github/github-url.ts
CHANGED
|
@@ -8,10 +8,9 @@
|
|
|
8
8
|
* SPDX-License-Identifier: EPL-2.0
|
|
9
9
|
***********************************************************************/
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
export class GithubUrl {
|
|
11
|
+
import { Url } from '../resolve/url';
|
|
12
|
+
|
|
13
|
+
export class GithubUrl implements Url {
|
|
15
14
|
constructor(
|
|
16
15
|
private readonly scheme: string,
|
|
17
16
|
private readonly hostName: string,
|
|
@@ -14,7 +14,10 @@ import { Container } from 'inversify';
|
|
|
14
14
|
import { devfileModule } from '../devfile/devfile-module';
|
|
15
15
|
import { fetchModule } from '../fetch/fetch-module';
|
|
16
16
|
import { githubModule } from '../github/github-module';
|
|
17
|
+
import { resolveModule } from '../resolve/resolve-module';
|
|
17
18
|
import { pluginRegistryModule } from '../plugin-registry/plugin-registry-module';
|
|
19
|
+
import { bitbucketModule } from '../bitbucket/bitbucket-module';
|
|
20
|
+
import { bitbucketServerModule } from '../bitbucket-server/bitbucket-server-module';
|
|
18
21
|
|
|
19
22
|
/**
|
|
20
23
|
* Manage all bindings for inversify
|
|
@@ -28,6 +31,9 @@ export class InversifyBinding {
|
|
|
28
31
|
this.container.load(devfileModule);
|
|
29
32
|
this.container.load(fetchModule);
|
|
30
33
|
this.container.load(githubModule);
|
|
34
|
+
this.container.load(bitbucketModule);
|
|
35
|
+
this.container.load(bitbucketServerModule);
|
|
36
|
+
this.container.load(resolveModule);
|
|
31
37
|
this.container.load(pluginRegistryModule);
|
|
32
38
|
|
|
33
39
|
this.container.bind(Symbol.for('AxiosInstance')).toConstantValue(options.axiosInstance);
|
package/src/main.ts
CHANGED
|
@@ -11,13 +11,13 @@
|
|
|
11
11
|
import * as axios from 'axios';
|
|
12
12
|
import * as fs from 'fs-extra';
|
|
13
13
|
import { Generate } from './generate';
|
|
14
|
-
import { GithubResolver } from './github/github-resolver';
|
|
15
14
|
import * as jsYaml from 'js-yaml';
|
|
16
15
|
import { InversifyBinding } from './inversify/inversify-binding';
|
|
17
16
|
import { UrlFetcher } from './fetch/url-fetcher';
|
|
18
17
|
import { PluginRegistryResolver } from './plugin-registry/plugin-registry-resolver';
|
|
19
18
|
import { V1alpha2DevWorkspaceSpecTemplate } from '@devfile/api';
|
|
20
19
|
import { DevfileContext } from './api/devfile-context';
|
|
20
|
+
import { GitUrlResolver } from './resolve/git-url-resolver';
|
|
21
21
|
|
|
22
22
|
export class Main {
|
|
23
23
|
/**
|
|
@@ -69,12 +69,12 @@ export class Main {
|
|
|
69
69
|
let devfileContent;
|
|
70
70
|
let editorContent;
|
|
71
71
|
|
|
72
|
-
// gets the
|
|
72
|
+
// gets the repo URL
|
|
73
73
|
if (params.devfileUrl) {
|
|
74
|
-
const
|
|
75
|
-
const
|
|
74
|
+
const resolver = container.get(GitUrlResolver);
|
|
75
|
+
const url = resolver.resolve(params.devfileUrl);
|
|
76
76
|
// user devfile
|
|
77
|
-
devfileContent = await container.get(UrlFetcher).fetchText(
|
|
77
|
+
devfileContent = await container.get(UrlFetcher).fetchText(url.getContentUrl('devfile.yaml'));
|
|
78
78
|
|
|
79
79
|
// load content
|
|
80
80
|
const devfileParsed = jsYaml.load(devfileContent);
|
|
@@ -84,10 +84,10 @@ export class Main {
|
|
|
84
84
|
// no, so add the current project being cloned
|
|
85
85
|
devfileParsed.projects = [
|
|
86
86
|
{
|
|
87
|
-
name:
|
|
87
|
+
name: url.getRepoName(),
|
|
88
88
|
git: {
|
|
89
|
-
remotes: { origin:
|
|
90
|
-
checkoutFrom: { revision:
|
|
89
|
+
remotes: { origin: url.getCloneUrl() },
|
|
90
|
+
checkoutFrom: { revision: url.getBranchName() },
|
|
91
91
|
},
|
|
92
92
|
},
|
|
93
93
|
];
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { injectable, multiInject } from 'inversify';
|
|
11
|
+
import { Url } from './url';
|
|
12
|
+
import { TYPES } from '../types';
|
|
13
|
+
import { Resolver } from './resolver';
|
|
14
|
+
|
|
15
|
+
const { Resolver } = TYPES;
|
|
16
|
+
|
|
17
|
+
@injectable()
|
|
18
|
+
export class GitUrlResolver {
|
|
19
|
+
@multiInject(Resolver)
|
|
20
|
+
private resolvers: Resolver[];
|
|
21
|
+
|
|
22
|
+
resolve(link: string): Url {
|
|
23
|
+
const resolver = this.resolvers.find(r => r.isValid(link));
|
|
24
|
+
if (resolver) {
|
|
25
|
+
return resolver.resolve(link);
|
|
26
|
+
} else {
|
|
27
|
+
throw new Error('Can not resolver the URL');
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**********************************************************************
|
|
2
|
+
* Copyright (c) 2023 Red Hat, Inc.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made
|
|
5
|
+
* available under the terms of the Eclipse Public License 2.0
|
|
6
|
+
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
|
7
|
+
*
|
|
8
|
+
* SPDX-License-Identifier: EPL-2.0
|
|
9
|
+
***********************************************************************/
|
|
10
|
+
import { ContainerModule, interfaces } from 'inversify';
|
|
11
|
+
|
|
12
|
+
import { GitUrlResolver } from './git-url-resolver';
|
|
13
|
+
|
|
14
|
+
const resolveModule = new ContainerModule((bind: interfaces.Bind) => {
|
|
15
|
+
bind(GitUrlResolver).toSelf().inSingletonScope();
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
export { resolveModule };
|