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.

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

[Connector] Checkout to right version #200623

Merged

Conversation

jedrazb
Copy link
Member

@jedrazb jedrazb commented Nov 18, 2024

Summary

When running connectors from sources let's checkout to the right git tag. If version is not provided use main branch as default value.

If version is provided use git tag e.g. v8.16.0 to checkout to right version of connectors repo.

This fixes the bug when running 9.0 (main branch by default) connectors from source against <9.0 stack what causes issues.

Similar logic to how we handle versioning docker images https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204

Screenshots

Screenshot 2024-11-18 at 18 31 58

@jedrazb jedrazb added release_note:skip Skip the PR/issue when compiling release notes v9.0.0 v8.17.0 v8.16.1 labels Nov 18, 2024
@jedrazb jedrazb marked this pull request as ready for review November 18, 2024 17:22
@jedrazb jedrazb requested a review from a team as a code owner November 18, 2024 17:22
@jedrazb jedrazb enabled auto-merge (squash) November 18, 2024 17:26
@jedrazb jedrazb merged commit f6ba99d into elastic:main Nov 18, 2024
35 checks passed
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
enterpriseSearch 2.6MB 2.6MB +74.0B

@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11899355414

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 18, 2024
## Summary

When running `connectors` from sources let's checkout to the right git
tag. If version is not provided use `main` branch as default value.

If version is provided use git tag e.g. `v8.16.0` to checkout to right
version of connectors repo.

This fixes the bug when running `9.0` (main) connectors against <9.0
stack what causes issues.

Similar logic to how we handle versioning docker images
https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204

(cherry picked from commit f6ba99d)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 18, 2024
## Summary

When running `connectors` from sources let's checkout to the right git
tag. If version is not provided use `main` branch as default value.

If version is provided use git tag e.g. `v8.16.0` to checkout to right
version of connectors repo.

This fixes the bug when running `9.0` (main) connectors against <9.0
stack what causes issues.

Similar logic to how we handle versioning docker images
https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204

(cherry picked from commit f6ba99d)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.16
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Nov 18, 2024
# Backport

This will backport the following commits from `main` to `8.16`:
- [[Connector] Checkout to right version
(#200623)](#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":"[email protected]"},"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 <[email protected]>
kibanamachine added a commit that referenced this pull request Nov 18, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Connector] Checkout to right version
(#200623)](#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":"[email protected]"},"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 <[email protected]>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Dec 12, 2024
## Summary

When running `connectors` from sources let's checkout to the right git
tag. If version is not provided use `main` branch as default value.

If version is provided use git tag e.g. `v8.16.0` to checkout to right
version of connectors repo.

This fixes the bug when running `9.0` (main) connectors against <9.0
stack what causes issues.

Similar logic to how we handle versioning docker images
https://github.com/elastic/kibana/blob/main/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx#L204
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants