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

Upgrade go-ucfg to v0.8.1 release #15937

Merged
merged 13 commits into from
Jan 31, 2020

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Jan 29, 2020

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

@blakerouse blakerouse requested a review from a team as a code owner January 29, 2020 17:24
@blakerouse blakerouse added libbeat review Team:Services (Deprecated) Label for the former Integrations-Services team labels Jan 29, 2020
Copy link
Contributor

@kvch kvch left a comment

Choose a reason for hiding this comment

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

The go-ucfg entries in vendor/vendor.json is not updated. Could you please update the dependency using govendor fetch? This way the NOTICE.txt file can be updated as well to reflect the versions/revisions we are using at the moment.

@kvch
Copy link
Contributor

kvch commented Jan 31, 2020

I meant updating all entries in the vendor.json, not just the top-level one. For example, github.com/elastic/go-ucfg/cfgutil, github.com/elastic/go-ucfg/flag, etc. Running govendor fetch github.com/elastic/go-ucfg/[email protected] would update everything.

@blakerouse
Copy link
Contributor Author

@kvch I have used govendor and make notice to update the required files. I have also added the changelog entry and fixed the pull request description to link to the go-ucfg project pulls instead of old ones from beats.

@kvch
Copy link
Contributor

kvch commented Jan 31, 2020

The other packages from github.com/elastic/go-ucfg I have mentioned above are still not updated in vendor.json.

@blakerouse
Copy link
Contributor Author

@kvch updated with govendor done correctly this time

@blakerouse blakerouse merged commit 73b8518 into elastic:master Jan 31, 2020
@blakerouse blakerouse deleted the upgrade-ucfg-v0.8.1 branch January 31, 2020 18:05
@blakerouse blakerouse added needs_backport PR is waiting to be backported to other branches. [zube]: Done labels Jan 31, 2020
@blakerouse blakerouse added v7.7.0 and removed needs_backport PR is waiting to be backported to other branches. labels Feb 11, 2020
blakerouse added a commit to blakerouse/beats that referenced this pull request Feb 11, 2020
* 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/[email protected]

* 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 added a commit that referenced this pull request Feb 13, 2020
* 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/[email protected]

* 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change libbeat review Team:Services (Deprecated) Label for the former Integrations-Services team v7.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants