Skip to content

Commit

Permalink
[7.9] Rename package configs SO to package policies (#74422) (#74461)
Browse files Browse the repository at this point in the history
* Rename package configs SO to package policies (#74422)

# Conflicts:
#	x-pack/test/page_load_metrics/es_archives/default/mappings.json
#	x-pack/test/security_solution_cypress/es_archives/export_rule/mappings.json

* Fix tests
  • Loading branch information
jen-huang committed Aug 6, 2020
1 parent c6c1eb4 commit 1187070
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/

export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-configs';
export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-policies';
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export class ManifestManager {
const { items, total } = await this.packageConfigService.list(this.savedObjectsClient, {
page,
perPage: 20,
kuery: 'ingest-package-configs.package.name:endpoint',
kuery: 'ingest-package-policies.package.name:endpoint',
});

for (const packageConfig of items) {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/es_archives/fleet/agents/mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"application_usage_transactional": "965839e75f809fefe04f92dc4d99722a",
"action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
"fleet-agent-events": "3231653fafe4ef3196fe3b32ab774bf2",
"ingest-package-configs": "2346514df03316001d56ed4c8d46fa94",
"ingest-package-policies": "2346514df03316001d56ed4c8d46fa94",
"apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
"inventory-view": "5299b67717e96502c77babf1c16fd4d3",
"upgrade-assistant-reindex-operation": "296a89039fc4260292be36b1b005d8f2",
Expand Down Expand Up @@ -1834,7 +1834,7 @@
}
}
},
"ingest-package-configs": {
"ingest-package-policies": {
"properties": {
"config_id": {
"type": "keyword"
Expand Down
4 changes: 2 additions & 2 deletions x-pack/test/functional/es_archives/lists/mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"maps-telemetry": "5ef305b18111b77789afefbd36b66171",
"namespace": "2f4316de49999235636386fe51dc06c1",
"cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
"ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad",
"ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad",
"timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
"siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
"config": "c63748b75f39d0c54de12d12c1ccbc20",
Expand Down Expand Up @@ -1274,7 +1274,7 @@
}
}
},
"ingest-package-configs": {
"ingest-package-policies": {
"properties": {
"config_id": {
"type": "keyword"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
"index-pattern": "66eccb05066c5a89924f48a9e9736499",
"infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
"ingest-agent-configs": "d9a5cbdce8e937f674a7b376c47a34a1",
"ingest-package-configs": "c0fe6347b0eebcbf421841669e3acd31",
"ingest-agent-policies": "d9a5cbdce8e937f674a7b376c47a34a1",
"ingest-package-policies": "c0fe6347b0eebcbf421841669e3acd31",
"ingest-outputs": "0e57221778a7153c8292edf154099036",
"ingest_manager_settings": "c5b0749b4ab03c582efd4c14cb8f132c",
"inventory-view": "88fc7e12fd1b45b6f0787323ce4f18d2",
Expand Down Expand Up @@ -2066,7 +2066,7 @@
}
}
},
"ingest-agent-configs": {
"ingest-agent-policies": {
"properties": {
"datasources": {
"type": "keyword"
Expand Down Expand Up @@ -2103,7 +2103,7 @@
}
}
},
"ingest-package-configs": {
"ingest-package-policies": {
"properties": {
"config_id": {
"type": "keyword"
Expand Down Expand Up @@ -2597,7 +2597,7 @@
},
"type": "text"
},
"ingest-agent-configs": {
"ingest-agent-policies": {
"fields": {
"keyword": {
"ignore_above": 256,
Expand All @@ -2606,7 +2606,7 @@
},
"type": "text"
},
"ingest-package-configs": {
"ingest-package-policies": {
"fields": {
"keyword": {
"ignore_above": 256,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"infrastructure-ui-source": "2b2809653635caf490c93f090502d04c",
"ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c",
"ingest-outputs": "87da6a0e27b3a61ad389fb7a7e2da293",
"ingest-package-configs": "48e8bd97e488008e21c0b5a2367b83ad",
"ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad",
"ingest_manager_settings": "c5b0749b4ab03c582efd4c14cb8f132c",
"inventory-view": "88fc7e12fd1b45b6f0787323ce4f18d2",
"kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
Expand Down Expand Up @@ -1926,7 +1926,7 @@
}
}
},
"ingest-package-configs": {
"ingest-package-policies": {
"properties": {
"config_id": {
"type": "keyword"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await pageObjects.policy.navigateToPolicyDetails('invalid-id');
await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
'Saved object [ingest-package-configs/invalid-id] not found'
'Saved object [ingest-package-policies/invalid-id] not found'
);
});
});
Expand Down

0 comments on commit 1187070

Please sign in to comment.