Skip to content

[Fleet] Replace all references to unsafe YML load/dump methods in Fleet codebase #190659

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

Merged
kpollich merged 2 commits into from
Aug 19, 2024
Merged

[Fleet] Replace all references to unsafe YML load/dump methods in Fleet codebase #190659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a776f
Replace all references to unsafe YML load/dump methods in Fleet codebase
kpollich Aug 16, 2024
a318acc
Merge branch 'main' into fleet/more-unsafe-yml-operations
elasticmachine Aug 19, 2024
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
4 changes: 2 additions & 2 deletions .../fleet/server/services/epm/packages/custom_integrations/assets/dataset/ingest_pipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import * as yaml from 'js-yaml';
import { safeDump } from 'js-yaml';

// NOTE: The install methods will take care of adding a reference to a @custom pipeline. We don't need to add one here.
export const createDefaultPipeline = (dataset: string, type: string) => {
Expand All @@ -25,5 +25,5 @@ export const createDefaultPipeline = (dataset: string, type: string) => {
managed: true,
},
};
return yaml.dump(pipeline);
return safeDump(pipeline);
};
4 changes: 2 additions & 2 deletions ...plugins/fleet/server/services/epm/packages/custom_integrations/assets/dataset/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import * as yaml from 'js-yaml';
import { safeDump } from 'js-yaml';

import { convertStringToTitle } from '../../utils';
import type { AssetOptions } from '../generate';
Expand All @@ -17,5 +17,5 @@ export const createDatasetManifest = (dataset: string, assetOptions: AssetOption
title: convertStringToTitle(dataset),
type,
};
return yaml.dump(manifest);
return safeDump(manifest);
};
4 changes: 2 additions & 2 deletions x-pack/plugins/fleet/server/services/epm/packages/custom_integrations/assets/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import * as yaml from 'js-yaml';
import { safeDump } from 'js-yaml';

import type { AssetOptions } from './generate';

Expand Down Expand Up @@ -34,5 +34,5 @@ export const createManifest = (assetOptions: AssetOptions) => {
},
};

return yaml.dump(manifest);
return safeDump(manifest);
};
4 changes: 2 additions & 2 deletions x-pack/plugins/fleet/server/services/epm/packages/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { dump } from 'js-yaml';
import { safeDump } from 'js-yaml';

import type { AssetsMap } from '../../../../common/types';

Expand All @@ -14,7 +14,7 @@ import type { RegistryDataStream } from '../../../../common';
import { resolveDataStreamFields } from './utils';

describe('resolveDataStreamFields', () => {
const statusAssetYml = dump([
const statusAssetYml = safeDump([
{
name: 'apache.status',
type: 'group',
Expand Down