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.

Sign up for GitHub

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

Jump to bottom

Explicitly pass http config to doppler consumer #28277

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Explicitly pass http config to doppler consumer #28277

merged 2 commits into from
Oct 7, 2021

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Oct 6, 2021 •
edited

What does this PR do?

Explicitly pass the TLS and proxy settings to doppler consumer.

Why is it important?

Fixes #28271 and makes the code more robust to avoid this kind of regressions.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • Test it with a real scenario.

Related issues

How to test this PR locally

  • Run the cloudfoundry input and check it can connect and collect events.

@jsoriano jsoriano added the Team:Integrations Label for the Integrations team label Oct 6, 2021
@jsoriano jsoriano self-assigned this Oct 6, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@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 Oct 6, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 6, 2021

This pull request does not have a backport label. Could you fix it @jsoriano? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 6, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 6, 2021 •
edited by jenkins-beats-ci bot

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 129 min 38 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@jsoriano jsoriano mentioned this pull request Oct 6, 2021
Closed
@jsoriano jsoriano added backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify labels Oct 6, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Oct 6, 2021
@jsoriano jsoriano added test-plan Add this PR to be manual test plan backport-v7.15.0 Automated backport with mergify and removed backport-v7.15.0 Automated backport with mergify labels Oct 6, 2021
ChrsMark
ChrsMark approved these changes Oct 7, 2021
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm!

@jsoriano jsoriano merged commit 6a841cf into elastic:master Oct 7, 2021
mergify bot pushed a commit that referenced this pull request Oct 7, 2021
@jsoriano
Explicitly pass http config to doppler consumer (#28277)
3dae71d 
Explicitly pass the TLS and proxy settings to doppler consumer, don't
rely on the type of the underlying transport.
Fixes issue initializing the client.

(cherry picked from commit 6a841cf)
@mergify mergify bot mentioned this pull request Oct 7, 2021
Merged
mergify bot pushed a commit that referenced this pull request Oct 7, 2021
@jsoriano
Explicitly pass http config to doppler consumer (#28277)
195996a 
Explicitly pass the TLS and proxy settings to doppler consumer, don't
rely on the type of the underlying transport.
Fixes issue initializing the client.

(cherry picked from commit 6a841cf)
@mergify mergify bot mentioned this pull request Oct 7, 2021
Merged
jsoriano added a commit that referenced this pull request Oct 8, 2021
@mergify @jsoriano
[7.x](backport #28277) Explicitly pass http config to doppler consumer (
83f9bbc 
#28301)

Explicitly pass the TLS and proxy settings to doppler consumer, don't
rely on the type of the underlying transport.
Fixes issue initializing the client.

(cherry picked from commit 6a841cf)

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
jsoriano added a commit that referenced this pull request Oct 8, 2021
@mergify @jsoriano
[7.15](backport #28277) Explicitly pass http config to doppler consum…
fddc57f 
…er (#28302)

Explicitly pass the TLS and proxy settings to doppler consumer, don't
rely on the type of the underlying transport.
Fixes issue initializing the client.

(cherry picked from commit 6a841cf)

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Oct 11, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/e2e-fleet
86c1cf8 
* upstream/master: (73 commits)
  Remove GCP support from Functionbeat (elastic#28253)
  Move labels and annotations under kubernetes.namespace. (elastic#27917)
  Update go release version 1.17.1 (elastic#27543)
  Osquerybeat: Runner and Fetcher unit tests (elastic#28290)
  Osquerybeat: Improve handling of osquery.autoload file, allow customizations (elastic#28289)
  seccomp: allow clone3 syscall for x86 (elastic#28117)
  packetbeat/protos/dns: don't render missing A and AAAA addresses from truncated records (elastic#28297)
  [7.x] [DOCS] Update api_key example on elasticsearch output (elastic#28288)
  [cloud][docker] use the private docker namespace (elastic#28286)
  Update aws-lambda-go library version to 1.13.3 (elastic#28236)
  Deprecate common.Float (elastic#28280)
  Filebeat: Change compatibility test stage to test against previous minor instead of 7.11 (elastic#28274)
  x-pack/filebeat/module/threatintel/misp: add support for secondary object attribute handling (elastic#28124)
  Explicitly pass http config to doppler consumer (elastic#28277)
  processors/actions/add_fields: Do not panic if event.Fields is nil map (elastic#28219)
  Resolved timestamp for defender atp (elastic#28272)
  [Winlogbeat] Tolerate faults when Windows Event Log session is interrupted (elastic#28191)
  [elastic-agent] proxy requests to subprocesses to their metrics endpoints (elastic#28165)
  Build cloud docker images for elastic-agent (elastic#28134)
  Upgrade k8s go-client library (elastic#28228)
  ...
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@jsoriano
Explicitly pass http config to doppler consumer (elastic#28277)
09cbaec 
Explicitly pass the TLS and proxy settings to doppler consumer, don't
rely on the type of the underlying transport.
Fixes issue initializing the client.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@jsoriano jsoriano

Labels
backport-v7.15.0 Automated backport with mergify backport-v7.16.0 Automated backport with mergify Team:Integrations Label for the Integrations team test-plan Add this PR to be manual test plan
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failure to initialize cloudfoundry http client
3 participants
@jsoriano @elasticmachine @ChrsMark