[release/1.7 backport] alias log package to github.com/containerd/log v0.1.0#9106
Merged
dmcgowan merged 4 commits intocontainerd:release/1.7from Sep 21, 2023
Merged
Conversation
|
Skipping CI for Draft Pull Request. |
Member
Author
|
|
full diff: sirupsen/logrus@v1.9.0...v1.9.3 v1.9.3 - Fix a potential denial of service vulnerability in logrus.Writer() that could be triggered by logging text longer than 64kb without newlines - Fix panic in Writer v1.9.2 Reverts "Fix a potential denial of service vulnerability in logrus.Writer()", which introduced a regression. v1.9.1 - Fix data race in hooks.test package - Add instructions to use different log levels for local and syslog - Fix a potential denial of service vulnerability in logrus.Writer() that could be triggered by logging text longer than 64kb without newlines - Use text when shows the logrus output Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: stretchr/testify@v1.8.2...v1.8.4 Signed-off-by: Sebastiaan van Stijn <[email protected]>
This "soft" deprecates the package, but keeps the local uses of the package, which can make backporting this to release-branches easier (we can still move all uses in those branches as well though). Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit d69ae81) Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit f1591cc) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
1.7_backport_swap_log_pkg_alias
branch
from
559453c to
cb20151
Compare
Member
|
@thaJeztah let's avoid the deprecation commit for now |
dmcgowan
approved these changes
Sep 20, 2023
Deprecate the pacakge, but suppress linting errors for now. This is to allow backporting these changes to release branches, which may still need to transition. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 03b9ce5) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
^^ after discussing, I included the deprecation for this (1.7) so that it can act as stepping-stone towards v2.0, but we're not backporting it to the 1.6 branch |
Member
Author
|
@AkihiroSuda @cpuguy83 PTAL |
cpuguy83
approved these changes
Sep 20, 2023
dmcgowan
approved these changes
Sep 21, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I also had to update some other dependencies, which I did in separate commits.
vendor: github.com/sirupsen/logrus v1.9.3
full diff: sirupsen/logrus@v1.9.0...v1.9.3
v1.9.3
that could be triggered by logging text longer than 64kb without newlines
v1.9.2
Reverts "Fix a potential denial of service vulnerability in logrus.Writer()",
which introduced a regression.
v1.9.1
that could be triggered by logging text longer than 64kb without newlines
vendor: github.com/stretchr/testify v1.8.4
full diff: stretchr/testify@v1.8.2...v1.8.4
alias log package to github.com/containerd/log v0.1.0
This "soft" deprecates the package, but keeps the local uses of the package,
which can make backporting this to release-branches easier (we can
still move all uses in those branches as well though).