miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(nx-cloud): do not use bff api for onboarding (#26712)

Browse Source 
## Current Behavior
CLI uses BFF

## Expected Behavior
CLI should not use BFF
This commit is contained in:
Altan Stalker 2024-06-27 07:41:40 -07:00 committed by GitHub
parent 88efb216a2
commit 544eff02b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/nx/src/nx-cloud/utilities/url-shorten.ts
View File

@ -15,7 +15,7 @@ export async function shortenedCloudUrl(
const version = await getNxCloudVersion(apiUrl); const version = await getNxCloudVersion(apiUrl);
if (version && lt(truncateToSemver(version), '2406.11.5')) { if (version && lt(removeVersionModifier(version), '2406.11.5')) {
return apiUrl; return apiUrl;
} }
@ -110,16 +110,18 @@ function getURLifShortenFailed(
async function getInstallationSupportsGitHub(apiUrl: string): Promise<boolean> { async function getInstallationSupportsGitHub(apiUrl: string): Promise<boolean> {
try { try {
const response = await require('axios').get(`${apiUrl}/vcs-integrations`); const response = await require('axios').get(
`${apiUrl}/nx-cloud/system/features`
);
if (!response?.data || response.data.message) { if (!response?.data || response.data.message) {
throw new Error( throw new Error(
response?.data?.message ?? 'Failed to shorten Nx Cloud URL' response?.data?.message ?? 'Failed to shorten Nx Cloud URL'
); );
} }
return !!response.data.github; return !!response.data.isGithubIntegrationEnabled;
} catch (e) { } catch (e) {
if (process.env.NX_VERBOSE_LOGGING) { if (process.env.NX_VERBOSE_LOGGING) {
logger.warn(`Failed to access vcs-integrations endpoint. logger.warn(`Failed to access system features. GitHub integration assumed to be disabled.
${e}`); ${e}`);
} }
return false; return false;
@ -128,10 +130,10 @@ async function getInstallationSupportsGitHub(apiUrl: string): Promise<boolean> {
async function getNxCloudVersion(apiUrl: string): Promise<string | null> { async function getNxCloudVersion(apiUrl: string): Promise<string | null> {
try { try {
const response = await require('axios').get(`${apiUrl}/version`, { const response = await require('axios').get(
responseType: 'document', `${apiUrl}/nx-cloud/system/version`
}); );
const version = extractVersion(response.data); const version = removeVersionModifier(response.data.version);
if (!version) { if (!version) {
throw new Error('Failed to extract version from response.'); throw new Error('Failed to extract version from response.');
} }
@ -142,16 +144,7 @@ async function getNxCloudVersion(apiUrl: string): Promise<string | null> {
} }
} }
function extractVersion(htmlString: string): string | null { function removeVersionModifier(versionString: string): string {
// The pattern assumes 'Version' is inside an h1 tag and the version number is the next span's content
const regex =
/<h1[^>]*>Version<\/h1>\s*<div[^>]*><div[^>]*><div[^>]*><span[^>]*>([^<]+)<\/span>/;
const match = htmlString.match(regex);
return match ? match[1].trim() : null;
}
function truncateToSemver(versionString: string): string {
// version may be something like 2406.13.5.hotfix2 // version may be something like 2406.13.5.hotfix2
return versionString.split(/[\.-]/).slice(0, 3).join('.'); return versionString.split(/[\.-]/).slice(0, 3).join('.');
} }