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.

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

Actually validate or tell user we cannot #4616

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Actually validate or tell user we cannot #4616

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167c8a4
fix(schema): Don't tell users config is good if missing dependency
holmanb Nov 21, 2023
c54794b
Update cloudinit/config/schema.py
holmanb Nov 21, 2023
995feb1
whitespace
holmanb Nov 21, 2023
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
10 changes: 8 additions & 2 deletions cloudinit/config/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ def validate_cloudconfig_schema(
"see the schema errors."
)
LOG.warning(details)
return True


class _Annotator:
Expand Down Expand Up @@ -937,9 +938,14 @@ def validate_cloudconfig_file(
)
return False
try:
validate_cloudconfig_schema(
if not validate_cloudconfig_schema(
cloudconfig, schema, strict=True, log_deprecations=False
)
):
print(
f"Skipping {schema_type} schema validation."
" Jsonschema dependency missing."
)
return False
except SchemaValidationError as e:
if e.has_errors():
errors += e.schema_errors
Expand Down