Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] [Security Solution] Fix prebuilt rules bootstrap endpoint (#205060) #205101

Merged
merged 1 commit into from
Dec 23, 2024
Merged

[8.x] [Security Solution] Fix prebuilt rules bootstrap endpoint (#205060) #205101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions ...prebuilt_rules/api/install_prebuilt_rules_and_timelines/install_prebuilt_rules_package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ export async function installPrebuiltRulesPackage(
config: ConfigType,
context: SecuritySolutionApiRequestHandlerContext
) {
const pkgVersion = await findLatestPackageVersion(config, context, PREBUILT_RULES_PACKAGE_NAME);
let pkgVersion = config.prebuiltRulesPackageVersion;

if (!pkgVersion) {
// Find latest package if the version isn't specified in the config
pkgVersion = await findLatestPackageVersion(context, PREBUILT_RULES_PACKAGE_NAME);
}

return context
.getInternalFleetServices()
Expand All @@ -33,7 +38,7 @@ export async function installEndpointPackage(
config: ConfigType,
context: SecuritySolutionApiRequestHandlerContext
) {
const pkgVersion = await findLatestPackageVersion(config, context, ENDPOINT_PACKAGE_NAME);
const pkgVersion = await findLatestPackageVersion(context, ENDPOINT_PACKAGE_NAME);

return context.getInternalFleetServices().packages.ensureInstalledPackage({
pkgName: ENDPOINT_PACKAGE_NAME,
Expand All @@ -42,25 +47,21 @@ export async function installEndpointPackage(
}

async function findLatestPackageVersion(
config: ConfigType,
context: SecuritySolutionApiRequestHandlerContext,
packageName: string
) {
let pkgVersion = config.prebuiltRulesPackageVersion;
const securityAppClient = context.getAppClient();
const packageClient = context.getInternalFleetServices().packages;

// Find latest package if the version isn't specified in the config
if (!pkgVersion) {
const securityAppClient = context.getAppClient();
// Use prerelease versions in dev environment
const isPrerelease =
securityAppClient.getBuildFlavor() === 'traditional' &&
(securityAppClient.getKibanaVersion().includes('-SNAPSHOT') ||
securityAppClient.getKibanaBranch() === 'main');
// Use prerelease versions in dev environment
const isPrerelease =
securityAppClient.getBuildFlavor() === 'traditional' &&
(securityAppClient.getKibanaVersion().includes('-SNAPSHOT') ||
securityAppClient.getKibanaBranch() === 'main');

const result = await context
.getInternalFleetServices()
.packages.fetchFindLatestPackage(packageName, { prerelease: isPrerelease });
pkgVersion = result.version;
}
return pkgVersion;
const result = await packageClient.fetchFindLatestPackage(packageName, {
prerelease: isPrerelease,
});

return result.version;
}
Loading