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

Revert consul-template to latest upstream #82

Merged
merged 3 commits into from
Feb 26, 2022

Conversation

darora
Copy link
Contributor

@darora darora commented Feb 26, 2022

Upstream consul-template now accepts a stdlib logger for its child
implementation, which allows us to move off the older fork of
consul-template we've been using. Rather than implement a shim between
logrus and the stdlib logger, this PR also updates remco to use hclog
and use its provided shim instead.

This is functionally equivalent to what we were using logrus for,
although likely not byte-for-byte compatible with the older format of
the logs.

Lastly, as part of this migration away from logrus, a couple of
exposed methods have been removed from the log module (SetLevel,
SetOutput) which were unused outside of tests (for said methods).

Two additional changes are included here (separate commits):

  • support for more easily building for other archs (I use arm64)
  • unvendor dependencies and upgrade to go1.17

Upstream consul-template now accepts a stdlib logger for its child
implementation, which allows us to move off the older fork of
consul-template we've been using. Rather than implement a shim between
logrus and the stdlib logger, this PR also updates remco to use hclog
and use its provided shim instead.

This is functionally equivalent to what we were using logrus for,
although likely not byte-for-byte compatible with the older format of
the logs.

Lastly, as part of this migration away from logrus, a couple of
exposed methods have been removed from the log module (SetLevel,
SetOutput) which were unused outside of tests (for said methods).
@darora
Copy link
Contributor Author

darora commented Feb 26, 2022

seems to have one failing test - let me dig into that

@HeavyHorst
Copy link
Owner

seems to have one failing test - let me dig into that

LGTM. I don't see any failing test.

@HeavyHorst HeavyHorst merged commit fff7b7a into HeavyHorst:master Feb 26, 2022
@darora darora deleted the da/consul-upgrades branch February 26, 2022 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants