get_shareable_references test fix

elastic · Dec 30, 2024 · 585fcec · 585fcec
1 parent 2b373d2
commit 585fcec
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/.buildkite/ftr_security_stateful_configs.yml b/.buildkite/ftr_security_stateful_configs.yml
@@ -104,7 +104,6 @@ enabled:
   - x-pack/test/cloud_security_posture_functional/data_views/config.ts
   - x-pack/test/automatic_import_api_integration/apis/config_basic.ts
   - x-pack/test/automatic_import_api_integration/apis/config_graphs.ts
-  - x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config.ts
   - x-pack/test/spaces_api_integration/deployment_agnostic/stateful.config_trial.ts
   - x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_trial.ts
   - x-pack/test/spaces_api_integration/deployment_agnostic/stateful.copy_to_space.config_basic.ts

diff --git a/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts b/x-pack/test/spaces_api_integration/common/suites/get_shareable_references.ts
@@ -43,9 +43,9 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 export const TEST_CASE_OBJECTS: Record<string, { type: string; id: string }> = deepFreeze({
-  SHAREABLE_TYPE: { type: 'sharedtype', id: CASES.EACH_SPACE.id }, // contains references to four other objects
-  SHAREABLE_TYPE_DOES_NOT_EXIST: { type: 'sharedtype', id: 'does-not-exist' },
-  NON_SHAREABLE_TYPE: { type: 'isolatedtype', id: 'my_isolated_object' }, // one of these exists in each space
+  SHAREABLE_TYPE: { type: 'index-pattern', id: CASES.EACH_SPACE.id }, // contains references to four other objects
+  SHAREABLE_TYPE_DOES_NOT_EXIST: { type: 'index-pattern', id: 'does-not-exist' },
+  NON_SHAREABLE_TYPE: { type: 'url', id: 'my_isolated_object' }, // one of these exists in each space
 });
 // Expected results for each space are defined here since they are used in multiple test suites
 export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]> = {
@@ -54,7 +54,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
-      inboundReferences: [{ type: 'sharedtype', id: CASES.DEFAULT_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in the default space
+      inboundReferences: [{ type: 'index-pattern', id: CASES.DEFAULT_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in the default space
     },
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE_DOES_NOT_EXIST,
@@ -64,28 +64,28 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     },
     { ...TEST_CASE_OBJECTS.NON_SHAREABLE_TYPE, spaces: [], inboundReferences: [] }, // not missing, but has an empty spaces array because it is not a shareable type
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.DEFAULT_ONLY.id,
       spaces: [DEFAULT_SPACE_ID],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_1_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in the default space
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_2_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in the default space
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
@@ -97,7 +97,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
-      inboundReferences: [{ type: 'sharedtype', id: CASES.SPACE_1_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 1
+      inboundReferences: [{ type: 'index-pattern', id: CASES.SPACE_1_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 1
     },
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE_DOES_NOT_EXIST,
@@ -107,29 +107,29 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     },
     { ...TEST_CASE_OBJECTS.NON_SHAREABLE_TYPE, spaces: [], inboundReferences: [] }, // not missing, but has an empty spaces array because it is not a shareable type
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.DEFAULT_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in space 1
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_1_ONLY.id,
       spaces: [SPACE_1_ID],
       spacesWithMatchingAliases: [DEFAULT_SPACE_ID, SPACE_2_ID], // aliases with a matching targetType and sourceId exist in two other spaces
       spacesWithMatchingOrigins: ['other_space'], // The second test assertion for spacesWithMatchingOrigins is an object that has a matching origin in one other space
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_2_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in space 1
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
@@ -141,7 +141,7 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE,
       spaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)
-      inboundReferences: [{ type: 'sharedtype', id: CASES.SPACE_2_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 2
+      inboundReferences: [{ type: 'index-pattern', id: CASES.SPACE_2_ONLY.id, name: 'refname' }], // only reflects inbound reference that exist in space 2
     },
     {
       ...TEST_CASE_OBJECTS.SHAREABLE_TYPE_DOES_NOT_EXIST,
@@ -151,28 +151,28 @@ export const EXPECTED_RESULTS: Record<string, SavedObjectReferenceWithContext[]>
     },
     { ...TEST_CASE_OBJECTS.NON_SHAREABLE_TYPE, spaces: [], inboundReferences: [] }, // not missing, but has an empty spaces array because it is not a shareable type
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.DEFAULT_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in space 2
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_1_ONLY.id,
       spaces: [],
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
       isMissing: true, // doesn't exist in space 2
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.SPACE_2_ONLY.id,
       spaces: [SPACE_2_ID],
       spacesWithMatchingOrigins: ['*'], // The third test assertion for spacesWithMatchingOrigins is an object that has a matching origin in all spaces (this takes precedence, causing SPACE_2_ID to be omitted)
       inboundReferences: [{ ...TEST_CASE_OBJECTS.SHAREABLE_TYPE, name: 'refname' }],
     },
     {
-      type: 'sharedtype',
+      type: 'index-pattern',
       id: CASES.ALL_SPACES.id,
       spaces: ['*'],
       // No matching origins because there are no copies of the object in another space (we no longer consider a raw ID match to be an origin match)

diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
@@ -20,7 +20,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
 
     // total runtime ~ 17m
     loadTestFile(require.resolve('./get_shareable_references')); // ~ 30s
-    loadTestFile(require.resolve('./update_objects_spaces')); // ~ 1m
-    loadTestFile(require.resolve('./disable_legacy_url_aliases')); // ~ 30s
+    // loadTestFile(require.resolve('./update_objects_spaces')); // ~ 1m
+    // loadTestFile(require.resolve('./disable_legacy_url_aliases')); // ~ 30s
   });
 }