Skip to content

Commit e77deb2

Browse files
committedMay 21, 2020
terraform.jq: Bump version to 0.2.3 - improved jq error reporting
1 parent 5dde751 commit e77deb2

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed
 

‎terraform.jq

+20-15
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def aws:
227227
def extract_resources:
228228
XX("extract_resources";
229229
if .modules then clear_io(shape_resources(tf_lt_12_adapter[]))
230-
elif .resources then clear_io(shape_resources(.resources[]))
230+
elif .resources then clear_io(shape_resources(.resources[]?))
231231
else error("Can't read resources")
232232
end
233233
);
@@ -550,12 +550,17 @@ def aws:
550550

551551
def process:
552552
XX("process";
553-
if .modules or .resources then
554-
extract_resources | process_resources(.attributes; .instances)
555-
elif .resource_changes then
556-
. | extract_resource_changes | process_resource_changes
557-
else error("Unknown json file structure")
558-
end
553+
try
554+
if .modules or .resources then
555+
extract_resources | process_resources(.attributes; .instances)
556+
elif .resource_changes then
557+
. | extract_resource_changes | process_resource_changes
558+
else error("- Unknown tfstate/plan json file structure")
559+
end
560+
catch if test("^[⭣-]")
561+
then error(.)
562+
else error("Json input isn't an object")
563+
end
559564
);
560565

561566
XX("aws";
@@ -577,19 +582,19 @@ def AWS:
577582
}
578583
;
579584

580-
def meta:
581-
{terraform_version, format_version}
582-
;
585+
def meta: {
586+
terraform_version,
587+
format_version,
588+
version
589+
};
583590

584-
def version: "0.2.2";
591+
def version: "0.2.3";
585592

586-
def parse:
587-
{
593+
def parse: {
588594
version: version,
589595
meta: meta,
590596
keys: aws.cost.keys,
591-
}
592-
;
597+
};
593598

594599

595600
empty

0 commit comments

Comments
 (0)