fix(actors): Allow boolean-like values for SKIP_DRY #538
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
LaikaN57
commented
Jan 18, 2025
Comment on lines
-353
to
-374
| def str2bool(self, v, strict=False): | ||
| """Returns a Boolean from a variety of inputs. | ||
|
|
||
| Args: | ||
| value: String/Bool | ||
| strict: Whether or not to _only_ convert the known words into booleans, or whether to allow "any" word to be considered True other than the known False words. | ||
|
|
||
| Returns: | ||
| A boolean | ||
| """ | ||
| false = ("no", "false", "f", "0") | ||
| true = ("yes", "true", "t", "1") | ||
|
|
||
| string = str(v).lower() | ||
|
|
||
| if strict: | ||
| if string not in true and string not in false: | ||
| raise exceptions.InvalidOptions( | ||
| "Expected [%s, %s] but got: %s" % (true, false, string) | ||
| ) | ||
|
|
||
| return string not in false |
There was a problem hiding this comment.
Moved to kingpin.utils for use in non-actor classes.
LaikaN57
commented
Jan 18, 2025
LaikaN57
commented
Jan 18, 2025
Comment on lines
+501
to
+520
| def str2bool(v, strict=False) -> bool: | ||
| """Returns a Boolean from a variety of inputs. | ||
|
|
||
| Args: | ||
| value: String/Bool | ||
| strict: Whether or not to _only_ convert the known words into booleans, or whether to allow "any" word to be considered True other than the known False words. | ||
|
|
||
| Returns: | ||
| A boolean | ||
| """ | ||
| false = ("no", "false", "f", "0") | ||
| true = ("yes", "true", "t", "1") | ||
|
|
||
| string = str(v).lower() | ||
|
|
||
| if strict: | ||
| if string not in true and string not in false: | ||
| raise ValueError(f"Expected [{true}, {false}] but got: {string}") | ||
|
|
||
| return string not in false |
There was a problem hiding this comment.
From deleted function above.
LaikaN57
commented
Jan 18, 2025
Comment on lines
+361
to
+365
| try: | ||
| check = utils.str2bool(self._condition) | ||
| self.log.debug("Condition %s evaluates to %s" % (self._condition, check)) | ||
| except ValueError as e: | ||
| raise exceptions.InvalidOptions(e.args) from e |
There was a problem hiding this comment.
Added try-except to convert the raised error to maintain correct raise types outside function.
LaikaN57
changed the title
diranged
approved these changes
Jan 21, 2025
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.
Fixes a usability issue where regardless of the value of DRY, if SKIP_DRY was true you would get the following message:
The way the logic works after this PR is thusly...
(default)
- Run Wet 💦
(default)
- Run Wet 💦