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

Jump to bottom

Fix some discovered issues #3050

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Fix some discovered issues #3050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions src/cfnlint/data/schemas/other/resources/configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@
"Metadata": {
"$ref": "#/definitions/Metadata"
},
"Properties": {
"awsType": "CfnResourceProperties"
},
"Properties": {},
"Type": {
"type": "string"
},
Expand Down
1 change: 1 addition & 0 deletions src/cfnlint/decode/mark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
SPDX-License-Identifier: MIT-0
"""

from dataclasses import dataclass


Expand Down
6 changes: 3 additions & 3 deletions src/cfnlint/jsonschema/_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ def _filter_schemas(self, schema, validator: Any) -> Tuple[Any, Any]:
# Adding these items to the schema
# will allow us to continue to check the nested elements
if "cfnLint" not in standard_schema:
if (
"object" in ensure_list(standard_schema.get("type", []))
and "properties" not in standard_schema
if "object" in ensure_list(standard_schema.get("type", [])) and not any(
p not in standard_schema
for p in ["properties", "additionalProperties", "patternProperties"]
):
standard_schema["patternProperties"] = {
".*": {"type": _all_types},
Expand Down