Add support for main.yaml in a role instead of only supporting main.yml #356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richm
reviewed
Oct 9, 2024
| logging.debug(f"Testing if {os.path.join(path, filename)} is a file.") | ||
| if os.path.isfile(os.path.join(path, filename)): | ||
| logging.debug(f"{os.path.join(path, filename)} exists and is a file - setting src_path to {path}.") | ||
| src_path = os.path.join(path) |
There was a problem hiding this comment.
Setting src_path here does not set src_path in the calling context. Maybe have this function return src_path if the main YAML file exists, or raise an error if the file does not exist?
There was a problem hiding this comment.
Right, and in this case rename this function to get_main_file
richm
reviewed
Oct 9, 2024
| logging.debug(f"{os.path.join(path, filename)} exists and is a file - setting src_path to {path}.") | ||
| src_path = os.path.join(path) | ||
| return True | ||
| return False |
There was a problem hiding this comment.
Suggested change
| return False | |
| raise FileNotFoundError(errno.ENOENT, f"Could not find {filenames[0]} or {filenames[1]} for {role} in {paths[0]} or {paths[1]}", "") |
richm
reviewed
Oct 9, 2024
|
|
||
| if not _tasks_main.exists(): | ||
| if not main_file_exists(src_path, role): | ||
| logging.error( | ||
| f"Neither {src_path} nor {src_path.parent} is a role top directory." | ||
| ) |
There was a problem hiding this comment.
replace the if and the logging with just
src_path = main_file_exists(src_path, role)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This resolves #355 for me