Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deployment agnostic integrations test #199977

Merged
merged 6 commits into from
Nov 18, 2024
Merged

Fix deployment agnostic integrations test #199977

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a8097d
make request for integrations before every test, use set instead of l…
fake-haris Nov 12, 2024
6c73a12
added call for pre-existing intergations, casted array to set
fake-haris Nov 13, 2024
ea6996c
merge main
fake-haris Nov 14, 2024
e989fca
Set comparison ignores order of items, so removed sort method
fake-haris Nov 14, 2024
f2dc94d
[CI] Auto-commit changed files from 'make api-docs'
kibanamachine Nov 14, 2024
f87f0d3
Merge branch 'main' into fix-deployment-agnostic-integrations-test
elasticmachine Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions ...st/api_integration/deployment_agnostic/apis/observability/dataset_quality/integrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
withInternalHeaders: true,
}
);

preExistingIntegrations = (
await callApiAs({
roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
})
).integrations.map((integration: Integration) => integration.name);
});

after(async () => {
Expand All @@ -72,6 +66,12 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {

describe('gets the installed integrations', () => {
before(async () => {
preExistingIntegrations = (
await callApiAs({
roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
})
).integrations.map((integration: Integration) => integration.name);

await Promise.all(
integrationPackages.map((pkg) =>
packageApi.installPackage({
Expand All @@ -87,9 +87,9 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
});

expect(body.integrations.map((integration: Integration) => integration.name).sort()).to.eql(
preExistingIntegrations.concat(['synthetics', 'system']).sort()
);
expect(
new Set(body.integrations.map((integration: Integration) => integration.name).sort())
).to.eql(new Set(preExistingIntegrations.concat(['synthetics', 'system']).sort()));

expect(
body.integrations.find((integration: Integration) => integration.name === 'synthetics')
Expand All @@ -113,6 +113,12 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {

describe('gets the custom installed integrations', () => {
before(async () => {
preExistingIntegrations = (
await callApiAs({
roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
})
).integrations.map((integration: Integration) => integration.name);

await Promise.all(
customIntegrations.map((customIntegration: CustomIntegration) =>
packageApi.installCustomIntegration({ roleAuthc: adminRoleAuthc, customIntegration })
Expand All @@ -125,9 +131,9 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
});

expect(body.integrations.map((integration: Integration) => integration.name).sort()).to.eql(
preExistingIntegrations.concat('my.custom.integration').sort()
);
expect(
new Set(body.integrations.map((integration: Integration) => integration.name).sort())
).to.eql(new Set(preExistingIntegrations.concat('my.custom.integration').sort()));

expect(
Object.entries(
Expand Down