Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PmtYaml: Parser fixes #477

Merged
merged 1 commit into from
Dec 5, 2024
Merged

PmtYaml: Parser fixes #477

merged 1 commit into from
Dec 5, 2024

Conversation

frankosterfeld
Copy link
Contributor

@frankosterfeld frankosterfeld commented Dec 3, 2024 •
edited
Loading

  • Make sure block-style maps in block-style lists are parsed
    correctly. This is needed to parse our existing GRC files.
 - name: foo
   id: bar
  • Support unexpected whitespace/newlines between key and scalars
    as well as flow-style maps/lists. E.g.
string:
  "foo"
list:
 []
map: {
}

@frankosterfeld frankosterfeld force-pushed the frank/yaml-fix branch 3 times, most recently from 11f4ab1 to 7496797 Compare December 3, 2024 11:41
wirew0rm
wirew0rm approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@wirew0rm wirew0rm left a comment

Choose a reason for hiding this comment

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

Looks good, thanks for adding this 👍 can be merged once the CI has passed.

@frankosterfeld
Copy link
Contributor Author

Looks good, thanks for adding this 👍 can be merged once the CI has passed.

@wirew0rm I'd first like @dantti to confirm that it fixes all his issues with parsing our existing GRC test cases.

@frankosterfeld frankosterfeld marked this pull request as draft December 3, 2024 13:34
@frankosterfeld frankosterfeld marked this pull request as ready for review December 3, 2024 13:52
@frankosterfeld frankosterfeld changed the title PmtYaml: Fix parsing of maps in lists PmtYaml: Parser fixes Dec 4, 2024
@frankosterfeld
Copy link
Contributor Author

Looks good, thanks for adding this 👍 can be merged once the CI has passed.

Please re-review, I've changed it completely again.. @dantti Please test with your GRC parsing changes.

@frankosterfeld
PmtYaml: Parser fixes
e4597a6 
 * Make sure block-style maps in block-style lists are parsed
   correctly. This is needed to parse our existing GRC files.
 * Support unexpected whitespace/newlines between key and scalars
   as well as flow-style maps/lists.

Signed-off-by: Frank Osterfeld <[email protected]>
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Dec 4, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
80.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

RalphSteinhagen
RalphSteinhagen approved these changes Dec 5, 2024
View reviewed changes
Copy link
Member

@RalphSteinhagen RalphSteinhagen left a comment

Choose a reason for hiding this comment

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

Still ok. If this solves @dantti issue, then I'd merge it as is.

@RalphSteinhagen RalphSteinhagen merged commit 2591eaa into main Dec 5, 2024
12 of 14 checks passed
@RalphSteinhagen RalphSteinhagen deleted the frank/yaml-fix branch December 5, 2024 09:03
@ivan-cukic ivan-cukic mentioned this pull request Dec 7, 2024
Open
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalphSteinhagen RalphSteinhagen RalphSteinhagen approved these changes

@wirew0rm wirew0rm wirew0rm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frankosterfeld @wirew0rm @RalphSteinhagen