From 8f45a588bf57e1f4a786d2e7f5ec8ea938d313bb Mon Sep 17 00:00:00 2001 From: Andrew McGilvray Date: Wed, 9 Feb 2022 15:23:19 +1000 Subject: [PATCH] Properly parse the JSON additionalArtifactKeys Parsing fails when it is an array of strings. "additionalArtifactKeys":[{"artifactType":"QuicksightManifest","name":"QuickSight/cost_report_hourly_gzip-20210501-20210601-QuickSightManifest.json"},{"artifactType":"RedshiftCommands","name":"20210501-20210601/20210809T193620Z/cost_report_hourly_gzip-RedshiftCommands.sql"},{"artifactType":"RedshiftManifest","name":"20210501-20210601/20210809T193620Z/cost_report_hourly_gzip-RedshiftManifest.json"}] --- src/java/com/netflix/ice/processor/CostAndUsageReport.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java/com/netflix/ice/processor/CostAndUsageReport.java b/src/java/com/netflix/ice/processor/CostAndUsageReport.java index 96c9d11b..9310fd69 100644 --- a/src/java/com/netflix/ice/processor/CostAndUsageReport.java +++ b/src/java/com/netflix/ice/processor/CostAndUsageReport.java @@ -96,6 +96,11 @@ public class Column { public String name; } + public class AdditionalArtifact { + public String artifactType; + public String name; + } + public class BillingPeriod { public String start; public String end; @@ -113,7 +118,7 @@ public class Manifest { public BillingPeriod billingPeriod; public String bucket; public String[] reportKeys; - public String[] additionalArtifactKeys; + public AdditionalArtifact[] additionalArtifactKeys; public boolean hasTags() { for (Column column: columns) {