Skip to content

Bug #2694 #2731

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

Merged
merged 7 commits into from
Apr 15, 2025
Merged

Bug #2694 #2731

merged 7 commits into from
Apr 15, 2025

Conversation

Siddhu545
Copy link
Contributor

@Siddhu545 Siddhu545 commented Apr 12, 2025

Added proper validation and logging for the Elasticsearch Cloud ID during client setup to ensure connectivity and easier debugging. This helps catch misconfigurations early and improves reliability.

Copy link

cla-checker-service bot commented Apr 12, 2025

💚 CLA has been signed

@JoshMock
Copy link
Member

Thanks for this change @Siddhu545! If you can just sign the CLA noted above I'll merge this and ensure it gets out in the next release.

@Siddhu545
Copy link
Contributor Author

Thanks! I’ve already signed the CLA, let me know if anything else is needed.

src/client.ts Outdated
@@ -35,7 +35,7 @@ import { RedactionOptions } from '@elastic/transport/lib/Transport'
import BaseConnection, { prepareHeaders, ConnectionOptions } from '@elastic/transport/lib/connection/BaseConnection'
import SniffingTransport from './sniffingTransport'
import Helpers from './helpers'
import API from './api'
import API from '../src/api/index'
Copy link
Member

Choose a reason for hiding this comment

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

This should not be changed, and is the reason some tests are failing.

Suggested change
import API from '../src/api/index'
import API from './api'

@JoshMock
Copy link
Member

JoshMock commented Apr 14, 2025

@Siddhu545 Our CLA checker bases it off of the email address in your commits. It looks like your commits use your email address with an uppercase S but you signed the CLA with an all lowercase email address. Can you re-sign the CLA with the email address matching exactly?

@Siddhu545
Copy link
Contributor Author

Hi @JoshMock,
Done!! I’ve re-signed the CLA using the correct email address.
Also, I’ve reverted the changes related to the import path. Let me know if anything else is needed!

@JoshMock JoshMock enabled auto-merge (squash) April 15, 2025 16:02
@JoshMock JoshMock disabled auto-merge April 15, 2025 17:43
@JoshMock JoshMock merged commit 9d719ce into elastic:main Apr 15, 2025
21 checks passed
Copy link
Contributor

The backport to 8.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.x 8.x
# Navigate to the new working tree
cd .worktrees/backport-8.x
# Create a new branch
git switch --create backport-2731-to-8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d719ce874af1c471692f3ad45989d91eefd6562
# Push it to GitHub
git push --set-upstream origin backport-2731-to-8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.x

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

Copy link
Contributor

The backport to 8.18 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.18 8.18
# Navigate to the new working tree
cd .worktrees/backport-8.18
# Create a new branch
git switch --create backport-2731-to-8.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9d719ce874af1c471692f3ad45989d91eefd6562
# Push it to GitHub
git push --set-upstream origin backport-2731-to-8.18
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.18

Then, create a pull request where the base branch is 8.18 and the compare/head branch is backport-2731-to-8.18.

github-actions bot pushed a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
(cherry picked from commit 9d719ce)
JoshMock added a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
Co-authored-by: Siddharth Khengare <67581382+Siddhu545@users.noreply.github.com>
JoshMock added a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
(cherry picked from commit 9d719ce)
@JoshMock JoshMock mentioned this pull request Apr 15, 2025
JoshMock added a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
(cherry picked from commit 9d719ce)
JoshMock added a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
Co-authored-by: Siddharth Khengare <67581382+Siddhu545@users.noreply.github.com>
JoshMock added a commit that referenced this pull request Apr 15, 2025
Co-authored-by: Siddhu545 <Siddharthkhengare@gmail.com>
Co-authored-by: Josh Mock <joshua.mock@elastic.co>
Co-authored-by: Siddharth Khengare <67581382+Siddhu545@users.noreply.github.com>
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.

2 participants