From a2cbcc00eb25275bfa56376fa4c76014453b9e85 Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Wed, 29 Apr 2020 18:10:41 +0200
Subject: [PATCH] Fix issue with aws-cli v2 and timestamp on check24 #585

---
 include/os_detector | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/include/os_detector b/include/os_detector
index 2d2faf76..b06754e2 100644
--- a/include/os_detector
+++ b/include/os_detector
@@ -32,16 +32,28 @@ bsd_how_older_from_today() {
 # function to convert from timestamp to date
 # output date format %Y-%m-%d
 gnu_timestamp_to_date() {
-  # remove fractions of a second
-  TIMESTAMP_TO_CONVERT=$(echo $1 | cut -f1 -d".")
-  OUTPUT_DATE=$("$DATE_CMD" -d @$TIMESTAMP_TO_CONVERT +'%Y-%m-%d')
-  echo $OUTPUT_DATE
+  # if date comes from cli v2 in format like 2020-04-29T10:13:09.191000-04:00
+  # we have to get only '%Y-%m-%d'
+  if [[ $1 = 20* ]];then 
+    echo $1 | cut -f1 -d"T"
+  else 
+    # remove fractions of a second
+    TIMESTAMP_TO_CONVERT=$(echo $1 | cut -f1 -d".")
+    OUTPUT_DATE=$("$DATE_CMD" -d @$TIMESTAMP_TO_CONVERT +'%Y-%m-%d')
+    echo $OUTPUT_DATE
+  fi 
 }
 bsd_timestamp_to_date() {
-  # remove fractions of a second
-  TIMESTAMP_TO_CONVERT=$(echo $1 | cut -f1 -d".")
-  OUTPUT_DATE=$("$DATE_CMD" -r $TIMESTAMP_TO_CONVERT +'%Y-%m-%d')
-  echo $OUTPUT_DATE
+  # if date comes from cli v2 in format like 2020-04-29T10:13:09.191000-04:00
+  # we have to get only '%Y-%m-%d'
+  if [[ $1 = 20* ]];then 
+    echo $1 | cut -f1 -d"T"
+  else
+    # remove fractions of a second
+    TIMESTAMP_TO_CONVERT=$(echo $1 | cut -f1 -d".")
+    OUTPUT_DATE=$("$DATE_CMD" -r $TIMESTAMP_TO_CONVERT +'%Y-%m-%d')
+    echo $OUTPUT_DATE
+  fi 
 }
 
 gnu_decode_report() {