Ensure subp doesn't run during logs.py import

[TheRealFalcon]

Proposed Commit Message

See individual commits

Additional Context

tests/unittests/cmd/devel/test_logs.py would fail if you ran the file on its own due to subp happening on import.

The 2nd commit is just some extra cleanup.

Merge type

• Squash merge using "Proposed Commit Message"
• Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

[holmanb]

@TheRealFalcon the PR looks good, but I think some of the changes meant for the fix PR ended up in the cleanup PR, and tests fail on the first commit:

FAILED tests/unittests/cmd/devel/test_logs.py::TestCollectInstallerLogs::test_include_installer_logs_when_present[no_files_include_userdata] - AttributeError: module 'cloudinit.cmd.devel.logs' has no attribute '_collect_installer_logs'. Did you mean: 'collect_installer_logs'?
FAILED tests/unittests/cmd/devel/test_logs.py::TestCollectInstallerLogs::test_include_installer_logs_when_present[no_files_exclude_userdata] - AttributeError: module 'cloudinit.cmd.devel.logs' has no attribute '_collect_installer_logs'. Did you mean: 'collect_installer_logs'?
FAILED tests/unittests/cmd/devel/test_logs.py::TestCollectInstallerLogs::test_include_installer_logs_when_present[files_and_dirs_include_userdata] - AttributeError: module 'cloudinit.cmd.devel.logs' has no attribute '_collect_installer_logs'. Did you mean: 'collect_installer_logs'?
FAILED tests/unittests/cmd/devel/test_logs.py::TestCollectInstallerLogs::test_include_installer_logs_when_present[files_and_dirs_exclude_userdata] - AttributeError: module 'cloudinit.cmd.devel.logs' has no attribute '_collect_installer_logs'. Did you mean: 'collect_installer_logs'?

[holmanb]

+1 nice

[holmanb]

was this intended to be in the cleanup commit?

[holmanb]

was this intended to be in the cleanup commit?

[github-actions]

Hello! Thank you for this proposed change to cloud-init. This pull request is now marked as stale as it has not seen any activity in 14 days. If no activity occurs within the next 7 days, this pull request will automatically close.

If you are waiting for code review and you are seeing this message, apologies! Please reply, tagging TheRealFalcon, and he will ensure that someone takes a look soon.

(If the pull request is closed and you would like to continue working on it, please do tag TheRealFalcon to reopen it.)

[TheRealFalcon]

I had to rebase because local linting was acting weird, so the most recent changes might not be obvious. I'll explain them here.

For your two comments of was this intended to be in the cleanup commit?, the answer is no actually. The first commit had initially also moved arg parsing around, but I later noticed it broke some other code so I undid most of it, but the named arguments stuck around. But I agree that they make more sense in the other commit, so I moved them.

Beyond those two, the other change was the test_logs.py change of moving the logs.collect_installer_logs -> logs._collect_installer_logs to the later commit, allowing unit tests to pass cleanly on both commits.

I also amended the commit message of both commits to include the PR number here.

[holmanb]

Nit: I would use fix rather than refactor for the first commit, since it makes functional changes which resolve undesirable behavior. Otherwise this looks good to me!