fix: add trailing .git to repositoryUrl only if it's present in the configured URL

This commit is contained in:
Pierre Vanduynslager
2018-04-12 17:42:53 -04:00
parent 7c9ec41dd7
commit cb1f80cb56
2 changed files with 6 additions and 4 deletions
+2 -4
View File
@@ -40,13 +40,11 @@ module.exports = async ({repositoryUrl, branch}) => {
const gitCredentials = ['GL_TOKEN', 'GITLAB_TOKEN'].includes(envVar)
? `gitlab-ci-token:${process.env[envVar]}`
: process.env[envVar];
const {protocols} = gitUrlParse(repositoryUrl);
const {protocols, ...parsed} = gitUrlParse(repositoryUrl);
const protocol = protocols.includes('https') ? 'https' : protocols.includes('http') ? 'http' : 'https';
// If credentials are set via anvironment variables, convert the URL to http/https and add basic auth, otherwise return `repositoryUrl` as is
return gitCredentials
? format({...parse(`${gitUrlParse(repositoryUrl).toString(protocol)}.git`), ...{auth: gitCredentials}})
: repositoryUrl;
return gitCredentials ? {...parsed, ...{token: gitCredentials}}.toString(protocol) : repositoryUrl;
}
return repositoryUrl;
};