Merge pull request #1324 from IntersectMBO/1166-query-slot-number-malformated-timestamp-exits-with-callstack-error

Improve error message for malformed timestamps

Author: palas

cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs

@@ -51,14 +51,15 @@ import Data.Maybe
 import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Time.Clock (UTCTime)
-import Data.Time.Format (defaultTimeLocale, parseTimeOrError)
+import Data.Time.Format (defaultTimeLocale, parseTimeM)
 import Data.Word
 import GHC.Exts (IsList (..))
 import GHC.Natural (Natural)
 import Lens.Micro
 import Network.Socket (PortNumber)
 import Options.Applicative hiding (help, str)
 import Options.Applicative qualified as Opt
+import Options.Applicative.Types (readerAsk)
 import Text.Read (readEither, readMaybe)
 import Text.Read qualified as Read
 import Vary (Vary, (:|))
@@ -1413,9 +1414,19 @@ pTxMetadataJsonSchema =
       pure TxMetadataJsonNoSchema
     ]
 
-convertTime :: String -> UTCTime
-convertTime =
-  parseTimeOrError False defaultTimeLocale "%Y-%m-%dT%H:%M:%SZ"
+convertTime :: String -> Maybe UTCTime
+convertTime = parseTimeM False defaultTimeLocale "%Y-%m-%dT%H:%M:%SZ"
+
+timeReader :: ReadM UTCTime
+timeReader = do
+  arg <- readerAsk
+  maybe
+    ( readerError $
+        "Malformed timestamp `" ++ arg ++ "', use UTC timestamp in YYYY-MM-DDThh:mm:ssZ format."
+    )
+    return
+    . convertTime
+    $ arg
 
 pMetadataFile :: Parser MetadataFile
 pMetadataFile =

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Option.hs

@@ -387,8 +387,8 @@ pGenesisDir =
 pMaybeSystemStart :: Parser (Maybe SystemStart)
 pMaybeSystemStart =
   Opt.optional $
-    fmap (SystemStart . convertTime) $
-      Opt.strOption $
+    fmap SystemStart $
+      Opt.option timeReader $
         mconcat
           [ Opt.long "start-time"
           , Opt.metavar "UTC_TIME"

cardano-cli/src/Cardano/CLI/EraBased/Query/Option.hs

@@ -579,11 +579,13 @@ pQuerySlotNumberCmd envCli =
       <*> pUtcTimestamp
  where
   pUtcTimestamp =
-    convertTime
-      <$> (Opt.strArgument . mconcat)
-        [ Opt.metavar "TIMESTAMP"
-        , Opt.help "UTC timestamp in YYYY-MM-DDThh:mm:ssZ format"
-        ]
+    Opt.argument
+      timeReader
+      ( mconcat
+          [ Opt.metavar "TIMESTAMP"
+          , Opt.help "UTC timestamp in YYYY-MM-DDThh:mm:ssZ format"
+          ]
+      )
 
 pQueryRefScriptSizeCmd :: forall era. IsEra era => EnvCli -> Parser (QueryCmds era)
 pQueryRefScriptSizeCmd envCli =

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Option.hs

@@ -486,8 +486,8 @@ systemStartPOSIX =
 
 systemStartUTC :: Parser SystemStart
 systemStartUTC =
-  SystemStart . convertTime
-    <$> ( Opt.strOption $
+  SystemStart
+    <$> ( Opt.option timeReader $
             mconcat
               [ Opt.long "start-time-utc"
               , Opt.metavar "UTC_TIME"

cardano-cli/src/Cardano/CLI/Legacy/Option.hs

@@ -236,8 +236,8 @@ pGenesisCmds envCli =
   pMaybeSystemStart :: Parser (Maybe SystemStart)
   pMaybeSystemStart =
     Opt.optional $
-      fmap (SystemStart . convertTime) $
-        Opt.strOption $
+      fmap SystemStart $
+        Opt.option timeReader $
           mconcat
             [ Opt.long "start-time"
             , Opt.metavar "UTC_TIME"