diff --git a/htest/Test/Ganeti/OpCodes.hs b/htest/Test/Ganeti/OpCodes.hs index cf17dd91c9ef35d0b63d6d5ed261fb03fb7cad70..51dd653ec1e8c9e4334edc37a0f0917a45fba3b4 100644 --- a/htest/Test/Ganeti/OpCodes.hs +++ b/htest/Test/Ganeti/OpCodes.hs @@ -197,7 +197,7 @@ genNodeNames = resize maxNodes (listOf getFQDN) -- | Generates a list of node names in non-empty string type. genNodeNamesNE :: Gen [NonEmptyString] -genNodeNamesNE = genNodeNames >>= mapM (mkNonEmpty) +genNodeNamesNE = genNodeNames >>= mapM mkNonEmpty -- | Gets a node name in non-empty type. genNodeNameNE :: Gen NonEmptyString diff --git a/htools/Ganeti/JSON.hs b/htools/Ganeti/JSON.hs index 1138898344a64c5d4d94407b3f2dce784146f421..cc666128a0fbe6845af268518d00d42d2500617b 100644 --- a/htools/Ganeti/JSON.hs +++ b/htools/Ganeti/JSON.hs @@ -202,6 +202,7 @@ readContainer obj = do return (k', v')) kjvlist return $ GenericContainer (Map.fromList kalist) +{-# ANN showContainer "HLint: ignore Use ***" #-} -- | Container dumper. showContainer :: (HasStringRepr a, J.JSON b) => GenericContainer a b -> J.JSValue diff --git a/htools/Ganeti/OpParams.hs b/htools/Ganeti/OpParams.hs index bd7246cd2501d3937c1ddda09d39633fc7aab481..40a7b834d473083ab30bb1ddd313bb590950357b 100644 --- a/htools/Ganeti/OpParams.hs +++ b/htools/Ganeti/OpParams.hs @@ -345,14 +345,14 @@ pGroupName = simpleField "group_name" [t| NonEmptyString |] -- | Migration type (live\/non-live). pMigrationMode :: Field pMigrationMode = - renameField "MigrationMode" $ + renameField "MigrationMode" . optionalField $ simpleField "mode" [t| MigrationMode |] -- | Obsolete \'live\' migration mode (boolean). pMigrationLive :: Field pMigrationLive = - renameField "OldLiveMode" $ optionalField $ booleanField "live" + renameField "OldLiveMode" . optionalField $ booleanField "live" -- | Whether to force an unknown OS variant. pForceVariant :: Field @@ -440,7 +440,7 @@ pIgnoreErrors = defaultField [| Set.empty |] $ -- | Optional group name. pOptGroupName :: Field -pOptGroupName = renameField "OptGroupName" $ +pOptGroupName = renameField "OptGroupName" . optionalField $ simpleField "group_name" [t| NonEmptyString |] -- | Disk templates' parameter defaults.