Skip to content

Pragma: Allow comments following inline#1059

Merged
lorenzo merged 1 commit intohadolint:masterfrom
m-ildefons:wip/pragma-followed-by-comment
Mar 5, 2025
Merged

Pragma: Allow comments following inline#1059
lorenzo merged 1 commit intohadolint:masterfrom
m-ildefons:wip/pragma-followed-by-comment

Conversation

@m-ildefons
Copy link
Copy Markdown
Member

Allow comments and whitespace to follow inline with pragma comments, e.g.:

# hadolint ignore=DL3006  # comment on why to ignore this rule here
# hadolint shell=powershell  

Modify the parsers for pragma comments to ignore both:

  1. just whitespaces following the inline comment.
  2. whitespaces followed by #, and anything after until end of line.

This improves robustness of the parser and allows users to add helpful comments to their pragmas.
Note that not separating comment from pragma with an additional # will result in a silent failure to parse and the pragma will have no effect.

fixes: #997
fixes: #1028

How to verify it

These two lines should be two working pragmas, instructing Hadolint to ignore DL3006 on the next Docker instruction and hinting that the shell used in the base image is Powershell (i.e. don't apply rules that are specific to POSIX-like shells).

# hadolint ignore=DL3006  # comment on why to ignore this rule here
# hadolint shell=powershell  

Test cases are also included in this PR

Allow comments and whitespace to follow inline with pragma comments,
e.g.:

```
# hadolint ignore=DL3006  # comment on why to ignore this rule here
# hadolint shell=powershell  
```

Modify the parsers for pragma comments to ignore both:

1) just whitespaces following the inline comment.
2) whitespaces followed by `#`, and anything after until end of line.

This improves robustness of the parser and allows users to add helpful
comments to their pragmas.
Note that not separating comment from pragma with an additional `#` will
result in a silent failure to parse and the pragma will have no effect.

fixes: hadolint#997
fixes: hadolint#1028

Signed-off-by: Moritz Röhrich <moritz@ildefons.de>
@m-ildefons m-ildefons requested a review from lorenzo November 22, 2024 15:33
@m-ildefons m-ildefons self-assigned this Nov 22, 2024
@reteps
Copy link
Copy Markdown

reteps commented Jan 24, 2025

👀 @lorenzo Any way to push this forward?

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.

Allow text in ignore comments Allow trailing whitespace in ignore comments

3 participants