Skip to content

fix(terraform): handle null values and alternative blocks in plan parser for aws_batch_job_definition #7586

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

Open
AtlasWarden wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(terraform): handle null values and alternative blocks in plan parser for aws_batch_job_definition #7586

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2920997
fix(terraform): resolve plan parser crash and support alternative aws…
Jun 24, 2026
4a374e1
Merge branch 'main' into fix/batch-job-definition-plan-crash
AtlasWarden Jun 24, 2026
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
26 changes: 15 additions & 11 deletions checkov/terraform/plan_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
COUNT_PATTERN = re.compile(r"\[?\d+\]?$")

RESOURCE_TYPES_JSONIFY = {
"aws_batch_job_definition": "container_properties",
"aws_batch_job_definition": ("container_properties", "ecs_properties", "eks_properties", "node_properties"),
"aws_ecs_task_definition": "container_definitions",
"aws_iam_policy": "policy",
"aws_iam_role": "assume_role_policy",
Expand Down Expand Up @@ -158,16 +158,20 @@ def _hclify(


def jsonify(obj: dict[str, Any], resource_type: str) -> dict[str, Any] | None:
"""Tries to create a dict from a string of a supported resource type attribute"""

jsonify_key = RESOURCE_TYPES_JSONIFY[resource_type]
if jsonify_key in obj:
try:
return cast("dict[str, Any]", json.loads(obj[jsonify_key]))
except json.JSONDecodeError:
logging.debug(
f"Attribute {jsonify_key} of resource type {resource_type} is not json encoded {obj[jsonify_key]}"
)
"""Tries to create a dict from a string of a supported resource type attribute"""

mapping = RESOURCE_TYPES_JSONIFY[resource_type]
jsonify_keys = [mapping] if isinstance(mapping, str) else mapping
for jsonify_key in jsonify_keys:
if jsonify_key in obj and obj[jsonify_key]:
if isinstance(obj[jsonify_key], (dict, list)):
return obj[jsonify_key]
try:
return cast("dict[str, Any]", json.loads(obj[jsonify_key]))
except json.JSONDecodeError:
logging.debug(
f"Attribute {jsonify_key} of resource type {resource_type} is not json encoded {obj[jsonify_key]}"
)

return None

Expand Down