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.

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

Formatting and bug fixes in utils/import_srg_spreadsheet.py #9827

Merged
merged 6 commits into from
Nov 23, 2022

Conversation

Mab879
Copy link
Member

@Mab879 Mab879 commented Nov 15, 2022

Description:

  • Replace hard-coded RHEL 9
  • PEP8 Improvements

Rationale:

  • Fixes issues that may come up later

* Replace hard-coded RHEL 9
* PEP8 Improvements
@Mab879 Mab879 added the Infrastructure Our content build system label Nov 15, 2022
@Mab879 Mab879 added this to the 0.1.65 milestone Nov 15, 2022
@github-actions
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@jan-cerny jan-cerny self-assigned this Nov 16, 2022
@jan-cerny
Copy link
Collaborator

@Mab879 Codeclimate wants you to reduce count of parameters of the update_row function

@Mab879
Copy link
Member Author

Mab879 commented Nov 16, 2022

@Mab879 Codeclimate wants you to reduce count of parameters of the update_row function

I will take a look and see how easy that will be.

@codeclimate
Copy link

codeclimate bot commented Nov 16, 2022

Code Climate has analyzed commit bbd3092 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 47.1% (-0.1% change).

View more on Code Climate.

@Mab879 Mab879 requested a review from jan-cerny November 17, 2022 16:48
Copy link
Collaborator

@jan-cerny jan-cerny left a comment

Choose a reason for hiding this comment

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

@Mab879 now it's better

But what about the text where they use "RHEL9". without a space between RHEL and 9? We currently replace RHEL 9 with space in between but for example in security_patches_up_to_date they have

Verify RHEL9 security patches and updates are installed and up to date.    Updates are required to be applied with a frequency determined by organizational policy.

and creates a diff where {{{ full_name }}} is changed to RHEL9, which is a change that we don't want.

@Mab879
Copy link
Member Author

Mab879 commented Nov 21, 2022

@Mab879 now it's better

But what about the text where they use "RHEL9". without a space between RHEL and 9? We currently replace RHEL 9 with space in between but for example in security_patches_up_to_date they have

Verify RHEL9 security patches and updates are installed and up to date.    Updates are required to be applied with a frequency determined by organizational policy.

and creates a diff where {{{ full_name }}} is changed to RHEL9, which is a change that we don't want.

The latest update should fix that. This update also fixes the issue where the last line gets duplicated.

@marcusburghardt marcusburghardt modified the milestones: 0.1.65, 0.1.66 Nov 22, 2022
Copy link
Collaborator

@jan-cerny jan-cerny left a comment

Choose a reason for hiding this comment

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

I have run the script on the latest submission spreadsheet and current export from upstream and the diff of produced changes looks sensible and manageable.

@jan-cerny jan-cerny merged commit 612171d into ComplianceAsCode:master Nov 23, 2022
@Mab879 Mab879 deleted the update_srg_import branch November 23, 2022 22:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Our content build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants