Skip to content

Commit

Permalink
[FTR - esArchiver] Update encrypted_saved_objects_api_integration t…
Browse files Browse the repository at this point in the history 
…est archives to reduce flakiness (#162321)

## Summary

Part of #161882

Updates all archives of the `encrypted_saved_objects_api_integration`
test suite:
* Removing SO index definitions.
* Updating documents defined in `data.json`.
  • Loading branch information
@gsoldevila
gsoldevila authored Jul 24, 2023
1 parent aa93368 commit c3a5da8
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 7,377 deletions.
6 changes: 3 additions & 3 deletions test/api_integration/apis/saved_objects/delete_unknown_types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
MAIN_SAVED_OBJECT_INDEX,
ANALYTICS_SAVED_OBJECT_INDEX,
} from '@kbn/core-saved-objects-server';
import { FtrProviderContext } from '../../ftr_provider_context';
import type { FtrProviderContext } from '../../ftr_provider_context';

const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

Expand All @@ -22,8 +22,8 @@ export default function ({ getService }: FtrProviderContext) {

describe('/deprecations/_delete_unknown_types', () => {
before(async () => {
// we are injecting unknown types in this test, so we need to relax the mappings restrictions
await es.indices.putMapping({ index: '.kibana', dynamic: true });
// we are injecting unknown types in this archive, so we need to relax the mappings restrictions
await es.indices.putMapping({ index: MAIN_SAVED_OBJECT_INDEX, dynamic: true });
await esArchiver.load(
'test/api_integration/fixtures/es_archiver/saved_objects/delete_unknown_types'
);
Expand Down
113 changes: 39 additions & 74 deletions ...pted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,19 @@
"type": "doc",
"value": {
"id": "config:8.0.0",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"config": {
"buildNum": 9007199254740991
},
"migrationVersion": {
"config": "7.9.0"
},
"references": [
],
"references": [],
"type": "config",
"updated_at": "2020-06-17T15:03:14.532Z"
}
}
}

{
"type": "doc",
"value": {
"id": "space:default",
"index": ".kibana_1",
"source": {
"migrationVersion": {
"space": "6.6.0"
},
"references": [
"updated_at": "2020-06-17T15:03:14.532Z",
"namespaces": [
"default"
],
"space": {
"_reserved": true,
"color": "#00bfb3",
"description": "This is your default space!",
"disabledFeatures": [
],
"name": "Default"
},
"type": "space",
"updated_at": "2020-06-17T15:03:27.426Z"
"coreMigrationVersion": "8.8.0",
"typeMigrationVersion": "7.9.0"
}
}
}
Expand All @@ -47,11 +23,10 @@
"type": "doc",
"value": {
"id": "apm-telemetry:apm-telemetry",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"apm-telemetry": {
"agents": {
},
"agents": {},
"cardinality": {
"transaction": {
"name": {
Expand Down Expand Up @@ -194,10 +169,10 @@
}
}
},
"references": [
],
"references": [],
"type": "apm-telemetry",
"updated_at": "2020-06-17T15:03:47.184Z"
"updated_at": "2020-06-17T15:03:47.184Z",
"coreMigrationVersion": "8.8.0"
}
}
}
Expand All @@ -206,17 +181,14 @@
"type": "doc",
"value": {
"id": "saved-object-with-migration:74f3e6d7-b7bb-477d-ac28-92ee22728e6e",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"saved-object-with-migration": {
"encryptedAttribute": "JuDwwSjflpKmPKUIfjgo04E0DW9iyhp8C94hwvflgkS0SUUPt+862FQ1eja4VEfEG7HVUt7xxj+BWeZv9vrf4olxgbr4/f5RrT8BVic0EOVS9nhspiDVEv12mV0uDWGtdneB/UWyaZg+0Qr0tPrwceSl8BS///U=",
"nonEncryptedAttribute": "elastic"
},
"migrationVersion": {
"saved-object-with-migration": "7.7.0"
},
"references": [
],
"typeMigrationVersion": "7.7.0",
"references": [],
"type": "saved-object-with-migration",
"updated_at": "2020-06-17T15:35:39.839Z"
}
Expand All @@ -227,7 +199,7 @@
"type": "doc",
"value": {
"id": "custom-space:saved-object-with-migration:a67c6950-eed8-11eb-9a62-032b4e4049d1",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"saved-object-with-migration": {
"encryptedAttribute": "BIOBsx5SjLq3ZQdOJv06XeCAMY9ZrYj8K5bcGa5+wpd3TeT2sqln1+9AGblnfxT7LXRI3sLWQ900+wRQzBhJYx8PNKH+Yw+GdeESpu73PFHdWt/52cJKr+b4EPALFc00tIMEDHdT9FyQhqJ7nV8UpwtjcuTp9SA=",
Expand All @@ -236,9 +208,7 @@
"type": "saved-object-with-migration",
"references": [],
"namespace": "custom-space",
"migrationVersion": {
"saved-object-with-migration": "7.7.0"
},
"typeMigrationVersion": "7.7.0",
"updated_at": "2021-07-27T12:46:23.881Z"
}
}
Expand All @@ -248,7 +218,7 @@
"type": "doc",
"value": {
"id": "saved-object-with-migration:362828f0-eef2-11eb-9073-11359682300a",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"saved-object-with-migration": {
"encryptedAttribute": "wWDAtF/5PkCb5BxjfWyRxoIoHbJXlb5cGAKg9ztZ1Bz9Zwo0/xf2yTa3Gq/CbYrvey/F9FZkZOUk03USPaqa5mfFO8FhORkfmNLQaPhgCIDNd6SbIhN8RYkqWVTYSVgcZrwes+VwiTUZ29mCJprVSHwXdyAOy4g=",
Expand All @@ -257,9 +227,7 @@
},
"type": "saved-object-with-migration",
"references": [],
"migrationVersion": {
"saved-object-with-migration": "7.9.0"
},
"typeMigrationVersion": "7.9.0",
"updated_at": "2021-07-27T15:49:22.324Z"
}
}
Expand All @@ -269,7 +237,7 @@
"type": "doc",
"value": {
"id": "custom-space:saved-object-with-migration:36448a90-eef2-11eb-9073-11359682300a",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"saved-object-with-migration": {
"encryptedAttribute": "33lfpnBI136UfkdcQLzovzBXdUaeDouN0Z32qkVutgZJ5SU60hMtaHWXNkaU9DGy9jtr0ptwm6FCYmZbyDrlGMwyZP2n0PzMhwW9fRcBh7he12Cm1mImWTrxgYoRtc1MX20/orbINx5VnuNl1Ide7htAm1oPRjM=",
Expand All @@ -279,9 +247,7 @@
"type": "saved-object-with-migration",
"references": [],
"namespace": "custom-space",
"migrationVersion": {
"saved-object-with-migration": "7.9.0"
},
"typeMigrationVersion": "7.9.0",
"updated_at": "2021-07-27T15:49:22.509Z"
}
}
Expand All @@ -291,15 +257,15 @@
"type": "doc",
"value": {
"id": "ui-metric:kibana-user_agent:Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"references": [
],
"references": [],
"type": "ui-metric",
"ui-metric": {
"count": 1
},
"updated_at": "2020-06-17T15:36:23.487Z"
"updated_at": "2020-06-17T15:36:23.487Z",
"coreMigrationVersion": "8.8.0"
}
}
}
Expand All @@ -308,13 +274,14 @@
"type": "doc",
"value": {
"id": "ui-metric:Kibana_home:sampleDataDecline",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"type": "ui-metric",
"ui-metric": {
"count": 1
},
"updated_at": "2020-06-17T15:36:23.488Z"
"updated_at": "2020-06-17T15:36:23.488Z",
"coreMigrationVersion": "8.8.0"
}
}
}
Expand All @@ -323,13 +290,14 @@
"type": "doc",
"value": {
"id": "ui-metric:Kibana_home:welcomeScreenMount",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"type": "ui-metric",
"ui-metric": {
"count": 1
},
"updated_at": "2020-06-17T15:36:23.488Z"
"updated_at": "2020-06-17T15:36:23.488Z",
"coreMigrationVersion": "8.8.0"
}
}
}
Expand All @@ -338,17 +306,17 @@
"type": "doc",
"value": {
"id": "telemetry:telemetry",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"references": [
],
"references": [],
"telemetry": {
"lastReported": 1592408310031,
"reportFailureCount": 0,
"userHasSeenNotice": true
},
"type": "telemetry",
"updated_at": "2020-06-17T15:38:30.031Z"
"updated_at": "2020-06-17T15:38:30.031Z",
"coreMigrationVersion": "8.8.0"
}
}
}
Expand All @@ -357,7 +325,7 @@
"type": "doc",
"value": {
"id": "maps-telemetry:maps-telemetry",
"index": ".kibana_1",
"index": ".kibana",
"source": {
"maps-telemetry": {
"attributesPerMap": {
Expand All @@ -366,10 +334,8 @@
"max": 0,
"min": 0
},
"emsVectorLayersCount": {
},
"layerTypesCount": {
},
"emsVectorLayersCount": {},
"layerTypesCount": {},
"layersCount": {
"avg": 0,
"max": 0,
Expand All @@ -385,8 +351,7 @@
},
"timeCaptured": "2020-06-17T16:29:27.563Z"
},
"references": [
],
"references": [],
"type": "maps-telemetry",
"updated_at": "2020-06-17T16:29:27.563Z"
}
Expand Down
Loading

0 comments on commit c3a5da8

Please sign in to comment.