Skip to content

[20.10 backport] vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat#3132

Merged
silvin-lubecki merged 1 commit into
docker:20.10from
thaJeztah:20.10_backport_bump_term_ansiterm
Jun 21, 2021
Merged

[20.10 backport] vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat#3132
silvin-lubecki merged 1 commit into
docker:20.10from
thaJeztah:20.10_backport_bump_term_ansiterm

Conversation

@thaJeztah

@thaJeztah thaJeztah commented Jun 10, 2021

Copy link
Copy Markdown
Member

backport of #3131

Relates to:

Changes:

  • winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
  • winterm: fix GetStdFile() falltrough
  • update deprecation message to refer to the correct replacement
  • add go.mod
  • Fix int overflow
  • Convert int to string using rune()

full diff:

- Description for the changelog

Fix Invalid Standard Handle Panic on Windows

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter

codecov-commenter commented Jun 10, 2021

Copy link
Copy Markdown

Codecov Report

Merging #3132 (e3a9a92) into 20.10 (6da4ee4) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            20.10    #3132   +/-   ##
=======================================
  Coverage   57.07%   57.07%           
=======================================
  Files         299      299           
  Lines       18691    18691           
=======================================
  Hits        10668    10668           
  Misses       7156     7156           
  Partials      867      867           

@thaJeztah
thaJeztah marked this pull request as draft June 19, 2021 14:28
@thaJeztah

Copy link
Copy Markdown
Member Author

needs to be updated once moby/term#29 is merged

Changes:

- winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
- winterm: fix GetStdFile() falltrough
- update deprecation message to refer to the correct replacement
- add go.mod
- Fix int overflow
- Convert int to string using rune()

full diff:

- moby/term@bea5bbe...3f7ff69
- Azure/go-ansiterm@d6e3b33...d185dfc

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit b5bc279)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
thaJeztah force-pushed the 20.10_backport_bump_term_ansiterm branch from 7832541 to e3a9a92 Compare June 21, 2021 11:32
@thaJeztah
thaJeztah marked this pull request as ready for review June 21, 2021 11:51

@silvin-lubecki silvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@silvin-lubecki
silvin-lubecki merged commit 00ea8bd into docker:20.10 Jun 21, 2021
@thaJeztah
thaJeztah deleted the 20.10_backport_bump_term_ansiterm branch June 21, 2021 12:21
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.

3 participants