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

[8.14] [Search] Fix integration id overlap for connectors (#184353) (#184372)

Browse source 
# Backport

This will backport the following commits from `main` to `8.14`:
- [[Search] Fix integration id overlap for connectors
(#184353)](https://github.com/elastic/kibana/pull/184353)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Navarone
Feekery","email":"13634519+navarone-feekery@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-05-28T16:50:23Z","message":"[Search]
Fix integration id overlap for connectors (#184353)\n\n##
Summary\r\n\r\nConnectors registered as custom integrations use the
value in\r\n`connector.serviceType` as an id. However, there are some
connectors\r\nthat share a service type. This causes an error when
running Kibana due\r\nto the id clash.\r\n\r\nThis PR changes the id
into a concatenation of `serviceType` and `name`\r\nto ensure all ids
are unique.\r\n\r\nErrors before change (these no longer recur after the
changes):\r\n\r\n```log\r\n[2024-05-28T12:06:10.514+00:00][ERROR][plugins.customIntegrations]
Integration with id=confluence already
exists.\r\n[2024-05-28T12:06:10.516+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.517+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.518+00:00][ERROR][plugins.customIntegrations]
Integration with id=salesforce already
exists\r\n```","sha":"ef7677341b39e762d30aeeabd1ab6e163bd4668c","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:EnterpriseSearch","v8.14.0","v8.15.0"],"title":"[Search]
Fix integration id overlap for
connectors","number":184353,"url":"https://github.com/elastic/kibana/pull/184353","mergeCommit":{"message":"[Search]
Fix integration id overlap for connectors (#184353)\n\n##
Summary\r\n\r\nConnectors registered as custom integrations use the
value in\r\n`connector.serviceType` as an id. However, there are some
connectors\r\nthat share a service type. This causes an error when
running Kibana due\r\nto the id clash.\r\n\r\nThis PR changes the id
into a concatenation of `serviceType` and `name`\r\nto ensure all ids
are unique.\r\n\r\nErrors before change (these no longer recur after the
changes):\r\n\r\n```log\r\n[2024-05-28T12:06:10.514+00:00][ERROR][plugins.customIntegrations]
Integration with id=confluence already
exists.\r\n[2024-05-28T12:06:10.516+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.517+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.518+00:00][ERROR][plugins.customIntegrations]
Integration with id=salesforce already
exists\r\n```","sha":"ef7677341b39e762d30aeeabd1ab6e163bd4668c"}},"sourceBranch":"main","suggestedTargetBranches":["8.14"],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.15.0","branchLabelMappingKey":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/184353","number":184353,"mergeCommit":{"message":"[Search]
Fix integration id overlap for connectors (#184353)\n\n##
Summary\r\n\r\nConnectors registered as custom integrations use the
value in\r\n`connector.serviceType` as an id. However, there are some
connectors\r\nthat share a service type. This causes an error when
running Kibana due\r\nto the id clash.\r\n\r\nThis PR changes the id
into a concatenation of `serviceType` and `name`\r\nto ensure all ids
are unique.\r\n\r\nErrors before change (these no longer recur after the
changes):\r\n\r\n```log\r\n[2024-05-28T12:06:10.514+00:00][ERROR][plugins.customIntegrations]
Integration with id=confluence already
exists.\r\n[2024-05-28T12:06:10.516+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.517+00:00][ERROR][plugins.customIntegrations]
Integration with id=jira already
exists.\r\n[2024-05-28T12:06:10.518+00:00][ERROR][plugins.customIntegrations]
Integration with id=salesforce already
exists\r\n```","sha":"ef7677341b39e762d30aeeabd1ab6e163bd4668c"}}]}]
BACKPORT-->

Co-authored-by: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com>
This commit is contained in:
Kibana Machine 2024-05-28 14:23:51 -04:00 • committed by GitHub
parent 70474fc85c
commit 2ce61f75b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/api_integration/apis/custom_integration/integrations.ts
View file

@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
expect(resp.body).to.be.an('array');
expect(resp.body.length).to.be(51);
expect(resp.body.length).to.be(55);
// Test for sample data card
expect(resp.body.findIndex((c: { id: string }) => c.id === 'sample_data_all')).to.be.above(

2
x-pack/plugins/enterprise_search/server/integrations.ts
View file

@ -97,7 +97,7 @@ export const registerEnterpriseSearchIntegrations = (
type: 'svg',
},
],
id: connector.serviceType,
id: `${connector.serviceType}-${connector.name}`,
isBeta: connector.isBeta,
shipper: 'enterprise_search',
title: connector.name,