Skip to content

Commit c2e9041

Browse files
salexander6salexander6
committed
Strip optional '.git' suffix from https server remote name.
1 parent 0dfc93c commit c2e9041

File tree

2 files changed

+67
-28
lines changed

2 files changed

+67
-28
lines changed

‎dist/index.js

+64-27
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

99
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
1010
if (k2 === undefined) k2 = k;
11-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
11+
var desc = Object.getOwnPropertyDescriptor(m, k);
12+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
13+
desc = { enumerable: true, get: function() { return m[k]; } };
14+
}
15+
Object.defineProperty(o, k2, desc);
1216
}) : (function(o, m, k, k2) {
1317
if (k2 === undefined) k2 = k;
1418
o[k2] = m[k];
@@ -246,7 +250,11 @@ exports.createOrUpdateBranch = createOrUpdateBranch;
246250

247251
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
248252
if (k2 === undefined) k2 = k;
249-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
253+
var desc = Object.getOwnPropertyDescriptor(m, k);
254+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
255+
desc = { enumerable: true, get: function() { return m[k]; } };
256+
}
257+
Object.defineProperty(o, k2, desc);
250258
}) : (function(o, m, k, k2) {
251259
if (k2 === undefined) k2 = k;
252260
o[k2] = m[k];
@@ -466,7 +474,11 @@ exports.createPullRequest = createPullRequest;
466474

467475
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
468476
if (k2 === undefined) k2 = k;
469-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
477+
var desc = Object.getOwnPropertyDescriptor(m, k);
478+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
479+
desc = { enumerable: true, get: function() { return m[k]; } };
480+
}
481+
Object.defineProperty(o, k2, desc);
470482
}) : (function(o, m, k, k2) {
471483
if (k2 === undefined) k2 = k;
472484
o[k2] = m[k];
@@ -599,7 +611,11 @@ exports.GitAuthHelper = GitAuthHelper;
599611

600612
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
601613
if (k2 === undefined) k2 = k;
602-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
614+
var desc = Object.getOwnPropertyDescriptor(m, k);
615+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
616+
desc = { enumerable: true, get: function() { return m[k]; } };
617+
}
618+
Object.defineProperty(o, k2, desc);
603619
}) : (function(o, m, k, k2) {
604620
if (k2 === undefined) k2 = k;
605621
o[k2] = m[k];
@@ -903,7 +919,11 @@ class GitOutput {
903919

904920
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
905921
if (k2 === undefined) k2 = k;
906-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
922+
var desc = Object.getOwnPropertyDescriptor(m, k);
923+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
924+
desc = { enumerable: true, get: function() { return m[k]; } };
925+
}
926+
Object.defineProperty(o, k2, desc);
907927
}) : (function(o, m, k, k2) {
908928
if (k2 === undefined) k2 = k;
909929
o[k2] = m[k];
@@ -1054,7 +1074,11 @@ exports.GitHubHelper = GitHubHelper;
10541074

10551075
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
10561076
if (k2 === undefined) k2 = k;
1057-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
1077+
var desc = Object.getOwnPropertyDescriptor(m, k);
1078+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
1079+
desc = { enumerable: true, get: function() { return m[k]; } };
1080+
}
1081+
Object.defineProperty(o, k2, desc);
10581082
}) : (function(o, m, k, k2) {
10591083
if (k2 === undefined) k2 = k;
10601084
o[k2] = m[k];
@@ -1156,7 +1180,11 @@ function autoProxyAgent(octokit) {
11561180

11571181
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
11581182
if (k2 === undefined) k2 = k;
1159-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
1183+
var desc = Object.getOwnPropertyDescriptor(m, k);
1184+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
1185+
desc = { enumerable: true, get: function() { return m[k]; } };
1186+
}
1187+
Object.defineProperty(o, k2, desc);
11601188
}) : (function(o, m, k, k2) {
11611189
if (k2 === undefined) k2 = k;
11621190
o[k2] = m[k];
@@ -1211,8 +1239,9 @@ function getRemoteDetail(remoteUrl) {
12111239
if (!githubServerMatch) {
12121240
throw new Error('Could not parse GitHub Server name');
12131241
}
1242+
remoteUrl = remoteUrl.replace(/\.git$/, '');
12141243
const httpsUrlPattern = new RegExp('^https?://.*@?' + githubServerMatch[1] + '/(.+/.+)$', 'i');
1215-
const sshUrlPattern = new RegExp('^git@' + githubServerMatch[1] + ':(.+/.+).git$', 'i');
1244+
const sshUrlPattern = new RegExp('^git@' + githubServerMatch[1] + ':(.+/.+)$', 'i');
12161245
const httpsMatch = remoteUrl.match(httpsUrlPattern);
12171246
if (httpsMatch) {
12181247
return {
@@ -3839,8 +3868,14 @@ function copyFile(srcFile, destFile, force) {
38393868

38403869
Object.defineProperty(exports, "__esModule", ({ value: true }));
38413870

3871+
const REGEX_IS_INSTALLATION_LEGACY = /^v1\./;
3872+
const REGEX_IS_INSTALLATION = /^ghs_/;
3873+
const REGEX_IS_USER_TO_SERVER = /^ghu_/;
38423874
async function auth(token) {
3843-
const tokenType = token.split(/\./).length === 3 ? "app" : /^v\d+\./.test(token) ? "installation" : "oauth";
3875+
const isApp = token.split(/\./).length === 3;
3876+
const isInstallation = REGEX_IS_INSTALLATION_LEGACY.test(token) || REGEX_IS_INSTALLATION.test(token);
3877+
const isUserToServer = REGEX_IS_USER_TO_SERVER.test(token);
3878+
const tokenType = isApp ? "app" : isInstallation ? "installation" : isUserToServer ? "user-to-server" : "oauth";
38443879
return {
38453880
type: "token",
38463881
token: token,
@@ -3938,7 +3973,7 @@ function _objectWithoutProperties(source, excluded) {
39383973
return target;
39393974
}
39403975

3941-
const VERSION = "3.5.1";
3976+
const VERSION = "3.6.0";
39423977

39433978
const _excluded = ["authStrategy"];
39443979
class Octokit {
@@ -4481,18 +4516,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
44814516
var request = __nccwpck_require__(6234);
44824517
var universalUserAgent = __nccwpck_require__(5030);
44834518

4484-
const VERSION = "4.6.4";
4519+
const VERSION = "4.8.0";
44854520

4486-
class GraphqlError extends Error {
4487-
constructor(request, response) {
4488-
const message = response.data.errors[0].message;
4489-
super(message);
4490-
Object.assign(this, response.data);
4491-
Object.assign(this, {
4492-
headers: response.headers
4493-
});
4494-
this.name = "GraphqlError";
4495-
this.request = request; // Maintains proper stack trace (only available on V8)
4521+
function _buildMessageForResponseErrors(data) {
4522+
return `Request failed due to following response errors:\n` + data.errors.map(e => ` - ${e.message}`).join("\n");
4523+
}
4524+
4525+
class GraphqlResponseError extends Error {
4526+
constructor(request, headers, response) {
4527+
super(_buildMessageForResponseErrors(response));
4528+
this.request = request;
4529+
this.headers = headers;
4530+
this.response = response;
4531+
this.name = "GraphqlResponseError"; // Expose the errors and response data in their shorthand properties.
4532+
4533+
this.errors = response.errors;
4534+
this.data = response.data; // Maintains proper stack trace (only available on V8)
44964535

44974536
/* istanbul ignore next */
44984537

@@ -4550,10 +4589,7 @@ function graphql(request, query, options) {
45504589
headers[key] = response.headers[key];
45514590
}
45524591

4553-
throw new GraphqlError(requestOptions, {
4554-
headers,
4555-
data: response.data
4556-
});
4592+
throw new GraphqlResponseError(requestOptions, headers, response.data);
45574593
}
45584594

45594595
return response.data.data;
@@ -4587,6 +4623,7 @@ function withCustomRequest(customRequest) {
45874623
});
45884624
}
45894625

4626+
exports.GraphqlResponseError = GraphqlResponseError;
45904627
exports.graphql = graphql$1;
45914628
exports.withCustomRequest = withCustomRequest;
45924629
//# sourceMappingURL=index.js.map
@@ -5950,7 +5987,7 @@ var isPlainObject = __nccwpck_require__(3287);
59505987
var nodeFetch = _interopDefault(__nccwpck_require__(467));
59515988
var requestError = __nccwpck_require__(537);
59525989

5953-
const VERSION = "5.6.0";
5990+
const VERSION = "5.6.3";
59545991

59555992
function getBufferResponse(response) {
59565993
return response.arrayBuffer();
@@ -6991,7 +7028,7 @@ function setup(env) {
69917028
namespaces = split[i].replace(/\*/g, '.*?');
69927029

69937030
if (namespaces[0] === '-') {
6994-
createDebug.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
7031+
createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
69957032
} else {
69967033
createDebug.names.push(new RegExp('^' + namespaces + '$'));
69977034
}

‎src/utils.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ export function getRemoteDetail(remoteUrl: string): RemoteDetail {
4646
throw new Error('Could not parse GitHub Server name')
4747
}
4848

49+
remoteUrl = remoteUrl.replace(/\.git$/, '')
50+
4951
const httpsUrlPattern = new RegExp(
5052
'^https?://.*@?' + githubServerMatch[1] + '/(.+/.+)$',
5153
'i'
5254
)
5355
const sshUrlPattern = new RegExp(
54-
'^git@' + githubServerMatch[1] + ':(.+/.+).git$',
56+
'^git@' + githubServerMatch[1] + ':(.+/.+)$',
5557
'i'
5658
)
5759

0 commit comments

Comments
 (0)