[Security solution] Bedrock region fix#214251
Merged
stephmilovic merged 3 commits intoelastic:mainfrom Mar 13, 2025
Merged
Conversation
stephmilovic
added
release_note:fix
v9.0.0
Team: SecuritySolution
Contributor
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsMetrics [docs]
History
|
pgayvallet
approved these changes
Mar 13, 2025
KDKHD
approved these changes
Mar 13, 2025
angorayc
approved these changes
Mar 13, 2025
Contributor
|
Starting backport for target branches: 8.17, 8.18, 8.x, 9.0 https://github.com/elastic/kibana/actions/runs/13836466796 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Mar 13, 2025
(cherry picked from commit cf73559)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
stephmilovic
added a commit
to stephmilovic/kibana
that referenced
this pull request
Mar 13, 2025
(cherry picked from commit cf73559) # Conflicts: # x-pack/platform/plugins/shared/stack_connectors/server/connector_types/bedrock/bedrock.ts
stephmilovic
added a commit
to stephmilovic/kibana
that referenced
this pull request
Mar 13, 2025
(cherry picked from commit cf73559) # Conflicts: # x-pack/platform/plugins/shared/stack_connectors/server/connector_types/bedrock/bedrock.ts
This was referenced Mar 13, 2025
Contributor
Author
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
stephmilovic
added a commit
to stephmilovic/kibana
that referenced
this pull request
Mar 13, 2025
(cherry picked from commit cf73559) # Conflicts: # x-pack/plugins/stack_connectors/server/connector_types/bedrock/bedrock.ts # x-pack/plugins/stack_connectors/server/connector_types/bedrock/utils.test.ts # x-pack/plugins/stack_connectors/server/connector_types/bedrock/utils.ts
kibanamachine
added a commit
that referenced
this pull request
Mar 13, 2025
# Backport This will backport the following commits from `main` to `8.x`: - [[Security solution] Bedrock region fix (#214251)](#214251) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Steph Milovic","email":"stephanie.milovic@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:01:03Z","message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team: SecuritySolution","Team:Security Generative AI","backport:version","v8.18.0","v9.1.0","v8.19.0","v8.17.4"],"title":"[Security solution] Bedrock region fix","number":214251,"url":"https://github.com/elastic/kibana/pull/214251","mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.x","8.17"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214251","number":214251,"mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Steph Milovic <stephanie.milovic@elastic.co>
stephmilovic
added a commit
that referenced
this pull request
Mar 13, 2025
# Backport This will backport the following commits from `main` to `9.0`: - [[Security solution] Bedrock region fix (#214251)](#214251) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Steph Milovic","email":"stephanie.milovic@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:01:03Z","message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team: SecuritySolution","Team:Security Generative AI","backport:version","v8.18.0","v9.1.0","v8.19.0","v8.17.4"],"title":"[Security solution] Bedrock region fix","number":214251,"url":"https://github.com/elastic/kibana/pull/214251","mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.17"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214251","number":214251,"mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214388","number":214388,"state":"OPEN"},{"branch":"8.17","label":"v8.17.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
stephmilovic
added a commit
that referenced
this pull request
Mar 13, 2025
# Backport This will backport the following commits from `main` to `8.17`: - [[Security solution] Bedrock region fix (#214251)](#214251) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Steph Milovic","email":"stephanie.milovic@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:01:03Z","message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team: SecuritySolution","Team:Security Generative AI","backport:version","v8.18.0","v9.1.0","v8.19.0","v8.17.4"],"title":"[Security solution] Bedrock region fix","number":214251,"url":"https://github.com/elastic/kibana/pull/214251","mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.17"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214251","number":214251,"mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214388","number":214388,"state":"OPEN"},{"branch":"8.17","label":"v8.17.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
stephmilovic
added a commit
that referenced
this pull request
Mar 13, 2025
# Backport This will backport the following commits from `main` to `8.18`: - [[Security solution] Bedrock region fix (#214251)](#214251) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Steph Milovic","email":"stephanie.milovic@elastic.co"},"sourceCommit":{"committedDate":"2025-03-13T14:01:03Z","message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team: SecuritySolution","Team:Security Generative AI","backport:version","v8.18.0","v9.1.0","v8.19.0","v8.17.4"],"title":"[Security solution] Bedrock region fix","number":214251,"url":"https://github.com/elastic/kibana/pull/214251","mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","8.17"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/214251","number":214251,"mergeCommit":{"message":"[Security solution] Bedrock region fix (#214251)","sha":"cf73559e2dd5ce6e793b6b92183c43e6e09fc629"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/214388","number":214388,"state":"OPEN"},{"branch":"8.17","label":"v8.17.4","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
CAWilson94
pushed a commit
to CAWilson94/kibana
that referenced
this pull request
Mar 22, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The regex to extract the region from the Bedrock url was incorrect. This resulted in the region getting defaulted to
us-east-1. This PR corrects the regex, and adds tests for each possible Bedrock runtime url to ensure the regex works as expected.I also extracted any utility functions used by the bedrock connector into a utils file and added tests for each utility function.