github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Synthetics] Monitor saved objects - add migratedType to synthetics monitor 8.6.0 migration (#144928)

Browse source 
## Summary

Resolves https://github.com/elastic/kibana/issues/144915

Adds the `migratedType` to the synthetics monitor saved object migration
for 8.6.0. This value represents the schema for the encrypted saved
object. Although it hasn't changed from 8.5.0 -> 8.6.0, it is
recommended to always include this value explicitly.
This commit is contained in:
Dominique Clarke 2022-11-10 10:13:26 -05:00 • committed by GitHub
parent 37c23b4092
commit ccd670eab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.6.0.ts
View file

@ -7,6 +7,7 @@
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
import { ConfigKey, SyntheticsMonitorWithSecrets } from '../../../../../../common/runtime_types';
import { SYNTHETICS_MONITOR_ENCRYPTED_TYPE } from '../../synthetics_monitor';
export const migration860 = (encryptedSavedObjects: EncryptedSavedObjectsPluginSetup) => {
return encryptedSavedObjects.createMigration<
@ -31,5 +32,6 @@ export const migration860 = (encryptedSavedObjects: EncryptedSavedObjectsPluginS
},
};
},
migratedType: SYNTHETICS_MONITOR_ENCRYPTED_TYPE,
});
};

20
x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/saved_objects.ts
View file

@ -10,12 +10,14 @@ import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-p
import { privateLocationsSavedObject } from './private_locations';
import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../common/constants';
import { secretKeys } from '../../../../common/constants/monitor_management';
import { DynamicSettings } from '../../../../common/runtime_types';
import { UMSavedObjectsQueryFn } from '../adapters';
import { UptimeConfig } from '../../../../common/config';
import { settingsObjectId, umDynamicSettings } from './uptime_settings';
import { syntheticsMonitorType, getSyntheticsMonitorSavedObjectType } from './synthetics_monitor';
import {
getSyntheticsMonitorSavedObjectType,
SYNTHETICS_MONITOR_ENCRYPTED_TYPE,
} from './synthetics_monitor';
import { syntheticsServiceApiKey } from './service_api_key';
export const registerUptimeSavedObjects = (
@ -33,19 +35,7 @@ export const registerUptimeSavedObjects = (
attributesToEncrypt: new Set(['apiKey']),
});
encryptedSavedObjects.registerType({
type: syntheticsMonitorType,
attributesToEncrypt: new Set([
'secrets',
/* adding secretKeys to the list of attributes to encrypt ensures
* that secrets are never stored on the resulting saved object,
* even in the presence of developer error.
*
* In practice, all secrets should be stored as a single JSON
* payload on the `secrets` key. This ensures performant decryption. */
...secretKeys,
]),
});
encryptedSavedObjects.registerType(SYNTHETICS_MONITOR_ENCRYPTED_TYPE);
};
export interface UMSavedObjectsAdapter {

15
x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/synthetics_monitor.ts
View file

@ -7,10 +7,25 @@
import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
import { SavedObjectsType } from '@kbn/core/server';
import { i18n } from '@kbn/i18n';
import { secretKeys } from '../../../../common/constants/monitor_management';
import { monitorMigrations } from './migrations/monitors';
export const syntheticsMonitorType = 'synthetics-monitor';
export const SYNTHETICS_MONITOR_ENCRYPTED_TYPE = {
type: syntheticsMonitorType,
attributesToEncrypt: new Set([
'secrets',
/* adding secretKeys to the list of attributes to encrypt ensures
* that secrets are never stored on the resulting saved object,
* even in the presence of developer error.
*
* In practice, all secrets should be stored as a single JSON
* payload on the `secrets` key. This ensures performant decryption. */
...secretKeys,
]),
};
export const getSyntheticsMonitorSavedObjectType = (
encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
): SavedObjectsType => {