Build XCCDF only from module.ini and group.ini files #352

pirat89 · 2018-02-11T15:19:09Z

Previously building of module set has been corrupted when directory
with the module contained more than one file with the ".ini"
extentions. Build of the module set shouldn't be affected by various
INI files, that are not related to the module set structure.

So the scan is now read only group.ini and module.ini files whose
names are reserved for PA purposes. In addition we expect only one
of those files in each directory, so the ModuleSetFormatError
exception is raised when both are detected in the same directory.

Additionaly:

removed unused import of ModuleSetUtils
modified tests

Resolves #310

Previously building of module set has been corrupted when directory with the module contained more than one file with the ".ini" extentions. Build of the module set shouldn't be affected by various INI files, that are not related to the module set structure. So the scan is now read only group.ini and module.ini files whose names are reserved for PA purposes. In addition we expect only one of those files in each directory, so the ModuleSetFormatError exception is raised when both are detected in the same directory. - removed unused import of ModuleSetUtils Resolves #310

Use settings.module_ini and settings.group_ini in tests. Related #310

pirat89 · 2018-02-11T15:20:53Z

This is more like nice to have now, but I have good mood on Sunday. So set milestone and merge it just in case you want to resolve it now.

AloisMahdal · 2018-02-12T17:12:25Z

CASES

Legend

INPUT: tree - contents of directories above; each character is for one
level, p is for properties.ini, g is for group.ini and . is for
empty

E.g. pg.g means that the tree structure is something like:
```
RHEL6_7
 |- properties.ini
 '- foo
     |- group.ini
     '- bar
         '- baz
             |- group.ini
             '- testdir
```
where the fields gini, mini and fini relate to contents of the testdir
directory.
INPUT: gini - group.ini present?
INPUT: mini - module.ini present?
INPUT: fini - foo.ini present?
BEHAVIOR: result - effect in result.xml
~ - does not matter

Table

INPUT                      || BEHAVIOR
------.------.------.------||----------------------------
 tree | gini | mini | fini || result
======|======|======|======||============================
 p    |   no |   no |   no || none (no relevant file)
 p    |   no |   no |  yes || none (no relevant file)
 p    |   no |  yes |   no || none (no group)
 p    |   no |  yes |  yes || none (no group)
 p    |  yes |   no |   no || none (empty group)
 p    |  yes |   no |  yes || none (empty group)
 p    |  yes |  yes |   no || error
 p    |  yes |  yes |  yes || error
------|------|------|------||----------------------------
 pg   |   no |   no |   no || none (empty group)
 pg   |   no |   no |  yes || none (empty group)
 pg   |   no |  yes |   no || normal result
 pg   |   no |  yes |  yes || normal result
 pg   |  yes |   no |   no || none (empty group)
 pg   |  yes |   no |  yes || none (empty group)
 pg   |  yes |  yes |   no || error
 pg   |  yes |  yes |  yes || error
------|------|------|------||----------------------------
 p.g  |    ~ |    ~ |    ~ || none (chain interrupted)
------|------|------|------||----------------------------

AloisMahdal · 2018-02-12T17:13:22Z

qa_ack: add and run test for module discovery according to case table above.

bocekm · 2018-02-16T21:01:03Z

@pirat89, I did some code cleanup, please take a look. The code now looks for just one ini file (either module.ini or group.ini) instead of multiple. If there's no one of these two in a folder, it's a failure.

- fail if there's no INI in a dir - rename functions and variables so the name better suits their purpose

pirat89 · 2018-02-19T17:42:11Z

If there's no one of these two in a folder, it's a failure.

In my testing it is not true. But as we agreed, this could be probably removed at all.

bocekm · 2018-02-19T20:58:49Z

@pirat89 has found issues with the code. These are my notes that may not make much sense to others:
It does not yell when there's no INI in a folder. Which should not actually - there may be folder under module storing just some data. But the code tells to die when there's no INI in any folder (recursive search through all RHEL6_7 module set folder).

pirat89 · 2018-02-19T21:18:27Z

Correct. If I hadn't known about the issues, I would not be able to decrypt notes above :-D

AloisMahdal · 2018-04-04T16:12:08Z

Cleaning up qa_ack from last milestone.

AloisMahdal · 2018-04-25T15:57:58Z

qa_ack: same as above: add and run test for module discovery according to case table above.

I think I have test in making somewhere; couldn't find it right now, though.

bocekm · 2018-05-31T21:41:13Z

@AloisMahdal ready to be verified.

bocekm · 2018-06-05T16:45:58Z

That's strange, our Jenkins jobs for CD has started by themself, again, 5 days after the last commit, and failed because they weren't started properly. I'm gonna push force causing another rebuild.

pirat89 · 2018-10-05T13:51:32Z

Just rebased to run the build. without any other changes.

bocekm

Rereviewed after rebase. @AloisMahdal, this PR awaits QE verification.

pirat89 · 2018-11-01T14:27:12Z

@bocekm If I remember well, @AloisMahdal found there probably an issue (or was it something else?) but it is just not documented here as the complete testing has not been finished because we postponed that to the next milestone.

pirat89 · 2019-03-27T13:20:40Z

--test--

pirat89 added 2 commits February 11, 2018 15:57

Fix tests to use only module.ini and group.ini files.

6b76b1f

Use settings.module_ini and settings.group_ini in tests. Related #310

pirat89 requested review from AloisMahdal and bocekm February 11, 2018 15:19

pirat89 self-assigned this Feb 11, 2018

pirat89 added the bug label Feb 11, 2018

bocekm added the needs_verify label Feb 12, 2018

bocekm added this to the el69toel75b0 milestone Feb 12, 2018

bocekm added the on_qe label Feb 12, 2018

AloisMahdal added the qa_ack label Feb 12, 2018

Look for just one INI in dir instead of multiple

9b1b286

- fail if there's no INI in a dir - rename functions and variables so the name better suits their purpose

bocekm force-pushed the fix_ini_scan branch from e4fb67a to 9b1b286 Compare February 16, 2018 21:07

bocekm removed the on_qe label Feb 19, 2018

bocekm changed the title ~~Build XCCDF only from module.ini and group.ini files~~ WIP: Build XCCDF only from module.ini and group.ini files Feb 19, 2018

bocekm removed this from the el69toel75b0 milestone Mar 12, 2018

pirat89 changed the title ~~WIP: Build XCCDF only from module.ini and group.ini files~~ Build XCCDF only from module.ini and group.ini files Mar 26, 2018

AloisMahdal removed the qa_ack label Apr 4, 2018

pirat89 added this to the el610toel75b0 milestone Apr 5, 2018

AloisMahdal added the qa_ack label Apr 25, 2018

bocekm added the on_qe label May 31, 2018

bocekm previously approved these changes Jun 4, 2018

View reviewed changes

bocekm dismissed their stale review via be0b631 June 5, 2018 16:46

bocekm force-pushed the fix_ini_scan branch from 731f80d to be0b631 Compare June 5, 2018 16:46

bocekm previously approved these changes Jun 5, 2018

View reviewed changes

AloisMahdal modified the milestones: el610toel75b0, el610toel76b0 Jun 5, 2018

Fix warning of missing group.ini in a dir with subdirs

f3c1ec9

pirat89 dismissed bocekm’s stale review via f3c1ec9 October 5, 2018 13:50

pirat89 force-pushed the fix_ini_scan branch from be0b631 to f3c1ec9 Compare October 5, 2018 13:50

bocekm approved these changes Nov 1, 2018

View reviewed changes

pirat89 modified the milestones: el610toel76b0, el610toel76b2 Nov 1, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build XCCDF only from module.ini and group.ini files #352

Build XCCDF only from module.ini and group.ini files #352

pirat89 commented Feb 11, 2018 •

edited by bocekm

pirat89 commented Feb 11, 2018 •

edited

AloisMahdal commented Feb 12, 2018 •

edited

AloisMahdal commented Feb 12, 2018

bocekm commented Feb 16, 2018

pirat89 commented Feb 19, 2018 •

edited

bocekm commented Feb 19, 2018 •

edited

pirat89 commented Feb 19, 2018

AloisMahdal commented Apr 4, 2018

AloisMahdal commented Apr 25, 2018

bocekm commented May 31, 2018

bocekm commented Jun 5, 2018 •

edited

pirat89 commented Oct 5, 2018

bocekm left a comment •

edited

pirat89 commented Nov 1, 2018 •

edited

pirat89 commented Mar 27, 2019

Build XCCDF only from module.ini and group.ini files #352

Are you sure you want to change the base?

Build XCCDF only from module.ini and group.ini files #352

Conversation

pirat89 commented Feb 11, 2018 • edited by bocekm

pirat89 commented Feb 11, 2018 • edited

AloisMahdal commented Feb 12, 2018 • edited

CASES

Legend

Table

AloisMahdal commented Feb 12, 2018

bocekm commented Feb 16, 2018

pirat89 commented Feb 19, 2018 • edited

bocekm commented Feb 19, 2018 • edited

pirat89 commented Feb 19, 2018

AloisMahdal commented Apr 4, 2018

AloisMahdal commented Apr 25, 2018

bocekm commented May 31, 2018

bocekm commented Jun 5, 2018 • edited

pirat89 commented Oct 5, 2018

bocekm left a comment • edited

Choose a reason for hiding this comment

pirat89 commented Nov 1, 2018 • edited

pirat89 commented Mar 27, 2019

pirat89 commented Feb 11, 2018 •

edited by bocekm

pirat89 commented Feb 11, 2018 •

edited

AloisMahdal commented Feb 12, 2018 •

edited

pirat89 commented Feb 19, 2018 •

edited

bocekm commented Feb 19, 2018 •

edited

bocekm commented Jun 5, 2018 •

edited

bocekm left a comment •

edited

pirat89 commented Nov 1, 2018 •

edited