Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@elena-shostak
elena-shostak committed Dec 23, 2024
1 parent 4c77001 commit 2df08a0
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 74 deletions.
10 changes: 4 additions & 6 deletions x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ export function createStatefulTestConfig<T extends DeploymentAgnosticCommonServi
) {
return async ({ readConfigFile }: FtrConfigProviderContext) => {
if (options.esServerArgs || options.kbnServerArgs) {
// throw new Error(
// `FTR doesn't provision custom ES/Kibana server arguments into the ESS deployment.
// It may lead to unexpected test failures on Cloud. Please contact #appex-qa.`
// );
throw new Error(
`FTR doesn't provision custom ES/Kibana server arguments into the ESS deployment.
It may lead to unexpected test failures on Cloud. Please contact #appex-qa.`
);
}

// if config is executed on CI or locally
Expand Down Expand Up @@ -118,7 +118,6 @@ export function createStatefulTestConfig<T extends DeploymentAgnosticCommonServi
`xpack.security.authc.realms.saml.${MOCK_IDP_REALM_NAME}.attributes.groups=${MOCK_IDP_ATTRIBUTE_ROLES}`,
`xpack.security.authc.realms.saml.${MOCK_IDP_REALM_NAME}.attributes.name=${MOCK_IDP_ATTRIBUTE_NAME}`,
`xpack.security.authc.realms.saml.${MOCK_IDP_REALM_NAME}.attributes.mail=${MOCK_IDP_ATTRIBUTE_EMAIL}`,
...(options.esServerArgs ?? []),
],
files: [
// Passing the roles that are equivalent to the ones we have in serverless
Expand Down Expand Up @@ -150,7 +149,6 @@ export function createStatefulTestConfig<T extends DeploymentAgnosticCommonServi
'--xpack.uptime.service.username=localKibanaIntegrationTestsUser',
'--xpack.uptime.service.devUrl=mockDevUrl',
'--xpack.uptime.service.manifestUrl=mockDevUrl',
...(options.kbnServerArgs ?? []),
],
},
};
Expand Down
40 changes: 20 additions & 20 deletions x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/default_space.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"id": "conflict_2_default",
"originId": "conflict_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUxMCwxXQ=="
}
Expand All @@ -151,7 +151,7 @@
"id": "conflict_2_all",
"originId": "conflict_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUxMSwxXQ=="
}
Expand All @@ -163,7 +163,7 @@
"id": "conflict_1b_default",
"originId": "conflict_1b_space_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwMywxXQ=="
}
Expand All @@ -175,7 +175,7 @@
"id": "conflict_1a_default",
"originId": "conflict_1a",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwMCwxXQ=="
}
Expand All @@ -186,7 +186,7 @@
},
"id": "my_isolated_object",
"references": [],
"type": "index-pattern",
"type": "url",
"updated_at": "2017-09-21T18:49:16.270Z",
"version": "WzQ4NywxXQ=="
}
Expand All @@ -197,7 +197,7 @@
},
"id": "all_spaces",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5NywxXQ=="
}
Expand All @@ -211,10 +211,10 @@
{
"id": "each_space",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
}
],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OCwxXQ=="
}
Expand All @@ -228,25 +228,25 @@
{
"id": "default_only",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
},
{
"id": "space_1_only",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
},
{
"id": "space_2_only",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
},
{
"id": "all_spaces",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
}
],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5NiwxXQ=="
}
Expand All @@ -257,7 +257,7 @@
},
"id": "conflict_1c_default_and_space_1",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwNiwxXQ=="
}
Expand All @@ -268,7 +268,7 @@
},
"id": "default_and_space_1",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5MywxXQ=="
}
Expand All @@ -279,7 +279,7 @@
},
"id": "default_and_space_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5NCwxXQ=="
}
Expand All @@ -291,7 +291,7 @@
"id": "space_2_only_matching_origin",
"originId": "space_2_only",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5MiwxXQ=="
}
Expand All @@ -302,7 +302,7 @@
},
"id": "alias_delete_inclusive",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5OCwxXQ=="
}
Expand All @@ -313,7 +313,7 @@
},
"id": "alias_delete_exclusive",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5OSwxXQ=="
}
Expand All @@ -324,7 +324,7 @@
},
"id": "space_1_and_space_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5NSwxXQ=="
}
10 changes: 5 additions & 5 deletions x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"id": "conflict_2_space_1",
"originId": "conflict_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUxMCwxXQ=="
}
Expand All @@ -151,7 +151,7 @@
"id": "conflict_1b_space_1",
"originId": "conflict_1b_space_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwNCwxXQ=="
}
Expand All @@ -163,7 +163,7 @@
"id": "conflict_1a_space_1",
"originId": "conflict_1a",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwMSwxXQ=="
}
Expand All @@ -177,10 +177,10 @@
{
"id": "each_space",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
}
],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ4OSwxXQ=="
}
Expand Down
12 changes: 6 additions & 6 deletions x-pack/test/spaces_api_integration/common/fixtures/kbn_archiver/space_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"id": "conflict_2_space_2",
"originId": "conflict_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUxMCwxXQ=="
}
Expand All @@ -17,7 +17,7 @@
"id": "conflict_1c_space_2",
"originId": "conflict_1c_default_and_space_1",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwNywxXQ=="
}
Expand All @@ -28,7 +28,7 @@
},
"id": "conflict_1b_space_2",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwNSwxXQ=="
}
Expand All @@ -40,7 +40,7 @@
"id": "conflict_1a_space_2",
"originId": "conflict_1a",
"references": [],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzUwMiwxXQ=="
}
Expand All @@ -54,10 +54,10 @@
{
"id": "each_space",
"name": "refname",
"type": "index-pattern"
"type": "event-annotation-group"
}
],
"type": "index-pattern",
"type": "event-annotation-group",
"updated_at": "2017-09-21T18:59:16.270Z",
"version": "WzQ5MSwxXQ=="
}
Expand Down
Loading

0 comments on commit 2df08a0

Please sign in to comment.