Skip to content

Conversation

AndreasHassing
Copy link
Contributor

@AndreasHassing AndreasHassing commented Aug 24, 2020

Fixes #3223 by bumping logrus to v1.6.0, which in turn bumps github.com/konsorten/go-windows-terminal-sequences to v1.0.3 wherein the fix to bad pointer is found.

A reference to v1.0.1 is still needed, since docker/metrics has that reference (not sure if it is using it, but I digress).

@thaJeztah
Copy link
Member

Thanks! Change itself looks good, but I see you forgot the DCO sign off in your commit message; https://github.com/docker/distribution/blob/master/CONTRIBUTING.md#sign-your-work

If you can amend your commit, and force-push, that should update the PR and make CI go green (no need to open a new PR if you amend your commit)

Fixes distribution#3223 by bumping logrus to v1.6.0, which in turn bumps
github.com/konsorten/go-windows-terminal-sequences to v1.0.3
wherein the fix to bad pointer is found.

Signed-off-by: Andreas Hassing <andreas@famhassing.dk>
@AndreasHassing AndreasHassing force-pushed the fix/bad-pointer-windows-EnableVirtualTerminalProcessing branch from da1fb81 to 9466dd4 Compare August 24, 2020 11:14
@AndreasHassing
Copy link
Contributor Author

Thanks @thaJeztah, signed off on the commit 😊.

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM (not a maintainer)

@thaJeztah
Copy link
Member

@manishtomar @dmcgowan ptal

@manishtomar
Copy link
Contributor

@AndreasHassing Thanks for the PR. Could you update logrus in https://github.com/docker/go-metrics/ to latest version?

@thaJeztah
Copy link
Member

don't think go-metrics depends on logrus, unless it's through the prometheus client

@manishtomar
Copy link
Contributor

Oh yes 🤦 . You are right. Looking at go mod graph it seems that both logrus versions are using go-windows-terminal-sequences package:

$ go mod graph | grep win
github.com/sirupsen/logrus@v1.6.0 github.com/konsorten/go-windows-terminal-sequences@v1.0.3
github.com/sirupsen/logrus@v1.2.0 github.com/konsorten/go-windows-terminal-sequences@v1.0.1

However, checking go mod graph in logrus doesn't reveal that package being used. So, I am curious where that package is coming from:

manish:~/src/logrus (master)
$ go mod graph
github.com/sirupsen/logrus github.com/davecgh/go-spew@v1.1.1
github.com/sirupsen/logrus github.com/pmezard/go-difflib@v1.0.0
github.com/sirupsen/logrus github.com/stretchr/testify@v1.2.2
github.com/sirupsen/logrus golang.org/x/sys@v0.0.0-20191026070338-33540a1f6037

@AndreasHassing
Copy link
Contributor Author

@manishtomar: the dependency is removed entirely from logrus between 1.6.0 and master, but they haven't released yet 😊.

@manishtomar
Copy link
Contributor

@AndreasHassing Aah ok. Thanks a lot for the info.

Copy link
Contributor

@manishtomar manishtomar left a comment

Choose a reason for hiding this comment

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

LGTM

@manishtomar manishtomar merged commit 5dc1f65 into distribution:master Aug 24, 2020
@AndreasHassing AndreasHassing deleted the fix/bad-pointer-windows-EnableVirtualTerminalProcessing branch August 24, 2020 22:10
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.

Registry bad pointer on Windows from github.com/konsorten/go-windows-terminal-sequences.EnableVirtualTerminalProcessing
3 participants