Skip to content

Commit 67cb4b8

Browse files
Exclude version from package config attributes that are copied, add safeguard to package config bulk create (#73128) (#73393)
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 604321c commit 67cb4b8

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

x-pack/plugins/ingest_manager/server/services/agent_config.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,14 @@ class AgentConfigService {
233233
if (baseAgentConfig.package_configs.length) {
234234
const newPackageConfigs = (baseAgentConfig.package_configs as PackageConfig[]).map(
235235
(packageConfig: PackageConfig) => {
236-
const { id: packageConfigId, ...newPackageConfig } = packageConfig;
236+
const { id: packageConfigId, version, ...newPackageConfig } = packageConfig;
237237
return newPackageConfig;
238238
}
239239
);
240-
await packageConfigService.bulkCreate(
241-
soClient,
242-
newPackageConfigs,
243-
newAgentConfig.id,
244-
options
245-
);
240+
await packageConfigService.bulkCreate(soClient, newPackageConfigs, newAgentConfig.id, {
241+
...options,
242+
bumpConfigRevision: false,
243+
});
246244
}
247245

248246
// Get updated config

x-pack/plugins/ingest_manager/server/services/package_config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class PackageConfigService {
121121
options?: { user?: AuthenticatedUser; bumpConfigRevision?: boolean }
122122
): Promise<PackageConfig[]> {
123123
const isoDate = new Date().toISOString();
124-
const { saved_objects: newSos } = await soClient.bulkCreate<PackageConfigSOAttributes>(
124+
const { saved_objects } = await soClient.bulkCreate<PackageConfigSOAttributes>(
125125
packageConfigs.map((packageConfig) => ({
126126
type: SAVED_OBJECT_TYPE,
127127
attributes: {
@@ -136,6 +136,9 @@ class PackageConfigService {
136136
}))
137137
);
138138

139+
// Filter out invalid SOs
140+
const newSos = saved_objects.filter((so) => !so.error && so.attributes);
141+
139142
// Assign it to the given agent config
140143
await agentConfigService.assignPackageConfigs(
141144
soClient,

0 commit comments

Comments
 (0)