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

Add TLS dialer to Kerberos transport as well #18607

Merged
merged 2 commits into from
May 18, 2020

Conversation

kvch
Copy link
Contributor

@kvch kvch commented May 18, 2020

  • add changelog entry

@kvch kvch added [zube]: In Review Team:Services (Deprecated) Label for the former Integrations-Services team labels May 18, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-services (Team:Services)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 18, 2020
}),
Timeout: s.Timeout,
Transport: transp,
Timeout: s.Timeout,
}

if s.Kerberos.IsEnabled() {
c := &http.Client{
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can now remove this statement and use httpClient instead of c as the 2nd argument to kerberos.NewClient below now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, we cannot. kerberos.NewClient expects an http.Client, but the client above is an esHTTPClient.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 18, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 9211
Skipped 1542
Total 10753

Copy link
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

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

LGTM.

@kvch kvch merged commit 8b17f5a into elastic:master May 18, 2020
@kvch kvch added the needs_backport PR is waiting to be backported to other branches. label May 18, 2020
@zube zube bot added [zube]: Done needs_backport PR is waiting to be backported to other branches. and removed [zube]: In Review needs_backport PR is waiting to be backported to other branches. labels May 18, 2020
@kvch kvch added v7.9.0 and removed needs_backport PR is waiting to be backported to other branches. labels May 19, 2020
kvch added a commit to kvch/beats that referenced this pull request May 19, 2020
@kvch kvch added the v7.8.0 label May 19, 2020
kvch added a commit that referenced this pull request May 21, 2020
kvch added a commit to kvch/beats that referenced this pull request May 21, 2020
kvch added a commit that referenced this pull request May 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Services (Deprecated) Label for the former Integrations-Services team v7.8.0 v7.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants