feat: Handle API URLs for Forgejo, Gitea, GitLab and GitHub
This commit is contained in:
parent
9791a4f146
commit
83c6f98e8e
3 changed files with 66 additions and 17 deletions
40
dist/index.js
vendored
40
dist/index.js
vendored
|
@ -405,8 +405,10 @@ function createPullRequest(inputs) {
|
||||||
core.startGroup('Determining the base and head repositories');
|
core.startGroup('Determining the base and head repositories');
|
||||||
const baseRemote = gitConfigHelper.getGitRemote();
|
const baseRemote = gitConfigHelper.getGitRemote();
|
||||||
// Init the GitHub clients
|
// Init the GitHub clients
|
||||||
const ghBranch = new github_helper_1.GitHubHelper(baseRemote.hostname, inputs.branchToken);
|
const apiUrl = yield github_helper_1.GitHubHelper.determineApiPath(baseRemote.hostname);
|
||||||
const ghPull = new github_helper_1.GitHubHelper(baseRemote.hostname, inputs.token);
|
core.info(`Using API base URL: ${apiUrl}`);
|
||||||
|
const ghBranch = new github_helper_1.GitHubHelper(apiUrl, inputs.branchToken);
|
||||||
|
const ghPull = new github_helper_1.GitHubHelper(apiUrl, inputs.token);
|
||||||
// Determine the head repository; the target for the pull request branch
|
// Determine the head repository; the target for the pull request branch
|
||||||
const branchRemoteName = inputs.pushToFork ? 'fork' : 'origin';
|
const branchRemoteName = inputs.pushToFork ? 'fork' : 'origin';
|
||||||
const branchRepository = inputs.pushToFork
|
const branchRepository = inputs.pushToFork
|
||||||
|
@ -1278,20 +1280,40 @@ const ERROR_PR_REVIEW_TOKEN_SCOPE = 'Validation Failed: "Could not resolve to a
|
||||||
const ERROR_PR_FORK_COLLAB = `Fork collab can't be granted by someone without permission`;
|
const ERROR_PR_FORK_COLLAB = `Fork collab can't be granted by someone without permission`;
|
||||||
const blobCreationLimit = (0, p_limit_1.default)(8);
|
const blobCreationLimit = (0, p_limit_1.default)(8);
|
||||||
class GitHubHelper {
|
class GitHubHelper {
|
||||||
constructor(githubServerHostname, token) {
|
constructor(apiUrl, token) {
|
||||||
const options = {};
|
const options = {};
|
||||||
if (token) {
|
if (token) {
|
||||||
options.auth = `${token}`;
|
options.auth = `${token}`;
|
||||||
}
|
}
|
||||||
if (githubServerHostname !== 'github.com') {
|
options.baseUrl = apiUrl;
|
||||||
options.baseUrl = `https://${githubServerHostname}/api/v1`;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
options.baseUrl = 'https://api.github.com';
|
|
||||||
}
|
|
||||||
options.throttle = octokit_client_1.throttleOptions;
|
options.throttle = octokit_client_1.throttleOptions;
|
||||||
this.octokit = new octokit_client_1.Octokit(options);
|
this.octokit = new octokit_client_1.Octokit(options);
|
||||||
}
|
}
|
||||||
|
static determineApiPath(hostname) {
|
||||||
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
|
if (hostname === 'github.com') {
|
||||||
|
return "https://api.github.com";
|
||||||
|
}
|
||||||
|
const baseUrl = `https://${hostname}`;
|
||||||
|
const possiblePaths = ['/api/v4/version', '/api/forgejo/v1/version', '/api/v1/version'];
|
||||||
|
for (const path of possiblePaths) {
|
||||||
|
try {
|
||||||
|
const url = `${baseUrl}${path}`;
|
||||||
|
const response = yield fetch(url, { method: 'GET', redirect: 'manual' });
|
||||||
|
const contentType = response.headers.get('Content-Type') || '';
|
||||||
|
if ((response.ok || [401, 403].includes(response.status)) && // Check for valid API status codes
|
||||||
|
contentType.includes('application/json') // Ensure it's returning JSON
|
||||||
|
) {
|
||||||
|
return path.includes('/version') ? url.replace('/version', '') : url;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (error) {
|
||||||
|
// Ignore errors and try the next path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error(`Unable to determine API base URL for hostname: ${hostname}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
parseRepository(repository) {
|
parseRepository(repository) {
|
||||||
const [owner, repo] = repository.split('/');
|
const [owner, repo] = repository.split('/');
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -51,8 +51,10 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
|
||||||
core.startGroup('Determining the base and head repositories')
|
core.startGroup('Determining the base and head repositories')
|
||||||
const baseRemote = gitConfigHelper.getGitRemote()
|
const baseRemote = gitConfigHelper.getGitRemote()
|
||||||
// Init the GitHub clients
|
// Init the GitHub clients
|
||||||
const ghBranch = new GitHubHelper(baseRemote.hostname, inputs.branchToken)
|
const apiUrl = await GitHubHelper.determineApiPath(baseRemote.hostname);
|
||||||
const ghPull = new GitHubHelper(baseRemote.hostname, inputs.token)
|
core.info(`Using API base URL: ${apiUrl}`);
|
||||||
|
const ghBranch = new GitHubHelper(apiUrl, inputs.branchToken)
|
||||||
|
const ghPull = new GitHubHelper(apiUrl, inputs.token)
|
||||||
// Determine the head repository; the target for the pull request branch
|
// Determine the head repository; the target for the pull request branch
|
||||||
const branchRemoteName = inputs.pushToFork ? 'fork' : 'origin'
|
const branchRemoteName = inputs.pushToFork ? 'fork' : 'origin'
|
||||||
const branchRepository = inputs.pushToFork
|
const branchRepository = inputs.pushToFork
|
||||||
|
|
|
@ -41,20 +41,44 @@ type TreeObject = {
|
||||||
export class GitHubHelper {
|
export class GitHubHelper {
|
||||||
private octokit: InstanceType<typeof Octokit>
|
private octokit: InstanceType<typeof Octokit>
|
||||||
|
|
||||||
constructor(githubServerHostname: string, token: string) {
|
constructor(apiUrl: string, token: string) {
|
||||||
const options: OctokitOptions = {}
|
const options: OctokitOptions = {}
|
||||||
if (token) {
|
if (token) {
|
||||||
options.auth = `${token}`
|
options.auth = `${token}`
|
||||||
}
|
}
|
||||||
if (githubServerHostname !== 'github.com') {
|
options.baseUrl = apiUrl;
|
||||||
options.baseUrl = `https://${githubServerHostname}/api/v3`
|
|
||||||
} else {
|
|
||||||
options.baseUrl = 'https://api.github.com'
|
|
||||||
}
|
|
||||||
options.throttle = throttleOptions
|
options.throttle = throttleOptions
|
||||||
this.octokit = new Octokit(options)
|
this.octokit = new Octokit(options)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static async determineApiPath(hostname: string): Promise<string> {
|
||||||
|
if (hostname === 'github.com') {
|
||||||
|
return "https://api.github.com";
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseUrl = `https://${hostname}`;
|
||||||
|
const possiblePaths = ['/api/v4/version', '/api/forgejo/v1/version', '/api/v1/version'];
|
||||||
|
|
||||||
|
for (const path of possiblePaths) {
|
||||||
|
try {
|
||||||
|
const url = `${baseUrl}${path}`;
|
||||||
|
const response = await fetch(url, { method: 'GET', redirect: 'manual' });
|
||||||
|
|
||||||
|
const contentType = response.headers.get('Content-Type') || '';
|
||||||
|
if (
|
||||||
|
(response.ok || [401, 403].includes(response.status)) && // Check for valid API status codes
|
||||||
|
contentType.includes('application/json') // Ensure it's returning JSON
|
||||||
|
) {
|
||||||
|
return path.includes('/version') ? url.replace('/version', '') : url;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// Ignore errors and try the next path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Unable to determine API base URL for hostname: ${hostname}`);
|
||||||
|
}
|
||||||
|
|
||||||
private parseRepository(repository: string): Repository {
|
private parseRepository(repository: string): Repository {
|
||||||
const [owner, repo] = repository.split('/')
|
const [owner, repo] = repository.split('/')
|
||||||
return {
|
return {
|
||||||
|
@ -403,3 +427,4 @@ export class GitHubHelper {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue