summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-01-15 20:15:01 -0400
committerJoey Hess2015-01-15 20:15:01 -0400
commitc7609c824ba1ce7cdcdf9c646b721db80333f04b (patch)
treed35862ed87d9b61d73d45013085642dc1c0fa2d7 /src
parentee7135dbfd87c1be06ce7777e9e21fd6548c420e (diff)
Add descriptions of how to set missing fields to --list-fields output. (Minor API changes)
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Host.hs2
-rw-r--r--src/Propellor/PrivData.hs52
-rw-r--r--src/Propellor/Types.hs6
-rw-r--r--src/Propellor/Types/PrivData.hs4
4 files changed, 39 insertions, 25 deletions
diff --git a/src/Propellor/Host.hs b/src/Propellor/Host.hs
index 14d56e20..896db676 100644
--- a/src/Propellor/Host.hs
+++ b/src/Propellor/Host.hs
@@ -61,4 +61,4 @@ propigateInfo hl p f = combineProperties (propertyDesc p) $
p' = p { propertyInfo = f (propertyInfo p) }
i = hostInfo (getHost hl)
dnsprops = map addDNS (S.toList $ _dns i)
- privprops = map addPrivDataField (S.toList $ _privDataFields i)
+ privprops = map addPrivData (S.toList $ _privData i)
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index 6643d81d..53d5fdba 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -82,20 +82,24 @@ withPrivData' feed srclist c mkprop = addinfo $ mkprop $ \a ->
Context cname <- mkHostContext hc <$> asks hostName
warningMessage $ "Missing privdata " ++ intercalate " or " fieldnames ++ " (for " ++ cname ++ ")"
liftIO $ putStrLn $ "Fix this by running:"
- liftIO $ forM_ srclist $ \src -> do
- putStrLn $ " propellor --set '" ++ show (privDataField src) ++ "' '" ++ cname ++ "' \\"
- maybe noop (\d -> putStrLn $ " " ++ d) (describePrivDataSource src)
- putStrLn ""
+ liftIO $ showSet $
+ map (\s -> (privDataField s, Context cname, describePrivDataSource s)) srclist
return FailedChange
- addinfo p = p { propertyInfo = propertyInfo p <> mempty { _privDataFields = fieldset } }
+ addinfo p = p { propertyInfo = propertyInfo p <> mempty { _privData = privset } }
+ privset = S.fromList $ map (\s -> (privDataField s, describePrivDataSource s, hc)) srclist
fieldnames = map show fieldlist
- fieldset = S.fromList $ zip fieldlist (repeat hc)
fieldlist = map privDataField srclist
hc = asHostContext c
-addPrivDataField :: (PrivDataField, HostContext) -> Property
-addPrivDataField v = pureInfoProperty (show v) $
- mempty { _privDataFields = S.singleton v }
+showSet :: [(PrivDataField, Context, Maybe PrivDataSourceDesc)] -> IO ()
+showSet l = forM_ l $ \(f, Context c, md) -> do
+ putStrLn $ " propellor --set '" ++ show f ++ "' '" ++ c ++ "' \\"
+ maybe noop (\d -> putStrLn $ " " ++ d) md
+ putStrLn ""
+
+addPrivData :: (PrivDataField, Maybe PrivDataSourceDesc, HostContext) -> Property
+addPrivData v = pureInfoProperty (show v) $
+ mempty { _privData = S.singleton v }
{- Gets the requested field's value, in the specified context if it's
- available, from the host's local privdata cache. -}
@@ -111,8 +115,8 @@ type PrivMap = M.Map (PrivDataField, Context) PrivData
filterPrivData :: Host -> PrivMap -> PrivMap
filterPrivData host = M.filterWithKey (\k _v -> S.member k used)
where
- used = S.map (\(f, c) -> (f, mkHostContext c (hostName host))) $
- _privDataFields $ hostInfo host
+ used = S.map (\(f, _, c) -> (f, mkHostContext c (hostName host))) $
+ _privData $ hostInfo host
getPrivData :: PrivDataField -> Context -> PrivMap -> Maybe PrivData
getPrivData field context = M.lookup (field, context)
@@ -142,10 +146,17 @@ editPrivData field context = do
listPrivDataFields :: [Host] -> IO ()
listPrivDataFields hosts = do
m <- decryptPrivData
- showtable "Currently set data:" $
- map mkrow (M.keys m)
- showtable "Data that would be used if set:" $
- map mkrow (M.keys $ M.difference wantedmap m)
+
+ section "Currently set data:"
+ showtable $ map mkrow (M.keys m)
+ let missing = M.keys $ M.difference wantedmap m
+
+ unless (null missing) $ do
+ section "Missing data that would be used if set:"
+ showtable $ map mkrow missing
+
+ section "How to set missing data:"
+ showSet $ map (\(f, c) -> (f, c, join $ M.lookup (f, c) descmap)) missing
where
header = ["Field", "Context", "Used by"]
mkrow k@(field, (Context context)) =
@@ -153,12 +164,13 @@ listPrivDataFields hosts = do
, shellEscape context
, intercalate ", " $ sort $ fromMaybe [] $ M.lookup k usedby
]
- mkhostmap host = M.fromList $ map (\(f, c) -> ((f, mkHostContext c (hostName host)), [hostName host])) $
- S.toList $ _privDataFields $ hostInfo host
- usedby = M.unionsWith (++) $ map mkhostmap hosts
+ mkhostmap host mkv = M.fromList $ map (\(f, d, c) -> ((f, mkHostContext c (hostName host)), mkv d)) $
+ S.toList $ _privData $ hostInfo host
+ usedby = M.unionsWith (++) $ map (\h -> mkhostmap h $ const $ [hostName h]) hosts
wantedmap = M.fromList $ zip (M.keys usedby) (repeat "")
- showtable desc rows = do
- putStrLn $ "\n" ++ desc
+ descmap = M.unions $ map (\h -> mkhostmap h id) hosts
+ section desc = putStrLn $ "\n" ++ desc
+ showtable rows = do
putStr $ unlines $ formatTable $ tableWithHeader header rows
setPrivDataTo :: PrivDataField -> Context -> PrivData -> IO ()
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index ca3a9582..ab84a46b 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -176,7 +176,7 @@ data CmdLine
-- | Information about a host.
data Info = Info
{ _os :: Val System
- , _privDataFields :: S.Set (PrivDataField, HostContext)
+ , _privData :: S.Set (PrivDataField, Maybe PrivDataSourceDesc, HostContext)
, _sshPubKey :: M.Map SshKeyType String
, _aliases :: S.Set HostName
, _dns :: S.Set Dns.Record
@@ -190,7 +190,7 @@ instance Monoid Info where
mempty = Info mempty mempty mempty mempty mempty mempty mempty mempty
mappend old new = Info
{ _os = _os old <> _os new
- , _privDataFields = _privDataFields old <> _privDataFields new
+ , _privData = _privData old <> _privData new
, _sshPubKey = _sshPubKey new `M.union` _sshPubKey old
, _aliases = _aliases old <> _aliases new
, _dns = _dns old <> _dns new
@@ -202,7 +202,7 @@ instance Monoid Info where
instance Empty Info where
isEmpty i = and
[ isEmpty (_os i)
- , isEmpty (_privDataFields i)
+ , isEmpty (_privData i)
, isEmpty (_sshPubKey i)
, isEmpty (_aliases i)
, isEmpty (_dns i)
diff --git a/src/Propellor/Types/PrivData.hs b/src/Propellor/Types/PrivData.hs
index c7909a6b..6b3c35a2 100644
--- a/src/Propellor/Types/PrivData.hs
+++ b/src/Propellor/Types/PrivData.hs
@@ -24,9 +24,11 @@ data PrivDataSource
| PrivDataSourceFileFromCommand PrivDataField FilePath String
| PrivDataSource PrivDataField String
+type PrivDataSourceDesc = String
+
class IsPrivDataSource s where
privDataField :: s -> PrivDataField
- describePrivDataSource :: s -> Maybe String
+ describePrivDataSource :: s -> Maybe PrivDataSourceDesc
instance IsPrivDataSource PrivDataField where
privDataField = id