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

Cherry-pick #15937 to 7.x: Upgrade go-ucfg to v0.8.1 release #16259

Merged
merged 1 commit into from
Feb 13, 2020

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Feb 11, 2020

Cherry-pick of PR #15937 to 7.x branch. Original message:

What does this PR do?

Updates the vendored go-ucfg to v0.8.1.

Note: This includes a breaking change that removes the variable substition from environment variables when they are read from the configuration. elastic/go-ucfg#139

Why is it important?

Gets the latest fixes and additions including:

Added

Changed

Fixed

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

Author's Checklist

  • Does not break beats reading and parsing configuration files

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

* Update go-ucfg to v0.8.0.

* Update go-ucfg to 0.8.1.

* Fix tests with latest go-ucfg.

* Fix filebeat x-pack httpjson internal not to be required when the default value is zero.

* Fix system test_no_es_connection to ensure that it times out quickly within the wait_until range.

* Fix filebeat UDP input config to allow zero in the read buffer, allowing the default buffer to be used.

* Fix test_shutdown_wait_timeout to set a low timeout for logstash output.

* Fix test_shutdown_wait_timeout to fail instantly by trying to connect to localhost.

* Run govendor github.com/elastic/go-ucfg@v0.8.1

* Run make notice.

* Add to CHANGELOG.next.asciidoc.

* Perform recursive govendor on go-ucfg v0.8.1 and make notice.

(cherry picked from commit 73b8518)
@blakerouse blakerouse requested a review from a team as a code owner February 11, 2020 21:14
@blakerouse blakerouse changed the title Cherry-pick #15937 to 7.x: Upgrade go-ucfg to v0.8.1 release Cherry-pick #15937 to 7.x: Upgrade go-ucfg to v0.8.2 release Feb 11, 2020
@blakerouse blakerouse changed the title Cherry-pick #15937 to 7.x: Upgrade go-ucfg to v0.8.2 release Cherry-pick #15937 and #16199 to 7.x: Upgrade go-ucfg to v0.8.2 release Feb 11, 2020
@blakerouse
Copy link
Contributor Author

@urso Recommended to do them together, but I can easily split the apart if you prefer.

@ycombinator
Copy link
Contributor

@blakerouse Yeah, I prefer keeping the backport PRs 1-1 with the original ones as it makes it quite easy to compare the changes between the backport and original PRs, at least for me. With combined PRs, especially with a high number of LOC, I'm more likely to miss something.

@blakerouse blakerouse changed the title Cherry-pick #15937 and #16199 to 7.x: Upgrade go-ucfg to v0.8.2 release Cherry-pick #15937 to 7.x: Upgrade go-ucfg to v0.8.1 release Feb 13, 2020
@blakerouse
Copy link
Contributor Author

@ycombinator Works for me, I removed the cherry-pick of 0.8.2, will do that after this lands in 7.x.

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.

@blakerouse blakerouse merged commit 8b82390 into elastic:7.x Feb 13, 2020
@blakerouse blakerouse deleted the backport_15937_7.x branch February 13, 2020 13:45
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