github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.16] [Connector] Checkout to right version (#200623) (#200636)

Browse source 
# Backport

This will backport the following commits from `main` to `8.16`:
- [[Connector] Checkout to right version
(#200623)](https://github.com/elastic/kibana/pull/200623)

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

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

<!--BACKPORT [{"author":{"name":"Jedr
Blaszyk","email":"jedrazb@gmail.com"},"sourceCommit":{"committedDate":"2024-11-18T19:08:38Z","message":"[Connector]
Checkout to right version (#200623)\n\n## Summary\r\n\r\nWhen running
`connectors` from sources let's checkout to the right git\r\ntag. If
version is not provided use `main` branch as default value.\r\n\r\nIf
version is provided use git tag e.g. `v8.16.0` to checkout to
right\r\nversion of connectors repo.\r\n\r\nThis fixes the bug when
running `9.0` (main) connectors against <9.0\r\nstack what causes
issues.\r\n\r\nSimilar logic to how we handle versioning docker
images\r\nhttps://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204","sha":"f6ba99da0978e9687292f94761ba41a545098c9f","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["backport","release_note:skip","v9.0.0","Team:Search","v8.17.0","v8.16.1"],"title":"[Connector]
Checkout to right
version","number":200623,"url":"https://github.com/elastic/kibana/pull/200623","mergeCommit":{"message":"[Connector]
Checkout to right version (#200623)\n\n## Summary\r\n\r\nWhen running
`connectors` from sources let's checkout to the right git\r\ntag. If
version is not provided use `main` branch as default value.\r\n\r\nIf
version is provided use git tag e.g. `v8.16.0` to checkout to
right\r\nversion of connectors repo.\r\n\r\nThis fixes the bug when
running `9.0` (main) connectors against <9.0\r\nstack what causes
issues.\r\n\r\nSimilar logic to how we handle versioning docker
images\r\nhttps://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204","sha":"f6ba99da0978e9687292f94761ba41a545098c9f"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/200623","number":200623,"mergeCommit":{"message":"[Connector]
Checkout to right version (#200623)\n\n## Summary\r\n\r\nWhen running
`connectors` from sources let's checkout to the right git\r\ntag. If
version is not provided use `main` branch as default value.\r\n\r\nIf
version is provided use git tag e.g. `v8.16.0` to checkout to
right\r\nversion of connectors repo.\r\n\r\nThis fixes the bug when
running `9.0` (main) connectors against <9.0\r\nstack what causes
issues.\r\n\r\nSimilar logic to how we handle versioning docker
images\r\nhttps://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204","sha":"f6ba99da0978e9687292f94761ba41a545098c9f"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Jedr Blaszyk <jedrazb@gmail.com>
This commit is contained in:
Kibana Machine 2024-11-19 07:55:07 +11:00 • committed by GitHub
parent 06999139d2
commit b2c5123e03
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/run_from_source_step.tsx
View file

@ -36,6 +36,7 @@ export interface RunFromSourceStepProps {
connectorId?: string;
isWaitingForConnector: boolean;
serviceType: string;
connectorVersion: string;
}
export const RunFromSourceStep: React.FC<RunFromSourceStepProps> = ({
@ -43,6 +44,7 @@ export const RunFromSourceStep: React.FC<RunFromSourceStepProps> = ({
connectorId,
isWaitingForConnector,
serviceType,
connectorVersion,
}) => {
const [isOpen, setIsOpen] = React.useState<EuiAccordionProps['forceState']>('open');
useEffect(() => {
@ -125,7 +127,7 @@ export const RunFromSourceStep: React.FC<RunFromSourceStepProps> = ({
<CodeBox
showTopBar={false}
languageType="bash"
codeSnippet="cd connectors && touch config.yml"
codeSnippet={`cd connectors && git checkout ${connectorVersion} && touch config.yml`}
/>
<EuiSpacer size="s" />
<EuiText size="s">

1
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx
View file

@ -193,6 +193,7 @@ export const ConnectorDeployment: React.FC = () => {
serviceType={connector.service_type ?? ''}
apiKeyData={apiKey}
isWaitingForConnector={isWaitingForConnector}
connectorVersion={kibanaVersion ? `v${kibanaVersion}` : 'main'}
/>
) : (
<DockerInstructionsStep