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

Bump agentkeepalive to v4.5.0 #4949

Merged

Conversation

AMoo-Miki
Copy link
Collaborator

@AMoo-Miki AMoo-Miki commented Sep 6, 2023

Description

Bump agentkeepalive to v4.5.0 to solve a problem preventing the use https://ip in opensearch.hosts.

The elasticsearch client uses a flawed version that incorrectly sets servername on a tls connection using IPs.

Expect a deprecation warning while bootstrapping:

[agentkeepalive:deprecated] options.freeSocketKeepAliveTimeout is deprecated, please use options.freeSocketTimeout instead

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@codecov
Copy link

codecov bot commented Sep 6, 2023

Codecov Report

Merging #4949 (2505319) into main (a77178f) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #4949   +/-   ##
=======================================
  Coverage   66.77%   66.77%           
=======================================
  Files        3278     3278           
  Lines       62981    62981           
  Branches    10027    10027           
=======================================
  Hits        42055    42055           
  Misses      18461    18461           
  Partials     2465     2465           
Flag Coverage Δ
Linux_1 35.31% <ø> (ø)
Linux_2 55.23% <ø> (ø)
Linux_3 43.76% <ø> (+<0.01%) ⬆️
Linux_4 35.43% <ø> (ø)
Windows_1 35.33% <ø> (ø)
Windows_2 55.20% <ø> (ø)
Windows_3 43.76% <ø> (-0.01%) ⬇️
Windows_4 35.43% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@kavilla
Copy link
Member

kavilla commented Sep 6, 2023

should we consider this a breaking change?

… `https://ip` in `opensearch.hosts`

The `elasticsearch` client uses a flaws version that incorrectly sets `servername` on a `tls` connection using IPs.

Signed-off-by: Miki <miki@amazon.com>
@AMoo-Miki
Copy link
Collaborator Author

should we consider this a breaking change?

The functionality has been broken for as long as elasticsearch client has used agentkeepalive@^3.0.0 - so since elasticsearch@14.2.0, first used in kibana@7.0.0. This is a fix to that.

ananzh
ananzh previously approved these changes Sep 12, 2023
@ananzh
Copy link
Member

ananzh commented Sep 12, 2023

@AMoo-Miki should we also backport to 1.3?

@AMoo-Miki
Copy link
Collaborator Author

@AMoo-Miki should we also backport to 1.3?

1.3 receiving only security patches and bug fixes, I don't think this needs to go there.

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Copy link
Member

@joshuarrrr joshuarrrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@joshuarrrr
Copy link
Member

@AMoo-Miki I think the link checker failure is spurious, but could you check?

@joshuarrrr
Copy link
Member

whitesource issue tracked separately in #5178

@joshuarrrr joshuarrrr merged commit d017c5c into opensearch-project:main Oct 3, 2023
54 of 55 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-4949-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d017c5caddd732fafc1c2a2fc8ca4be99fac7c0b
# Push it to GitHub
git push --set-upstream origin backport/backport-4949-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-4949-to-2.x.

joshuarrrr pushed a commit to joshuarrrr/OpenSearch-Dashboards that referenced this pull request Oct 3, 2023
… `https://ip` in `opensearch.hosts` (opensearch-project#4949)

The `elasticsearch` client uses a flaws version that incorrectly sets `servername` on a `tls` connection using IPs.

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
(cherry picked from commit d017c5c)
ananzh pushed a commit that referenced this pull request Oct 3, 2023
… `https://ip` in `opensearch.hosts` (#4949) (#5180)

The `elasticsearch` client uses a flaws version that incorrectly sets `servername` on a `tls` connection using IPs.

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
(cherry picked from commit d017c5c)

Co-authored-by: Miki <miki@amazon.com>
Leo7Deng pushed a commit to Leo7Deng/OpenSearch-Dashboards that referenced this pull request Oct 4, 2023
… `https://ip` in `opensearch.hosts` (opensearch-project#4949)

The `elasticsearch` client uses a flaws version that incorrectly sets `servername` on a `tls` connection using IPs.

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Leo Deng <leo7deng@gmail.com>
willie-hung pushed a commit to willie-hung/OpenSearch-Dashboards that referenced this pull request Oct 5, 2023
… `https://ip` in `opensearch.hosts` (opensearch-project#4949)

The `elasticsearch` client uses a flaws version that incorrectly sets `servername` on a `tls` connection using IPs.

Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Willie Hung <willie880201044@gmail.com>
@CarterPape
Copy link

Is the deprecation warning expected to be permanent?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants