Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -249,5 +249,56 @@ describe('AutoInstallContentPackagesTask', () => {
expect(packageClientMock.installPackage).not.toHaveBeenCalled();
expect(dataStreamService.getAllFleetDataStreams).not.toHaveBeenCalled();
});

it('should not downgrade package when a newer prerelease version is installed', async () => {
// Registry has 1.1.0, but a prerelease 2.0.0-preview is already installed.
// The task must not downgrade to 1.1.0.
mockGetInstalledPackages.mockResolvedValue({
items: [
{
name: 'kubernetes_otel',
version: '2.0.0-preview',
},
{
name: 'test_package',
version: '2.0.0-preview',
},
],
});

await runTask();

expect(packageClientMock.installPackage).not.toHaveBeenCalled();
});

it('should not downgrade one package while upgrading another', async () => {
// kubernetes_otel has a prerelease installed (must not downgrade),
// test_package has an older version installed (must upgrade).
mockGetInstalledPackages.mockResolvedValue({
items: [
{
name: 'kubernetes_otel',
version: '2.0.0-preview',
},
{
name: 'test_package',
version: '1.0.0',
},
],
});

await runTask();

expect(packageClientMock.installPackage).toHaveBeenCalledTimes(1);
expect(packageClientMock.installPackage).toHaveBeenCalledWith({
pkgName: 'test_package',
pkgVersion: '1.1.0',
useStreaming: true,
automaticInstall: true,
});
expect(packageClientMock.installPackage).not.toHaveBeenCalledWith(
expect.objectContaining({ pkgName: 'kubernetes_otel' })
);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/
import pMap from 'p-map';
import semverGt from 'semver/functions/gt';
import {
type CoreSetup,
type ElasticsearchClient,
Expand Down Expand Up @@ -239,7 +240,8 @@ export class AutoInstallContentPackagesTask {
this.discoveryMap!
).reduce((acc, [dataset, mapValue]) => {
const packages = mapValue.packages.filter(
(pkg) => !installedPackagesMap[pkg.name] || installedPackagesMap[pkg.name] !== pkg.version
(pkg) =>
!installedPackagesMap[pkg.name] || semverGt(pkg.version, installedPackagesMap[pkg.name])
);
if (packages.length > 0) {
acc[dataset] = { packages };
Expand All @@ -256,7 +258,8 @@ export class AutoInstallContentPackagesTask {
if (
mapValue.packages.every(
(pkg) =>
installedPackagesMap[pkg.name] && installedPackagesMap[pkg.name] === pkg.version
installedPackagesMap[pkg.name] &&
!semverGt(pkg.version, installedPackagesMap[pkg.name])
)
) {
acc.push(dataset);
Expand All @@ -280,7 +283,7 @@ export class AutoInstallContentPackagesTask {

if (hasData) {
for (const { name, version } of packages) {
if (!installedPackagesMap[name] || installedPackagesMap[name] !== version) {
if (!installedPackagesMap[name] || semverGt(version, installedPackagesMap[name])) {
packagesToInstall[name] = version;
}
}
Expand Down
Loading