Skip to content

[release/1.3] Fix filter errors#3953

Merged
AkihiroSuda merged 1 commit intocontainerd:release/1.3from
dmcgowan:backport-1.3-filters-fix
Jan 13, 2020
Merged

[release/1.3] Fix filter errors#3953
AkihiroSuda merged 1 commit intocontainerd:release/1.3from
dmcgowan:backport-1.3-filters-fix

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Jan 9, 2020

Prevent error messages from being output to stderr.
Return illegal token when a quoted string is invalid and capture the error.

This issue occurs on the daemon and a good candidate to backport.

Prevent error messages from being output to stderr.
Return illegal token when a quoted string is invalid and
capture the error.

Signed-off-by: Derek McGowan <[email protected]>
(cherry picked from commit 3af3a76)
Signed-off-by: Derek McGowan <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jan 9, 2020

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3953 into release/1.3 will increase coverage by 0.24%.
The diff coverage is 81.08%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.3    #3953      +/-   ##
===============================================
+ Coverage        42.07%   42.31%   +0.24%     
===============================================
  Files              129      129              
  Lines            14321    14341      +20     
===============================================
+ Hits              6026     6069      +43     
+ Misses            7394     7373      -21     
+ Partials           901      899       -2
Flag Coverage Δ
#linux 45.83% <79.41%> (+0.24%) ⬆️
#windows 37.31% <81.08%> (+0.29%) ⬆️
Impacted Files Coverage Δ
filters/parser.go 81.65% <66.66%> (+1.28%) ⬆️
filters/scanner.go 82.19% <83.87%> (+13.83%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 095a1af...7d0e217. Read the comment docs.

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit eb5e164 into containerd:release/1.3 Jan 13, 2020
@dmcgowan dmcgowan deleted the backport-1.3-filters-fix branch March 23, 2022 22:21
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.

4 participants