Add support for healthcheck argument start-interval

src/Language/Docker/Parser/Healthcheck.hs

@@ -16,6 +16,7 @@ data CheckFlag
   = FlagInterval Duration
   | FlagTimeout Duration
   | FlagStartPeriod Duration
+  | FlagStartInterval Duration
   | FlagRetries Retries
   | CFlagInvalid (Text, Text)
 
@@ -42,20 +43,23 @@ parseHealthcheck = do
       let intervals = [x | FlagInterval x <- flags]
       let timeouts = [x | FlagTimeout x <- flags]
       let startPeriods = [x | FlagStartPeriod x <- flags]
+      let startIntervals = [x | FlagStartInterval x <- flags]
       let retriesD = [x | FlagRetries x <- flags]
       let invalid = [x | CFlagInvalid x <- flags]
       -- Let's do some validation on the flags
-      case (invalid, intervals, timeouts, startPeriods, retriesD) of
-        ((k, v) : _, _, _, _, _) -> unexpectedFlag k v
-        (_, _ : _ : _, _, _, _) -> customError $ DuplicateFlagError "--interval"
-        (_, _, _ : _ : _, _, _) -> customError $ DuplicateFlagError "--timeout"
-        (_, _, _, _ : _ : _, _) -> customError $ DuplicateFlagError "--start-period"
-        (_, _, _, _, _ : _ : _) -> customError $ DuplicateFlagError "--retries"
+      case (invalid, intervals, timeouts, startPeriods, startIntervals, retriesD) of
+        ((k, v) : _, _, _, _, _, _) -> unexpectedFlag k v
+        (_, _ : _ : _, _, _, _, _) -> customError $ DuplicateFlagError "--interval"
+        (_, _, _ : _ : _, _, _, _) -> customError $ DuplicateFlagError "--timeout"
+        (_, _, _, _ : _ : _, _, _) -> customError $ DuplicateFlagError "--start-period"
+        (_, _, _, _, _ : _ : _, _) -> customError $ DuplicateFlagError "--start-interval"
+        (_, _, _, _, _, _ : _ : _) -> customError $ DuplicateFlagError "--retries"
         _ -> do
           Cmd checkCommand <- parseCmd
           let interval = listToMaybe intervals
           let timeout = listToMaybe timeouts
           let startPeriod = listToMaybe startPeriods
+          let startInterval = listToMaybe startIntervals
           let retries = listToMaybe retriesD
           return $ Check CheckArgs {..}
 
@@ -64,6 +68,7 @@ checkFlag =
   (FlagInterval <$> durationFlag "--interval=" <?> "--interval")
     <|> (FlagTimeout <$> durationFlag "--timeout=" <?> "--timeout")
     <|> (FlagStartPeriod <$> durationFlag "--start-period=" <?> "--start-period")
+    <|> (FlagStartInterval <$> durationFlag "--start-interval=" <?> "--start-interval")
     <|> (FlagRetries <$> retriesFlag <?> "--retries")
     <|> (CFlagInvalid <$> anyFlag <?> "no flags")
 

src/Language/Docker/PrettyPrint.hs

@@ -337,6 +337,7 @@ prettyPrintInstruction i =
       prettyPrintDuration "--interval=" interval
       prettyPrintDuration "--timeout=" timeout
       prettyPrintDuration "--start-period=" startPeriod
+      prettyPrintDuration "--start-interval" startInterval
       prettyPrintRetries retries
       "CMD"
       prettyPrintArguments checkCommand

src/Language/Docker/Syntax.hs

@@ -243,6 +243,7 @@ data CheckArgs args
         interval :: !(Maybe Duration),
         timeout :: !(Maybe Duration),
         startPeriod :: !(Maybe Duration),
+        startInterval :: !(Maybe Duration),
         retries :: !(Maybe Retries)
       }
   deriving (Show, Eq, Ord, Functor)

test/Language/Docker/ParseHealthcheckSpec.hs

@@ -16,47 +16,55 @@ spec = do
         "HEALTHCHECK --interval=5m \\\nCMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
-              CheckArgs "curl -f http://localhost/" (Just 300) Nothing Nothing Nothing
+              CheckArgs "curl -f http://localhost/" (Just 300) Nothing Nothing Nothing Nothing
         ]
     it "parse healthcheck with retries" $
       assertAst
         "HEALTHCHECK --retries=10 CMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
-              CheckArgs "curl -f http://localhost/" Nothing Nothing Nothing (Just $ Retries 10)
+              CheckArgs "curl -f http://localhost/" Nothing Nothing Nothing Nothing (Just $ Retries 10)
         ]
     it "parse healthcheck with timeout" $
       assertAst
         "HEALTHCHECK --timeout=10s CMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
-              CheckArgs "curl -f http://localhost/" Nothing (Just 10) Nothing Nothing
+              CheckArgs "curl -f http://localhost/" Nothing (Just 10) Nothing Nothing Nothing
         ]
     it "parse healthcheck with start-period" $
       assertAst
         "HEALTHCHECK --start-period=2m CMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
-              CheckArgs "curl -f http://localhost/" Nothing Nothing (Just 120) Nothing
+              CheckArgs "curl -f http://localhost/" Nothing Nothing (Just 120) Nothing Nothing
+        ]
+    it "parse healthcheck with start-interval" $
+      assertAst
+        "HEALTHCHECK --start-interval=4m CMD curl -f http://localhost/"
+        [ Healthcheck $
+            Check $
+              CheckArgs "curl -f http://localhost/" Nothing Nothing Nothing (Just 240) Nothing
         ]
     it "parse healthcheck with all flags" $
       assertAst
-        "HEALTHCHECK --start-period=2s --timeout=1m --retries=3 --interval=5s    CMD curl -f http://localhost/"
+        "HEALTHCHECK --start-period=2s --start-interval=10s --timeout=1m --retries=3 --interval=5s    CMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
               CheckArgs
                 "curl -f http://localhost/"
                 (Just 5)
                 (Just 60)
                 (Just 2)
+                (Just 10)
                 (Just $ Retries 3)
         ]
     it "parse healthcheck with no flags" $
       assertAst
         "HEALTHCHECK CMD curl -f http://localhost/"
         [ Healthcheck $
             Check $
-              CheckArgs "curl -f http://localhost/" Nothing Nothing Nothing Nothing
+              CheckArgs "curl -f http://localhost/" Nothing Nothing Nothing Nothing Nothing
         ]
 
     it "fractional arguments to flags" $
@@ -66,6 +74,7 @@ spec = do
                 "  --interval=0.5s \\",
                 "  --timeout=0.1s \\",
                 "  --start-period=0.2s \\",
+                "  --start-interval=0.5s \\",
                 "  CMD curl -f http://localhost"
               ]
        in assertAst
@@ -77,5 +86,6 @@ spec = do
                     ( Just 0.5 )
                     ( Just 0.10000000149 )
                     ( Just 0.20000000298 )
+                    ( Just 0.5 )
                     Nothing
             ]