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

Union #818 #821 #822 #823

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Union #818 #821 #822 #823

wants to merge 11 commits into from

Conversation

jepio
Copy link
Member

@jepio jepio commented Nov 26, 2024

Description

This is a merge of:

This is intended to demonstrate that moduletests pass when all three PRs are merged together. Not intended for merging.

Checklist

  • I have read the contribution guidelines.
  • I added unit-tests to validate my changes. All unit tests are passing.
  • I have merged the latest main branch prior to this PR submission.
  • I submitted this PR against the main branch.

@jepio jepio changed the title Union #818# 821 822 Union #818 #821 #822 Nov 26, 2024
)

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: extra newlines


set(SRC ${moduletest_SOURCE_DIR}/recipes)
set(MOF1 ${OsConfigResourceSsh_SOURCE_DIR}/LinuxSshServerSecurityBaseline.mof)
Copy link
Contributor

Choose a reason for hiding this comment

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

a CMake list might be better here as the list grows...
eg.

set(MOFS
  ${OsConfigResourceSsh_SOURCE_DIR}/LinuxSshServerSecurityBaseline.mof
  ${OsConfigResourceAsb_SOURCE_DIR}/AzureLinuxBaseline.mof
)
list(JOIN MOF_LIST " " flat_string)
add_custom_command(
    OUTPUT ${SRC}/SecurityBaselineTests.json
    DEPENDS ${SRC}/create-asb-json.sh ${SRC}/mof-to-json.awk ${SRC}/SecurityBaselineTests.json-header ${SRC}/SecurityBaselineTests.json-mid ${SRC}/SecurityBaselineTests.json-footer ${MOF1} ${MOF2}
    COMMAND ./create-asb-json.sh ${MOF_LIST} >${SRC}/SecurityBaselineTests.json
    WORKING_DIRECTORY ${SRC}
)

Copy link
Member Author

Choose a reason for hiding this comment

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

will do

Copy link
Contributor

@AhmedBM AhmedBM left a comment

Choose a reason for hiding this comment

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

Just a few minor comments but @MariusNi would have to sign off on this but FYI hes out for the week.
@jepio should we abandon the PRs you've merged into this one?

@jepio
Copy link
Member Author

jepio commented Nov 27, 2024

Just a few minor comments but @MariusNi would have to sign off on this but FYI hes out for the week.

No hurry, I also wanted to file an issue with more context for the selinux context problem.

@jepio should we abandon the PRs you've merged into this one?

I was actually thinking the opposite - use this one just to demonstrate passing CI but review/merge the individual PRs.

@AhmedBM could you rerun the failing test runs? I think they're somehow flaky (todo: investigate).

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.

2 participants