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

Jump to bottom

Manage installation/removal of the Wazuh plugin #28

Merged
merged 5 commits into from
May 9, 2023
Merged

Manage installation/removal of the Wazuh plugin #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27fa360
Manage the Wazuh plugin using cli_plugin
AlexRuiz7 Feb 21, 2023
569f4b7
Fix slice on undefined error
Machi3mfl May 3, 2023
d43c65a
Fix types in injected metadata service
Machi3mfl May 3, 2023
2e852c3
Remove params declaration to fix linter error
Machi3mfl May 3, 2023
d66b80a
Change get wazuh version
Machi3mfl May 8, 2023
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
15 changes: 13 additions & 2 deletions src/cli_plugin/install/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ import { fromRoot } from '../../core/server/utils';

const LATEST_PLUGIN_BASE_URL =
'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards';
const LATEST_WAZUH_PLUGIN_BASE_URL = 'https://packages-dev.wazuh.com/pre-release/ui/dashboard';

function generateUrls({ version, plugin }) {
return [plugin, generatePluginUrl(version, plugin)];
function generateUrls({ version, plugin, wazuhVersion }) {
return plugin.includes('wazuh')
? [plugin, generateWazuhPluginUrl(wazuhVersion, plugin)]
AlexRuiz7 marked this conversation as resolved.
Show resolved Hide resolved
: [plugin, generatePluginUrl(version, plugin)];
}

function generatePluginUrl(version, plugin) {
Expand All @@ -48,6 +51,10 @@ function generatePluginUrl(version, plugin) {
return `${LATEST_PLUGIN_BASE_URL}/${version}/latest/${platform}/${arch}/tar/builds/opensearch-dashboards/plugins/${plugin}-${version}.zip`;
}

function generateWazuhPluginUrl(version, plugin) {
return `${LATEST_WAZUH_PLUGIN_BASE_URL}/${plugin}-${version}-1.zip`;
}

export function parseMilliseconds(val) {
let result;

Expand All @@ -69,12 +76,16 @@ export function parse(command, options, osdPackage) {
config: options.config || '',
plugin: command,
version: osdPackage.version,
wazuhVersion: osdPackage.wazuh.version,
pluginDir: fromRoot('plugins'),
};

settings.urls = generateUrls(settings);
settings.workingPath = resolve(settings.pluginDir, '.plugin.installing');
settings.tempArchiveFile = resolve(settings.workingPath, 'archive.part');

// Clean up.
delete settings.wazuhVersion;

return settings;
}
7 changes: 6 additions & 1 deletion src/cli_plugin/install/settings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ describe('parseMilliseconds function', function () {
describe('parse function', function () {
const command = 'plugin name';
const defaultOptions = { pluginDir: fromRoot('plugins') };
const osdPackage = { version: 1234 };
const osdPackage = {
version: 1234,
wazuh: {
version: 1234,
},
};

afterAll(() => {
Object.defineProperties(process, {
Expand Down
10 changes: 5 additions & 5 deletions src/core/public/injected_metadata/injected_metadata_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ export interface InjectedMetadataParams {
* @internal
*/
export class InjectedMetadataService {
private state = deepFreeze(
this.params.injectedMetadata
) as InjectedMetadataParams['injectedMetadata'];
private state: InjectedMetadataParams['injectedMetadata'];

constructor(private readonly params: InjectedMetadataParams) {}
constructor(params: InjectedMetadataParams) {
this.state = deepFreeze(params.injectedMetadata) as InjectedMetadataParams['injectedMetadata'];
}

public start(): InjectedMetadataStart {
return this.setup();
Expand Down Expand Up @@ -153,7 +153,7 @@ export class InjectedMetadataService {
},

getWazuhDocVersion: () => {
return this.state.wazuhVersion.slice(0, 3) || 'current';
return this.state.wazuhVersion?.split('.').slice(0, 2).join('.') || 'current';
},
};
}
Expand Down