Skip to content

fix: dont double-log deprecated INFOs #5465

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.

Sign up for GitHub

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

Merged
TheRealFalcon merged 2 commits into from
Jun 28, 2024
Merged

fix: dont double-log deprecated INFOs #5465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a814573
fix: dont double-log deprecated INFOs (#5465)
TheRealFalcon Jun 28, 2024
9c13b65
chore: fix schema.py formatting (#5465)
TheRealFalcon Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cloudinit/config/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,11 +795,10 @@ def validate_cloudconfig_schema(
if isinstance(
schema_error, SchemaDeprecationError
): # pylint: disable=W1116
if (
"devel" != features.DEPRECATION_INFO_BOUNDARY
and (schema_error.version == "devel"
if "devel" != features.DEPRECATION_INFO_BOUNDARY and (
schema_error.version == "devel"
or Version.from_str(schema_error.version)
> Version.from_str(features.DEPRECATION_INFO_BOUNDARY))
> Version.from_str(features.DEPRECATION_INFO_BOUNDARY)
):
info_deprecations.append(
SchemaProblem(path, schema_error.message)
Expand Down
1 change: 0 additions & 1 deletion cloudinit/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3255,7 +3255,6 @@ def deprecate(
"devel" != features.DEPRECATION_INFO_BOUNDARY
and Version.from_str(features.DEPRECATION_INFO_BOUNDARY) < version
):
LOG.info(deprecate_msg)
level = logging.INFO
elif hasattr(LOG, "deprecated"):
level = log.DEPRECATED
Expand Down
7 changes: 6 additions & 1 deletion tests/unittests/test_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ def test_deprecated_log_level(self, caplog):
),
)
def test_deprecate_log_level_based_on_features(
self, expected_log_level, deprecation_info_boundary, caplog, mocker
self,
expected_log_level,
deprecation_info_boundary,
caplog,
mocker,
clear_deprecation_log,
):
"""Deprecation log level depends on key deprecation_version

Expand Down