Implement variable overrides

app/Main.hs

@@ -2,6 +2,7 @@ module Main where
 
 import Data.Function ((&))
 import Data.Map.Strict qualified as Map
+import Data.Text (Text)
 import Data.Version (showVersion)
 import Effectful
 import Effectful.Error.Static
@@ -24,6 +25,9 @@ data Options = Options
   { dryRun :: Bool
   , verbose :: Bool
   , configurationFile :: Maybe OsPath
+  , mDeploymentArch :: Maybe Text
+  , mDeploymentOs :: Maybe Text
+  , mDeploymentHostname :: Maybe Text
   , cliCommand :: Command
   }
   deriving stock (Show, Eq)
@@ -52,7 +56,14 @@ parseOptions =
     <$> switch
       (long "dry-run" <> help "Do not perform actual file system operations")
     <*> switch (long "verbose" <> help "Make the program more talkative")
-    <*> optional (option osPathOption (long "deployments-file" <> metavar "FILENAME" <> help "Use the specified deployments.lua file"))
+    <*> optional
+      (option osPathOption (long "deployments-file" <> metavar "FILENAME" <> help "Use the specified deployments.lua file"))
+    <*> optional
+      (option str (long "arch" <> metavar "ARCH" <> help "Override the detected architecture in the configuration file"))
+    <*> optional
+      (option str (long "os" <> metavar "OS" <> help "Override the operating system detected in the configuration file"))
+    <*> optional
+      (option str (long "hostname" <> metavar "HOSTNAME" <> help "Override the host name detected in the configuration file"))
     <*> parseCommand
 
 parseCommand :: Parser Command
@@ -74,16 +85,16 @@ runOptions
      )
   => Options
   -> Eff es ()
-runOptions (Options dryRun verbose configurationFile Check) = do
-  deployments <- processConfiguration verbose configurationFile
+runOptions (Options dryRun verbose configurationFile mArch mOs mHostname Check) = do
+  deployments <- processConfiguration verbose configurationFile mArch mOs mHostname
   if dryRun
     then
       Cmd.check verbose deployments
         & runSymlinkPure Map.empty
     else
       Cmd.check verbose deployments
         & runSymlinkIO
-runOptions (Options dryRun verbose configurationFile Deploy) = do
+runOptions (Options dryRun verbose configurationFile mArch mOs mHostname Deploy) = do
   deployments <- processConfiguration verbose configurationFile
   if dryRun
     then

cabal.project

@@ -10,10 +10,6 @@ documentation: True
 
 tests: True
 
-profiling: True
-
-library-profiling: True
-
 -- semaphore: True
 
 -- multi-repl: True

confer.cabal

@@ -50,9 +50,7 @@ common ghc-options
     -Wno-unticked-promoted-constructors
 
   if flag(development)
-    ghc-options:
-      -finfo-table-map -Wno-unused-imports -Wno-unused-packages -prof
-      -fprof-auto -with-rtsopts=-p
+    ghc-options: -finfo-table-map -Wno-unused-imports -Wno-unused-packages
 
 common rts-options
   ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
@@ -82,6 +80,7 @@ library
     , directory
     , effectful
     , effectful-core
+    , extra
     , filepath
     , hostname
     , hslua-aeson
@@ -117,6 +116,7 @@ executable confer
     , effectful-core
     , filepath
     , optparse-applicative
+    , text
 
   if flag(development)
     build-depends: placeholder

doc/MANUAL.md

@@ -39,7 +39,7 @@ Display the help message.
 ### Configuration overrides
 
 #### `--arch=<arch>`
-Override the detected architecturein the configuration file.
+Override the detected architecture in the configuration file.
 
 With `arch` as:
 

src/Confer/Config/ConfigFile.hs

@@ -21,6 +21,7 @@ import System.OsPath qualified as OsPath
 import Confer.CLI.Errors
 import Confer.Config.Evaluator
 import Confer.Config.Types (Deployment, DeploymentArchitecture (..), DeploymentOS (..))
+import Data.Text (Text)
 
 -- | This function looks up the configuration file in the following places
 -- (ordered by position):
@@ -34,18 +35,56 @@ processConfiguration
      )
   => Bool
   -> Maybe OsPath
+  -> Maybe DeploymentArchitecture
+  -> Maybe DeploymentOS
+  -> Maybe Text
   -> Eff es (Vector Deployment)
-processConfiguration verbose mConfigurationFilePath = do
+processConfiguration verbose mConfigurationFilePath mDeploymentArch mOS mHostname = do
   pathToConfigFile <- determineConfigurationFilePath mConfigurationFilePath
   loadConfiguration verbose pathToConfigFile >>= \case
     Right allDeployments -> do
-      let currentOS = OS (Text.pack System.os)
-      let currentArch = Arch (Text.pack System.arch)
-      currentHost <- Text.pack <$> liftIO getHostName
-      when verbose $ do
-        liftIO $ Text.putStrLn $ "Hostname: " <> currentHost <> " (detected)"
-        liftIO $ Text.putStrLn $ "OS: " <> display currentOS <> " (detected)"
-        liftIO $ Text.putStrLn $ "Architecture: " <> display currentArch <> " (detected)"
+      currentOS <- case mOS of
+        Nothing -> do
+          let inferredOS = OS (Text.pack System.os)
+          when verbose $ do
+            liftIO $ Text.putStrLn $ "OS: " <> display inferredOS <> " (detected)"
+          pure inferredOS
+        Just overridenOS -> do
+          when verbose $
+            liftIO $
+              Text.putStrLn $
+                "OS: " <> display overridenOS <> " (overriden)"
+          pure overridenOS
+
+      currentArch <- case mDeploymentArch of
+        Nothing -> do
+          let inferredArch = Arch (Text.pack System.arch)
+          when verbose $
+            liftIO $
+              Text.putStrLn $
+                "Architecture: " <> display inferredOS <> " (detected)"
+          pure inferredArch
+        Just overridenArch -> do
+          when verbose $
+            liftIO $
+              Text.putStrLn $
+                "Architecture: " <> display inferredOS <> " (overriden)"
+          pure overridenArch
+
+      currentHost <- case mHostname of
+        Nothing -> do
+          when verbose $
+            liftIO $
+              Text.putStrLn $
+                "Hostname: " <> display inferredOS <> " (detected)"
+          Text.pack <$> liftIO getHostName
+        Just overridenHostname -> do
+          when verbose $
+            liftIO $
+              Text.putStrLn $
+                "Hostname: " <> display inferredOS <> " (overriden)"
+          pure overridenHostname
+
       let deployments =
             adjustConfiguration
               currentHost
@@ -63,7 +102,7 @@ determineConfigurationFilePath
   => Maybe OsPath
   -> Eff es OsPath
 determineConfigurationFilePath mCLIConfigFilePath =
-  case checkCLIOptions mCLIConfigFilePath of
+  case mCLIConfigFilePath of
     Just osPath -> do
       filePath <- liftIO $ OsPath.decodeFS osPath
       FileSystem.doesFileExist filePath
@@ -78,7 +117,3 @@ determineConfigurationFilePath mCLIConfigFilePath =
           True ->
             FileSystem.makeAbsolute "deployments.lua"
               >>= (liftIO . OsPath.encodeFS)
-
-checkCLIOptions :: Maybe OsPath -> Maybe OsPath
-checkCLIOptions Nothing = Nothing
-checkCLIOptions (Just osPath) = Just osPath