@@ -5,84 +5,70 @@
55{-# LANGUAGE MultiWayIf #-}
66{-# LANGUAGE OverloadedStrings #-}
77{-# LANGUAGE PatternGuards #-}
8+{-# LANGUAGE QuasiQuotes #-}
89{-# LANGUAGE ScopedTypeVariables #-}
910{-# LANGUAGE TypeApplications #-}
10−module Obelisk.Command.Thunk
11− ( ThunkPtr (..)
12− , ThunkRev (..)
13− , ThunkSource (..)
14− , ThunkData (..)
15− , ReadThunkError (..)
16− , GitHubSource (..)
17− , getThunkGitBranch
18− , getLatestRev
19− , updateThunkToLatest
20− , createThunk
21− , createThunkWithLatest
22− , nixBuildAttrWithCache
23− , nixBuildThunkAttrWithCache
24− , unpackThunk
25− , packThunk
26− , readThunk
27− , updateThunk
28− , getThunkPtr
29− , getThunkPtr'
30− , parseGitUri
31− , uriThunkPtr
32− ) where
11+module Obelisk.Command.Thunk where
3312
3413import Control.Applicative
3514import Control.Exception (displayException, try)
36−import Control.Lens.Indexed hiding ((<.>))
15+import Control.Lens (ifor, ifor_, (.~))
3716import Control.Monad
38−import Control.Monad.Catch (handle)
17+import Control.Monad.Extra (findM)
18+import Control.Monad.Catch (MonadCatch, handle)
3919import Control.Monad.Except
4020import Data.Aeson ((.=))
4121import qualified Data.Aeson as Aeson
4222import Data.Aeson.Encode.Pretty
4323import qualified Data.Aeson.Types as Aeson
24+import Data.Bifunctor (first)
4425import qualified Data.ByteString.Lazy as LBS
26+import Data.Containers.ListUtils (nubOrd)
4527import Data.Default
4628import Data.Either.Combinators (fromRight', rightToMaybe)
29+import Data.Foldable (toList)
30+import Data.Function ((&))
31+import Data.Functor ((<&>))
4732import Data.Git.Ref (Ref)
4833import qualified Data.Git.Ref as Ref
4934import qualified Data.List as L
50−import Data.List.NonEmpty (NonEmpty (..))
35+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
5136import qualified Data.List.NonEmpty as NonEmpty
5237import Data.Map (Map)
5338import qualified Data.Map as Map
5439import Data.Maybe
5540import Data.Set (Set)
5641import qualified Data.Set as Set
42+import Data.String.Here.Interpolated (i)
43+import Data.String.Here.Uninterpolated (here)
5744import Data.Text (Text)
5845import qualified Data.Text as T
5946import Data.Text.Encoding
6047import qualified Data.Text.IO as T
6148import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
49+import Data.Traversable (for)
6250import Data.Yaml (parseMaybe)
6351import GitHub
6452import GitHub.Data.Name
6553import Obelisk.Command.Nix
6654import System.Directory
55+import System.Exit
6756import System.FilePath
6857import System.IO.Error
6958import System.IO.Temp
70−import System.Posix (getSymbolicLinkStatus, modificationTime)
71−import System.Process (proc)
72−import Text.URI
59+import System.PosixCompat.Files (getSymbolicLinkStatus, modificationTime)
60+import qualified Text.URI as URI
7361
7462import Obelisk.App (MonadObelisk)
7563import Obelisk.CliApp
76−import Obelisk.Command.Nix (withNixRemoteCheck)
7764import Obelisk.Command.Utils
7865
7966--TODO: Support symlinked thunk data
8067data ThunkData
81− = ThunkData_Packed ThunkPtr
68+ = ThunkData_Packed ThunkSpec ThunkPtr
8269 -- ^ Packed thunk
83− | ThunkData_Checkout (Maybe ThunkPtr)
70+ | ThunkData_Checkout
8471 -- ^ Checked out thunk that was unpacked from this pointer
85− deriving (Show, Eq, Ord)
8672
8773-- | A reference to the exact data that a thunk should translate into
8874data ThunkPtr = ThunkPtr
@@ -95,7 +81,7 @@ type NixSha256 = Text --TODO: Use a smart constructor and make this actually ver
9581
9682-- | A specific revision of data; it may be available from multiple sources
9783data ThunkRev = ThunkRev
98− { _thunkRev_commit :: Ref
84+ { _thunkRev_commit :: Ref Ref.SHA1
9985 , _thunkRev_nixSha256 :: NixSha256
10086 }
10187 deriving (Show, Eq, Ord)
@@ -108,40 +94,72 @@ data ThunkSource
10894 | ThunkSource_Git GitSource
10995 deriving (Show, Eq, Ord)
11096
97+thunkSourceToGitSource :: ThunkSource -> GitSource
98+thunkSourceToGitSource = \case
99+ ThunkSource_GitHub s -> forgetGithub False s
100+ ThunkSource_Git s -> s
101+
111102data GitHubSource = GitHubSource
112103 { _gitHubSource_owner :: Name Owner
113104 , _gitHubSource_repo :: Name Repo
114105 , _gitHubSource_branch :: Maybe (Name Branch)
106+ , _gitHubSource_private :: Bool
115107 }
116108 deriving (Show, Eq, Ord)
117109
110+newtype GitUri = GitUri { unGitUri :: URI.URI } deriving (Eq, Ord, Show)
111+
112+gitUriToText :: GitUri -> Text
113+gitUriToText (GitUri uri)
114+ | (T.toLower . URI.unRText <$> URI.uriScheme uri) == Just "file"
115+ , Just (_, path) <- URI.uriPath uri
116+ = "/" <> T.intercalate "/" (map URI.unRText $ NonEmpty.toList path)
117+ | otherwise = URI.render uri
118+
118119data GitSource = GitSource
119− { _gitSource_url :: URI
120+ { _gitSource_url :: GitUri
120121 , _gitSource_branch :: Maybe (Name Branch)
121122 , _gitSource_fetchSubmodules :: Bool
123+ , _gitSource_private :: Bool
122124 }
123125 deriving (Show, Eq, Ord)
124126
127+newtype ThunkConfig = ThunkConfig
128+ { _thunkConfig_private :: Maybe Bool
129+ } deriving Show
130+
131+data ThunkUpdateConfig = ThunkUpdateConfig
132+ { _thunkUpdateConfig_branch :: Maybe String
133+ , _thunkUpdateConfig_config :: ThunkConfig
134+ } deriving Show
135+
136+data ThunkPackConfig = ThunkPackConfig
137+ { _thunkPackConfig_force :: Bool
138+ , _thunkPackConfig_config :: ThunkConfig
139+ } deriving Show
140+
125141-- | Convert a GitHub source to a regular Git source. Assumes no submodules.
126−forgetGithub :: GitHubSource -> GitSource
127−forgetGithub s = GitSource
128− { _gitSource_url = URI
129− { uriScheme = Just $ fromRight' $ mkScheme "https"
130− , uriAuthority = Right $ Authority
131− { authUserInfo = Nothing
132− , authHost = fromRight' $ mkHost "github.com"
133− , authPort = Nothing
142+forgetGithub :: Bool -> GitHubSource -> GitSource
143+forgetGithub useSsh s = GitSource
144+ { _gitSource_url = GitUri $ URI.URI
145+ { URI.uriScheme = Just $ fromRight' $ URI.mkScheme $ if useSsh then "ssh" else "https"
146+ , URI.uriAuthority = Right $ URI.Authority
147+ { URI.authUserInfo = URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
148+ <$ guard useSsh
149+ , URI.authHost = fromRight' $ URI.mkHost "github.com"
150+ , URI.authPort = Nothing
134151 }
135− , uriPath = Just ( False
136− , fromRight' . mkPathPiece <$>
152+ , URI.uriPath = Just ( False
153+ , fromRight' . URI.mkPathPiece <$>
137154 untagName (_gitHubSource_owner s)
138155 :| [ untagName (_gitHubSource_repo s) <> ".git" ]
139156 )
140− , uriQuery = []
141− , uriFragment = Nothing
157+ , URI.uriQuery = []
158+ , URI.uriFragment = Nothing
142159 }
143160 , _gitSource_branch = _gitHubSource_branch s
144161 , _gitSource_fetchSubmodules = False
162+ , _gitSource_private = _gitHubSource_private s
145163 }
146164
147165getThunkGitBranch :: ThunkPtr -> Maybe Text
@@ -149,25 +167,26 @@ getThunkGitBranch (ThunkPtr _ src) = fmap untagName $ case src of
149167 ThunkSource_GitHub s -> _gitHubSource_branch s
150168 ThunkSource_Git s -> _gitSource_branch s
151169
152−commitNameToRef :: Name Commit -> Ref
170+commitNameToRef :: Name Commit -> Ref Ref.SHA1
153171commitNameToRef (N c) = Ref.fromHex $ encodeUtf8 c
154172
155173-- TODO: Use spinner here.
156174getNixSha256ForUriUnpacked
157175 :: MonadObelisk m
158− => URI
176+ => GitUri
159177 -> m NixSha256
160178getNixSha256ForUriUnpacked uri =
161− withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> T.pack (show uri)) $ do
162− withNixRemoteCheck $ readProcessAndLogStderr Debug $
163− proc "nix-prefetch-url" ["--unpack" , "--type" , "sha256" , show uri]
179+ withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> gitUriToText uri) $ do
180+ [hash] <- fmap T.lines $ readProcessAndLogOutput (Debug, Debug) $
181+ proc nixPrefetchUrlPath ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
182+ pure hash
164183
165−nixPrefetchGit :: MonadObelisk m => URI -> Text -> Bool -> m NixSha256
184+nixPrefetchGit :: MonadObelisk m => GitUri -> Text -> Bool -> m NixSha256
166185nixPrefetchGit uri rev fetchSubmodules =
167− withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> T.pack (show uri) <> " at " <> rev) $ do
168− out <- withNixRemoteCheck $ readProcessAndLogStderr Debug $
169− proc "nix-prefetch-git" $ filter (/="")
170− [ "--url", show uri
186+ withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> gitUriToText uri <> " at " <> rev) $ do
187+ out <- readProcessAndLogStderr Debug $
188+ proc nixPrefetchGitPath $ filter (/="")
189+ [ "--url", T.unpack $ gitUriToText uri
171190 , "--rev", T.unpack rev
172191 , if fetchSubmodules then "--fetch-submodules" else ""
173192 , "--quiet"
@@ -179,93 +198,117 @@ nixPrefetchGit uri rev fetchSubmodules =
179198
180199--TODO: Pretty print these
181200data ReadThunkError
182− = ReadThunkError_UnrecognizedFiles
183− | ReadThunkError_AmbiguousFiles
184− | ReadThunkError_UnrecognizedLoader Text
185− | ReadThunkError_UnparseablePtr LBS.ByteString
186− deriving (Show)
187−
188−-- | Read a thunk and validate that it is only a thunk, either packed or unpacked.
189−-- If the thunk is packed and additional data is present, fail.
190−readThunk :: MonadObelisk m => FilePath -> m (Either ReadThunkError ThunkData)
191−readThunk thunkDir = do
192− files <- liftIO $ listDirectory thunkDir
193− case ".git" `elem` files of
194− True -> fmap ThunkData_Checkout <$> do
195− let origThunkPath = thunkDir </> ".git" </> "obelisk" </> "orig-thunk"
196− liftIO $ doesDirectoryExist origThunkPath >>= \case
197− True -> fmap Just <$> readPackedThunk origThunkPath
198− False -> return $ return Nothing
199− False -> liftIO $ fmap ThunkData_Packed <$> readPackedThunk thunkDir
200−
201−data ThunkType = ThunkType
202− { _thunkType_loader :: FilePath
203− , _thunkType_json :: FilePath
204− , _thunkType_optional :: Set FilePath
205− , _thunkType_loaderVersions :: NonEmpty Text
206− , _thunkType_parser :: Aeson.Object -> Aeson.Parser ThunkPtr
207− }
208−
209−gitHubThunkType :: ThunkType
210−gitHubThunkType = ThunkType
211− { _thunkType_loader = "default.nix"
212− , _thunkType_json = "github.json"
213− , _thunkType_optional = Set.fromList [".attr-cache"]
214− , _thunkType_loaderVersions = gitHubStandaloneLoaders
215− , _thunkType_parser = parseThunkPtr $ \v ->
216− ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
217− }
218−
219−gitThunkType :: ThunkType
220−gitThunkType = ThunkType
221− { _thunkType_loader = "default.nix"
222− , _thunkType_json = "git.json"
223− , _thunkType_optional = Set.fromList [".attr-cache"]
224− , _thunkType_loaderVersions = plainGitStandaloneLoaders
225− , _thunkType_parser = parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
201+ = ReadThunkError_UnrecognizedThunk
202+ | ReadThunkError_UnrecognizedPaths (NonEmpty FilePath)
203+ | ReadThunkError_MissingPaths (NonEmpty FilePath)
204+ | ReadThunkError_UnparseablePtr FilePath String
205+ | ReadThunkError_FileError IOError
206+ | ReadThunkError_FileDoesNotMatch FilePath Text
207+ | ReadThunkError_UnrecognizedState String
208+ | ReadThunkError_AmbiguousPackedState ThunkPtr ThunkPtr
209+ deriving (Show)
210+
211+unpackedDirName :: FilePath
212+unpackedDirName = "."
213+
214+attrCacheFileName :: FilePath
215+attrCacheFileName = ".attr-cache"
216+
217+-- | Specification for how a file in a thunk version works.
218+data ThunkFileSpec
219+ = ThunkFileSpec_Ptr (LBS.ByteString -> Either String ThunkPtr) -- ^ This file specifies 'ThunkPtr' data
220+ | ThunkFileSpec_FileMatches Text -- ^ This file must match the given content exactly
221+ | ThunkFileSpec_CheckoutIndicator -- ^ Existence of this directory indicates that the thunk is unpacked
222+ | ThunkFileSpec_AttrCache -- ^ This directory is an attribute cache
223+
224+-- | Specification for how a set of files in a thunk version work.
225+data ThunkSpec = ThunkSpec
226+ { _thunkSpec_name :: !Text
227+ , _thunkSpec_files :: !(Map FilePath ThunkFileSpec)
226228 }
227229
228−thunkTypes :: [ThunkType]
229−thunkTypes = [gitThunkType, gitHubThunkType]
230−
231−findThunkType :: [ThunkType] -> FilePath -> IO (Either ReadThunkError ThunkType)
232−findThunkType types thunkDir = do
233− matches <- fmap catMaybes $ forM types $ \thunkType -> do
234− let
235− expectedContents = Set.fromList $ (thunkDir </>) <$>
236− [ _thunkType_loader thunkType
237− , _thunkType_json thunkType
238− ]
239− optionalContents = Set.map (thunkDir </>) (_thunkType_optional thunkType)
240−
241− -- Ensure that there aren't any other files in the thunk
242− -- NB: System.Directory.listDirectory returns the contents without the directory path
243− files <- liftIO $ Set.fromList . fmap (thunkDir </>) <$> listDirectory thunkDir
244− let unexpectedContents = files `Set.difference` (expectedContents `Set.union` optionalContents)
245− missingContents = expectedContents `Set.difference` files
246− pure $ if Set.null unexpectedContents && Set.null missingContents
247− then Just thunkType
248− else Nothing
249−
250− pure $ case matches of
251− [singleMatch] -> Right singleMatch
252− [] -> Left ReadThunkError_UnrecognizedFiles
253− _ -> Left ReadThunkError_AmbiguousFiles
230+thunkSpecTypes :: NonEmpty (NonEmpty ThunkSpec)
231+thunkSpecTypes = gitThunkSpecs :| [gitHubThunkSpecs]
232+
233+-- | Attempts to match a 'ThunkSpec' to a given directory.
234+matchThunkSpecToDir
235+ :: (MonadError ReadThunkError m, MonadIO m, MonadCatch m)
236+ => ThunkSpec -- ^ 'ThunkSpec' to match against the given files/directory
237+ -> FilePath -- ^ Path to directory
238+ -> Set FilePath -- ^ Set of file paths relative to the given directory
239+ -> m ThunkData
240+matchThunkSpecToDir thunkSpec dir dirFiles = do
241+ case nonEmpty (toList $ dirFiles `Set.difference` expectedPaths) of
242+ Just fs -> throwError $ ReadThunkError_UnrecognizedPaths $ (dir </>) <$> fs
243+ Nothing -> pure ()
244+ case nonEmpty (toList $ requiredPaths `Set.difference` dirFiles) of
245+ Just fs -> throwError $ ReadThunkError_MissingPaths $ (dir </>) <$> fs
246+ Nothing -> pure ()
247+ datas <- fmap toList $ flip Map.traverseMaybeWithKey (_thunkSpec_files thunkSpec) $ \expectedPath -> \case
248+ ThunkFileSpec_AttrCache -> Nothing <$ dirMayExist expectedPath
249+ ThunkFileSpec_CheckoutIndicator -> liftIO (doesDirectoryExist (dir </> expectedPath)) <&> \case
250+ False -> Nothing
251+ True -> Just ThunkData_Checkout
252+ ThunkFileSpec_FileMatches expectedContents -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
253+ actualContents <- liftIO (T.readFile $ dir </> expectedPath)
254+ case T.strip expectedContents == T.strip actualContents of
255+ True -> pure Nothing
256+ False -> throwError $ ReadThunkError_FileDoesNotMatch (dir </> expectedPath) expectedContents
257+ ThunkFileSpec_Ptr parser -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
258+ let path = dir </> expectedPath
259+ liftIO (doesFileExist path) >>= \case
260+ False -> pure Nothing
261+ True -> do
262+ actualContents <- liftIO $ LBS.readFile path
263+ case parser actualContents of
264+ Right v -> pure $ Just (ThunkData_Packed thunkSpec v)
265+ Left e -> throwError $ ReadThunkError_UnparseablePtr (dir </> expectedPath) e
266+
267+ case nonEmpty datas of
268+ Nothing -> throwError ReadThunkError_UnrecognizedThunk
269+ Just xs -> fold1WithM xs $ \a b -> either throwError pure (mergeThunkData a b)
270+ where
271+ rootPathsOnly = Set.fromList . mapMaybe takeRootDir . Map.keys
272+ takeRootDir = fmap NonEmpty.head . nonEmpty . splitPath
273+
274+ expectedPaths = rootPathsOnly $ _thunkSpec_files thunkSpec
275+
276+ requiredPaths = rootPathsOnly $ Map.filter isRequiredFileSpec $ _thunkSpec_files thunkSpec
277+ isRequiredFileSpec = \case
278+ ThunkFileSpec_FileMatches _ -> True
279+ _ -> False
280+
281+ dirMayExist expectedPath = liftIO (doesFileExist (dir </> expectedPath)) >>= \case
282+ True -> throwError $ ReadThunkError_UnrecognizedPaths $ expectedPath :| []
283+ False -> pure ()
284+
285+ -- Combine 'ThunkData' from different files, preferring "Checkout" over "Packed"
286+ mergeThunkData ThunkData_Checkout ThunkData_Checkout = Right ThunkData_Checkout
287+ mergeThunkData ThunkData_Checkout ThunkData_Packed{} = Left bothPackedAndUnpacked
288+ mergeThunkData ThunkData_Packed{} ThunkData_Checkout = Left bothPackedAndUnpacked
289+ mergeThunkData a@(ThunkData_Packed _ ptrA) (ThunkData_Packed _ ptrB) =
290+ if ptrA == ptrB then Right a else Left $ ReadThunkError_AmbiguousPackedState ptrA ptrB
291+
292+ bothPackedAndUnpacked = ReadThunkError_UnrecognizedState "Both packed data and checkout present"
293+
294+ fold1WithM (x :| xs) f = foldM f x xs
295+
296+readThunkWith
297+ :: (MonadObelisk m)
298+ => NonEmpty (NonEmpty ThunkSpec) -> FilePath -> m (Either ReadThunkError ThunkData)
299+readThunkWith specTypes dir = do
300+ dirFiles <- Set.fromList <$> liftIO (listDirectory dir)
301+ let specs = concatMap toList $ toList $ NonEmpty.transpose specTypes -- Interleave spec types so we try each one in a "fair" ordering
302+ flip fix specs $ \loop -> \case
303+ [] -> pure $ Left ReadThunkError_UnrecognizedThunk
304+ spec:rest -> runExceptT (matchThunkSpecToDir spec dir dirFiles) >>= \case
305+ Left e -> putLog Debug [i|Thunk specification ${_thunkSpec_name spec} did not match ${dir}: ${e}|] *> loop rest
306+ x@(Right _) -> x <$ putLog Debug [i|Thunk specification ${_thunkSpec_name spec} matched ${dir}|]
254307
255308-- | Read a thunk and validate that it is exactly a packed thunk.
256309-- If additional data is present, fail.
257−readPackedThunk :: FilePath -> IO (Either ReadThunkError ThunkPtr)
258−readPackedThunk thunkDir = runExceptT $ do
259− thunkType <- ExceptT $ findThunkType thunkTypes thunkDir
260− -- Ensure that we recognize the thunk loader
261− loader <- liftIO $ T.readFile $ thunkDir </> _thunkType_loader thunkType
262− unless (loader `elem` _thunkType_loaderVersions thunkType) $ do
263− throwError $ ReadThunkError_UnrecognizedLoader loader
264−
265− txt <- liftIO $ LBS.readFile $ thunkDir </> _thunkType_json thunkType
266− case parseMaybe (_thunkType_parser thunkType) =<< Aeson.decode txt of
267− Nothing -> throwError $ ReadThunkError_UnparseablePtr txt
268− Just ptr -> return ptr
310+readThunk :: (MonadObelisk m) => FilePath -> m (Either ReadThunkError ThunkData)
311+readThunk = readThunkWith thunkSpecTypes
269312
270313parseThunkPtr :: (Aeson.Object -> Aeson.Parser ThunkSource) -> Aeson.Object -> Aeson.Parser ThunkPtr
271314parseThunkPtr parseSrc v = do
@@ -285,10 +328,12 @@ parseGitHubSource v = do
285328 owner <- v Aeson..: "owner"
286329 repo <- v Aeson..: "repo"
287330 branch <- v Aeson..:! "branch"
331+ private <- v Aeson..:? "private"
288332 pure $ GitHubSource
289333 { _gitHubSource_owner = owner
290334 , _gitHubSource_repo = repo
291335 , _gitHubSource_branch = branch
336+ , _gitHubSource_private = fromMaybe False private
292337 }
293338
294339parseGitSource :: Aeson.Object -> Aeson.Parser GitSource
@@ -296,25 +341,29 @@ parseGitSource v = do
296341 Just url <- parseGitUri <$> v Aeson..: "url"
297342 branch <- v Aeson..:! "branch"
298343 fetchSubmodules <- v Aeson..:! "fetchSubmodules"
344+ private <- v Aeson..:? "private"
299345 pure $ GitSource
300346 { _gitSource_url = url
301347 , _gitSource_branch = branch
302348 , _gitSource_fetchSubmodules = fromMaybe False fetchSubmodules
349+ , _gitSource_private = fromMaybe False private
303350 }
304351
305352overwriteThunk :: MonadObelisk m => FilePath -> ThunkPtr -> m ()
306353overwriteThunk target thunk = do
307354 -- Ensure that this directory is a valid thunk (i.e. so we aren't losing any data)
308− Right _ <- readThunk target
355+ readThunk target >>= \case
356+ Left e -> failWith [i|Invalid thunk at ${target}: ${e}|]
357+ Right _ -> pure ()
309358
310359 --TODO: Is there a safer way to do this overwriting?
311− liftIO $ removeDirectoryRecursive target
312− liftIO $ createThunk target thunk
360+ liftIO $ removePathForcibly target
361+ createThunk target $ Right thunk
313362
314−thunkPtrLoader :: ThunkPtr -> Text
315−thunkPtrLoader thunk = case _thunkPtr_source thunk of
316− ThunkSource_GitHub _ -> NonEmpty.head gitHubStandaloneLoaders
317− ThunkSource_Git _ -> NonEmpty.head plainGitStandaloneLoaders
363+thunkPtrToSpec :: ThunkPtr -> ThunkSpec
364+thunkPtrToSpec thunk = case _thunkPtr_source thunk of
365+ ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
366+ ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
318367
319368-- It's important that formatting be very consistent here, because
320369-- otherwise when people update thunks, their patches will be messy
@@ -326,14 +375,15 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
326375 , ("branch" .=) <$> _gitHubSource_branch s
327376 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
328377 , Just $ "sha256" .= _thunkRev_nixSha256 rev
378+ , Just $ "private" .= _gitHubSource_private s
329379 ]
330380 ThunkSource_Git s -> encodePretty' plainGitCfg $ Aeson.object $ catMaybes
331− --TODO: Is this safe? read/show is jank for `URI`
332− [ Just $ "url" .= show (_gitSource_url s)
381+ [ Just $ "url" .= gitUriToText (_gitSource_url s)
333382 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
334383 , ("branch" .=) <$> _gitSource_branch s
335384 , Just $ "sha256" .= _thunkRev_nixSha256 rev
336385 , Just $ "fetchSubmodules" .= _gitSource_fetchSubmodules s
386+ , Just $ "private" .= _gitSource_private s
337387 ]
338388 where
339389 githubCfg = defConfig
@@ -354,59 +404,84 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
354404 [ "url"
355405 , "rev"
356406 , "sha256"
407+ , "private"
357408 , "fetchSubmodules"
358409 ] <> compare
359410 , confTrailingNewline = True
360411 }
361412
362−createThunk :: MonadIO m => FilePath -> ThunkPtr -> m ()
363−createThunk target thunk = liftIO $ do
364− createDirectoryIfMissing True (target </> ".attr-cache")
365− T.writeFile (target </> "default.nix") (thunkPtrLoader thunk)
366− let
367− jsonFileName = case _thunkPtr_source thunk of
368− ThunkSource_GitHub _ -> "github"
369− ThunkSource_Git _ -> "git"
370− LBS.writeFile (target </> jsonFileName <.> "json") (encodeThunkPtrData thunk)
413+createThunk :: MonadObelisk m => FilePath -> Either ThunkSpec ThunkPtr -> m ()
414+createThunk target ptrInfo =
415+ ifor_ (_thunkSpec_files spec) $ \path -> \case
416+ ThunkFileSpec_FileMatches content -> withReadyPath path $ \p -> liftIO $ T.writeFile p content
417+ ThunkFileSpec_Ptr _ -> case ptrInfo of
418+ Left _ -> pure () -- We can't write the ptr without it
419+ Right ptr -> withReadyPath path $ \p -> liftIO $ LBS.writeFile p (encodeThunkPtrData ptr)
420+ _ -> pure ()
421+ where
422+ spec = either id thunkPtrToSpec ptrInfo
423+ withReadyPath path f = do
424+ let fullPath = target </> path
425+ putLog Debug $ "Writing thunk file " <> T.pack fullPath
426+ liftIO $ createDirectoryIfMissing True $ takeDirectory fullPath
427+ f fullPath
371428
372429createThunkWithLatest :: MonadObelisk m => FilePath -> ThunkSource -> m ()
373430createThunkWithLatest target s = do
374431 rev <- getLatestRev s
375− createThunk target $ ThunkPtr
432+ createThunk target $ Right $ ThunkPtr
376433 { _thunkPtr_source = s
377434 , _thunkPtr_rev = rev
378435 }
379436
380−updateThunkToLatest :: MonadObelisk m => FilePath -> m ()
381−updateThunkToLatest target = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest") $ do
382− (overwrite, ptr) <- readThunk target >>= \case
383− Left err -> failWith $ T.pack $ "thunk update: " <> show err
384− Right c -> case c of
385− ThunkData_Packed t -> return (target, t)
386− ThunkData_Checkout _ -> failWith "cannot update an unpacked thunk"
387− let src = _thunkPtr_source ptr
388− rev <- getLatestRev src
389− overwriteThunk overwrite $ ThunkPtr
390− { _thunkPtr_source = src
391− , _thunkPtr_rev = rev
392− }
437+updateThunkToLatest :: MonadObelisk m => ThunkUpdateConfig -> FilePath -> m ()
438+updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ do
439+ checkThunkDirectory target
440+ -- check to see if thunk should be updated to a specific branch or just update it's current branch
441+ case mBranch of
442+ Nothing -> do
443+ (overwrite, ptr) <- readThunk target >>= \case
444+ Left err -> failWith [i|Thunk update: ${err}|]
445+ Right c -> case c of
446+ ThunkData_Packed _ t -> return (target, t)
447+ ThunkData_Checkout -> failWith "cannot update an unpacked thunk"
448+ let src = _thunkPtr_source ptr
449+ rev <- getLatestRev src
450+ overwriteThunk overwrite $ modifyThunkPtrByConfig thunkConfig $ ThunkPtr
451+ { _thunkPtr_source = src
452+ , _thunkPtr_rev = rev
453+ }
454+ Just branch -> readThunk target >>= \case
455+ Left err -> failWith [i|Thunk update: ${err}|]
456+ Right c -> case c of
457+ ThunkData_Packed _ t -> setThunk thunkConfig target (thunkSourceToGitSource $ _thunkPtr_source t) branch
458+ ThunkData_Checkout -> failWith [i|Thunk located at ${target} is unpacked. Use 'ob thunk pack' on the desired directory and then try 'ob thunk update' again.|]
459+ where
460+ spinner = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest")
461+
462+setThunk :: MonadObelisk m => ThunkConfig -> FilePath -> GitSource -> String -> m ()
463+setThunk thunkConfig target gs branch = do
464+ newThunkPtr <- uriThunkPtr (_gitSource_url gs) (_thunkConfig_private thunkConfig) (Just $ T.pack branch) Nothing
465+ overwriteThunk target newThunkPtr
466+ updateThunkToLatest (ThunkUpdateConfig Nothing thunkConfig) target
393467
394468-- | All recognized github standalone loaders, ordered from newest to oldest.
395469-- This tool will only ever produce the newest one when it writes a thunk.
396−gitHubStandaloneLoaders :: NonEmpty Text
397−gitHubStandaloneLoaders =
398− gitHubStandaloneLoaderV2 :|
399− [ gitHubStandaloneLoaderV3
400− , gitHubStandaloneLoaderV1
470+gitHubThunkSpecs :: NonEmpty ThunkSpec
471+gitHubThunkSpecs =
472+ gitHubThunkSpecV5 :|
473+ [ gitHubThunkSpecV4
474+ , gitHubThunkSpecV3
475+ , gitHubThunkSpecV2
476+ , gitHubThunkSpecV1
401477 ]
402478
403−gitHubStandaloneLoaderV1 :: Text
404−gitHubStandaloneLoaderV1 = T.unlines
405− [ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
406− ]
479+gitHubThunkSpecV1 :: ThunkSpec
480+gitHubThunkSpecV1 = legacyGitHubThunkSpec "github-v1"
481+ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
407482
408−gitHubStandaloneLoaderV2 :: Text
409−gitHubStandaloneLoaderV2 = T.unlines
483+gitHubThunkSpecV2 :: ThunkSpec
484+gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
410485 [ "# DO NOT HAND-EDIT THIS FILE" --TODO: Add something about how to get more info on Obelisk, etc.
411486 , "import ((import <nixpkgs> {}).fetchFromGitHub ("
412487 , " let json = builtins.fromJSON (builtins.readFile ./github.json);"
@@ -416,8 +491,8 @@ gitHubStandaloneLoaderV2 = T.unlines
416491 , "))"
417492 ]
418493
419−gitHubStandaloneLoaderV3 :: Text
420−gitHubStandaloneLoaderV3 = T.unlines
494+gitHubThunkSpecV3 :: ThunkSpec
495+gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
421496 [ "# DO NOT HAND-EDIT THIS FILE"
422497 , "let"
423498 , " fetch = { private ? false, ... }@args: if private && builtins.hasAttr \"fetchGit\" builtins"
@@ -436,22 +511,62 @@ gitHubStandaloneLoaderV3 = T.unlines
436511 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
437512 ]
438513
439−plainGitStandaloneLoaders :: NonEmpty Text
440−plainGitStandaloneLoaders =
441− plainGitStandaloneLoaderV1 :|
442− [ plainGitStandaloneLoaderV2
514+gitHubThunkSpecV4 :: ThunkSpec
515+gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
516+ [ "# DO NOT HAND-EDIT THIS FILE"
517+ , "let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:"
518+ , " if !fetchSubmodules && !private then builtins.fetchTarball {"
519+ , " url = \"https://github.com/${owner}/${repo}/archive/${rev}.tar.gz\"; inherit sha256;"
520+ , " } else (import <nixpkgs> {}).fetchFromGitHub {"
521+ , " inherit owner repo rev sha256 fetchSubmodules private;"
522+ , " };"
523+ , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
443524 ]
444525
445−plainGitStandaloneLoaderV1 :: Text
446−plainGitStandaloneLoaderV1 = T.unlines
526+legacyGitHubThunkSpec :: Text -> Text -> ThunkSpec
527+legacyGitHubThunkSpec name loader = ThunkSpec name $ Map.fromList
528+ [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
529+ , ("github.json" , ThunkFileSpec_Ptr parseGitHubJsonBytes)
530+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
531+ , (".git", ThunkFileSpec_CheckoutIndicator)
532+ ]
533+
534+gitHubThunkSpecV5 :: ThunkSpec
535+gitHubThunkSpecV5 = mkThunkSpec "github-v5" "github.json" parseGitHubJsonBytes [here|
536+# DO NOT HAND-EDIT THIS FILE
537+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
538+ if !fetchSubmodules && !private then builtins.fetchTarball {
539+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
540+ } else (import <nixpkgs> {}).fetchFromGitHub {
541+ inherit owner repo rev sha256 fetchSubmodules private;
542+ };
543+ json = builtins.fromJSON (builtins.readFile ./github.json);
544+in fetch json
545+|]
546+
547+parseGitHubJsonBytes :: LBS.ByteString -> Either String ThunkPtr
548+parseGitHubJsonBytes = parseJsonObject $ parseThunkPtr $ \v ->
549+ ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
550+
551+gitThunkSpecs :: NonEmpty ThunkSpec
552+gitThunkSpecs =
553+ gitThunkSpecV5 :|
554+ [ gitThunkSpecV4
555+ , gitThunkSpecV3
556+ , gitThunkSpecV2
557+ , gitThunkSpecV1
558+ ]
559+
560+gitThunkSpecV1 :: ThunkSpec
561+gitThunkSpecV1 = legacyGitThunkSpec "git-v1" $ T.unlines
447562 [ "# DO NOT HAND-EDIT THIS FILE"
448563 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
449564 , " assert !fetchSubmodules; (import <nixpkgs> {}).fetchgit { inherit url rev sha256; };"
450565 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
451566 ]
452567
453−plainGitStandaloneLoaderV2 :: Text
454−plainGitStandaloneLoaderV2 = T.unlines
568+gitThunkSpecV2 :: ThunkSpec
569+gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
455570 [ "# DO NOT HAND-EDIT THIS FILE"
456571 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
457572 , " if builtins.hasAttr \"fetchGit\" builtins"
@@ -460,10 +575,87 @@ plainGitStandaloneLoaderV2 = T.unlines
460575 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
461576 ]
462577
463−thunkFileNames :: [FilePath]
464−thunkFileNames = ["default.nix", "github.json", "git.json"]
578+-- This loader has a bug because @builtins.fetchGit@ is not given a @ref@
579+-- and will fail to find commits without this because it does shallow clones.
580+gitThunkSpecV3 :: ThunkSpec
581+gitThunkSpecV3 = legacyGitThunkSpec "git-v3" $ T.unlines
582+ [ "# DO NOT HAND-EDIT THIS FILE"
583+ , "let fetch = {url, rev, ref ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
584+ , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
585+ , " if firstChar == \"/\" then /. + url"
586+ , " else if firstChar == \".\" then ./. + url"
587+ , " else url;"
588+ , " in if !fetchSubmodules && private then builtins.fetchGit {"
589+ , " url = realUrl; inherit rev;"
590+ , " } else (import <nixpkgs> {}).fetchgit {"
591+ , " url = realUrl; inherit rev sha256;"
592+ , " };"
593+ , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
594+ ]
465595
466−--TODO: when checking something out, make a shallow clone
596+gitThunkSpecV4 :: ThunkSpec
597+gitThunkSpecV4 = legacyGitThunkSpec "git-v4" $ T.unlines
598+ [ "# DO NOT HAND-EDIT THIS FILE"
599+ , "let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
600+ , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
601+ , " if firstChar == \"/\" then /. + url"
602+ , " else if firstChar == \".\" then ./. + url"
603+ , " else url;"
604+ , " in if !fetchSubmodules && private then builtins.fetchGit {"
605+ , " url = realUrl; inherit rev;"
606+ , " ${if branch == null then null else \"ref\"} = branch;"
607+ , " } else (import <nixpkgs> {}).fetchgit {"
608+ , " url = realUrl; inherit rev sha256;"
609+ , " };"
610+ , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
611+ ]
612+
613+legacyGitThunkSpec :: Text -> Text -> ThunkSpec
614+legacyGitThunkSpec name loader = ThunkSpec name $ Map.fromList
615+ [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
616+ , ("git.json" , ThunkFileSpec_Ptr parseGitJsonBytes)
617+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
618+ , (".git", ThunkFileSpec_CheckoutIndicator)
619+ ]
620+
621+gitThunkSpecV5 :: ThunkSpec
622+gitThunkSpecV5 = mkThunkSpec "git-v5" "git.json" parseGitJsonBytes [here|
623+# DO NOT HAND-EDIT THIS FILE
624+let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:
625+ let realUrl = let firstChar = builtins.substring 0 1 url; in
626+ if firstChar == "/" then /. + url
627+ else if firstChar == "." then ./. + url
628+ else url;
629+ in if !fetchSubmodules && private then builtins.fetchGit {
630+ url = realUrl; inherit rev;
631+ ${if branch == null then null else "ref"} = branch;
632+ } else (import <nixpkgs> {}).fetchgit {
633+ url = realUrl; inherit rev sha256;
634+ };
635+ json = builtins.fromJSON (builtins.readFile ./git.json);
636+in fetch json
637+|]
638+
639+parseGitJsonBytes :: LBS.ByteString -> Either String ThunkPtr
640+parseGitJsonBytes = parseJsonObject $ parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
641+
642+mkThunkSpec :: Text -> FilePath -> (LBS.ByteString -> Either String ThunkPtr) -> Text -> ThunkSpec
643+mkThunkSpec name jsonFileName parser srcNix = ThunkSpec name $ Map.fromList
644+ [ ("default.nix", ThunkFileSpec_FileMatches defaultNixViaSrc)
645+ , ("thunk.nix", ThunkFileSpec_FileMatches srcNix)
646+ , (jsonFileName, ThunkFileSpec_Ptr parser)
647+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
648+ , (normalise $ unpackedDirName </> ".git", ThunkFileSpec_CheckoutIndicator)
649+ ]
650+ where
651+ defaultNixViaSrc = [here|
652+# DO NOT HAND-EDIT THIS FILE
653+import (import ./thunk.nix)
654+|]
655+
656+
657+parseJsonObject :: (Aeson.Object -> Aeson.Parser a) -> LBS.ByteString -> Either String a
658+parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
467659
468660-- | Checks a cache directory to see if there is a fresh symlink
469661-- to the result of building an attribute of a thunk.
@@ -471,44 +663,49 @@ thunkFileNames = ["default.nix", "github.json", "git.json"]
471663-- and the result is symlinked into the cache.
472664nixBuildThunkAttrWithCache
473665 :: MonadObelisk m
474− => FilePath
666+ => ThunkSpec
667+ -> FilePath
475668 -- ^ Path to directory containing Thunk
476669 -> String
477670 -- ^ Attribute to build
478− -> m FilePath
671+ -> m (Maybe FilePath)
479672 -- ^ Symlink to cached or built nix output
480673-- WARNING: If the thunk uses an impure reference such as '<nixpkgs>'
481674-- the caching mechanism will fail as it merely measures the modification
482675-- time of the cache link and the expression to build.
483−nixBuildThunkAttrWithCache thunkDir attr = do
484− --NB: Expects thunkDir to be normalised with no trailing path separator.
485− --This should be guaranteed by the command argument parser.
486− let cacheErrHandler e
487− | isDoesNotExistError e = return Nothing -- expected from a cache miss
488− | otherwise = putLog Error (T.pack $ displayException e) >> return Nothing
489− cacheDir = thunkDir </> ".attr-cache"
490− cachePath = cacheDir </> attr <.> "out"
676+nixBuildThunkAttrWithCache thunkSpec thunkDir attr = do
491677 latestChange <- liftIO $ do
492− createDirectoryIfMissing False cacheDir
493− let getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
494− maximum . catMaybes <$> mapM (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
495− cacheHit <- handle cacheErrHandler $ do
496− cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
497− return $ if latestChange <= cacheTime
498− then Just cachePath
499− else Nothing
500− case cacheHit of
501− Just c -> return c
502− Nothing -> do
503− putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
504− _ <- nixBuild $ def
505− { _nixBuildConfig_target = Target
506− { _target_path = thunkDir
507− , _target_attr = Just attr
508− }
509− , _nixBuildConfig_outLink = OutLink_IndirectRoot cachePath
510− }
511− return cachePath
678+ let
679+ getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
680+ thunkFileNames = Map.keys $ _thunkSpec_files thunkSpec
681+ maximum . catMaybes <$> traverse (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
682+
683+ let cachePaths' = nonEmpty $ Map.keys $ Map.filter (\case ThunkFileSpec_AttrCache -> True; _ -> False) $
684+ _thunkSpec_files thunkSpec
685+ for cachePaths' $ \cachePaths ->
686+ fmap NonEmpty.head $ for cachePaths $ \cacheDir -> do
687+ let
688+ cachePath = thunkDir </> cacheDir </> attr <.> "out"
689+ cacheErrHandler e
690+ | isDoesNotExistError e = pure Nothing -- expected from a cache miss
691+ | otherwise = Nothing <$ putLog Error (T.pack $ displayException e)
692+ cacheHit <- handle cacheErrHandler $ do
693+ cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
694+ pure $ if latestChange <= cacheTime
695+ then Just cachePath
696+ else Nothing
697+ case cacheHit of
698+ Just c -> pure c
699+ Nothing -> do
700+ putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
701+ liftIO $ createDirectoryIfMissing True (takeDirectory cachePath)
702+ (cachePath <$) $ nixCmd $ NixCmd_Build $ def
703+ & nixBuildConfig_outLink .~ OutLink_IndirectRoot cachePath
704+ & nixCmdConfig_target .~ Target
705+ { _target_path = Just thunkDir
706+ , _target_attr = Just attr
707+ , _target_expr = Nothing
708+ }
512709
513710-- | Build a nix attribute, and cache the result if possible
514711nixBuildAttrWithCache
@@ -519,17 +716,19 @@ nixBuildAttrWithCache
519716 -- ^ Attribute to build
520717 -> m FilePath
521718 -- ^ Symlink to cached or built nix output
522−nixBuildAttrWithCache exprPath attr = do
523− readThunk exprPath >>= \case
524− -- Only packed thunks are cached. in particular, checkouts are not
525− Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
526− _ -> nixBuild $ def
527− { _nixBuildConfig_target = Target
528− { _target_path = exprPath
719+nixBuildAttrWithCache exprPath attr = readThunk exprPath >>= \case
720+ -- Only packed thunks are cached. In particular, checkouts are not.
721+ Right (ThunkData_Packed spec _) ->
722+ maybe build pure =<< nixBuildThunkAttrWithCache spec exprPath attr
723+ _ -> build
724+ where
725+ build = nixCmd $ NixCmd_Build $ def
726+ & nixBuildConfig_outLink .~ OutLink_None
727+ & nixCmdConfig_target .~ Target
728+ { _target_path = Just exprPath
529729 , _target_attr = Just attr
730+ , _target_expr = Nothing
530731 }
531− , _nixBuildConfig_outLink = OutLink_None
532− }
533732
534733-- | Safely update thunk using a custom action
535734--
@@ -546,116 +745,184 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
546745 where
547746 copyThunkToTmp tmpDir thunkDir = readThunk thunkDir >>= \case
548747 Left err -> failWith $ "withThunkUnpacked: " <> T.pack (show err)
549− Right (ThunkData_Packed _) -> do
748+ Right ThunkData_Packed{} -> do
550749 let tmpThunk = tmpDir </> "thunk"
551750 callProcessAndLogOutput (Notice, Error) $
552− proc "cp" ["-r", "-T", thunkDir, tmpThunk]
751+ proc cp ["-r", "-T", thunkDir, tmpThunk]
553752 return tmpThunk
554− Right _ -> failWith $ "Thunk is not packed"
753+ Right _ -> failWith "Thunk is not packed"
555754 updateThunkFromTmp p' = do
556− packThunk' True p'
755+ _ <- packThunk' True (ThunkPackConfig False (ThunkConfig Nothing)) p'
557756 callProcessAndLogOutput (Notice, Error) $
558− proc "cp" ["-r", "-T", p', p]
757+ proc cp ["-r", "-T", p', p]
559758
560759finalMsg :: Bool -> (a -> Text) -> Maybe (a -> Text)
561760finalMsg noTrail s = if noTrail then Nothing else Just s
562761
762+-- | Check that we are not somewhere inside the thunk directory
763+checkThunkDirectory :: MonadObelisk m => FilePath -> m ()
764+checkThunkDirectory thunkDir = do
765+ currentDir <- liftIO getCurrentDirectory
766+ thunkDir' <- liftIO $ canonicalizePath thunkDir
767+ when (thunkDir' `L.isInfixOf` currentDir) $
768+ failWith [i|Can't perform thunk operations from within the thunk directory: ${thunkDir}|]
769+
770+ -- Don't let thunk commands work when directly given an unpacked repo
771+ when (takeFileName thunkDir == unpackedDirName) $
772+ readThunk (takeDirectory thunkDir) >>= \case
773+ Right _ -> failWith [i|Refusing to perform thunk operation on ${thunkDir} because it is a thunk's unpacked source|]
774+ Left _ -> pure ()
775+
563776unpackThunk :: MonadObelisk m => FilePath -> m ()
564777unpackThunk = unpackThunk' False
565778
566779unpackThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
567−unpackThunk' noTrail thunkDir = readThunk thunkDir >>= \case
568− Left err -> failWith $ "thunk unpack: " <> T.pack (show err)
780+unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
781+ Left err -> failWith [i|Invalid thunk at ${thunkDir}: ${err}|]
569782 --TODO: Overwrite option that rechecks out thunk; force option to do so even if working directory is dirty
570− Right (ThunkData_Checkout _) -> failWith "thunk unpack: thunk is already unpacked"
571− Right (ThunkData_Packed tptr) -> do
783+ Right ThunkData_Checkout -> failWith [i|Thunk at ${thunkDir} is already unpacked|]
784+ Right (ThunkData_Packed _ tptr) -> do
572785 let (thunkParent, thunkName) = splitFileName thunkDir
573− withTempDirectory thunkParent thunkName $ \tmpRepo -> do
574− let obGitDir = tmpRepo </> ".git" </> "obelisk"
575− s = case _thunkPtr_source tptr of
576− ThunkSource_GitHub s' -> forgetGithub s'
577− ThunkSource_Git s' -> s'
578− withSpinner' ("Fetching thunk " <> T.pack thunkName)
579− (finalMsg noTrail $ const $ "Fetched thunk " <> T.pack thunkName) $ do
580− let git = callProcessAndLogOutput (Notice, Notice) . gitProc tmpRepo
581− git ["clone", if _gitSource_fetchSubmodules s then "--recursive" else "", show (_gitSource_url s)]
582− git ["reset", "--hard", Ref.toHexString $ _thunkRev_commit $ _thunkPtr_rev tptr]
583− when (_gitSource_fetchSubmodules s) $
584− git ["submodule", "update", "--recursive", "--init"]
585− case _gitSource_branch s of
586− Just b -> git ["branch", "-u", "origin/" <> T.unpack (untagName $ b)]
587− Nothing -> pure ()
588−
589− liftIO $ createDirectory obGitDir
590− callProcessAndLogOutput (Notice, Error) $
591− proc "cp" ["-r", "-T", thunkDir </> ".", obGitDir </> "orig-thunk"]
592− callProcessAndLogOutput (Notice, Error) $
593− proc "rm" ["-r", thunkDir]
594− callProcessAndLogOutput (Notice, Error) $
595− proc "mv" ["-T", tmpRepo, thunkDir]
596−
597−--TODO: add force mode to pack even if changes are present
786+ withTempDirectory thunkParent thunkName $ \tmpThunk -> do
787+ let
788+ gitSrc = thunkSourceToGitSource $ _thunkPtr_source tptr
789+ newSpec = case _thunkPtr_source tptr of
790+ ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
791+ ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
792+ withSpinner' ("Fetching thunk " <> T.pack thunkName)
793+ (finalMsg noTrail $ const $ "Fetched thunk " <> T.pack thunkName) $ do
794+ let unpackedPath = tmpThunk </> unpackedDirName
795+ gitCloneForThunkUnpack gitSrc (_thunkRev_commit $ _thunkPtr_rev tptr) unpackedPath
796+
797+ let normalizeMore = dropTrailingPathSeparator . normalise
798+ when (normalizeMore unpackedPath /= normalizeMore tmpThunk) $ -- Only write meta data if the checkout is not inplace
799+ createThunk tmpThunk $ Left newSpec
800+
801+ liftIO $ do
802+ removePathForcibly thunkDir
803+ renameDirectory tmpThunk thunkDir
804+
805+gitCloneForThunkUnpack
806+ :: MonadObelisk m
807+ => GitSource -- ^ Git source to use
808+ -> Ref hash -- ^ Commit hash to reset to
809+ -> FilePath -- ^ Directory to clone into
810+ -> m ()
811+gitCloneForThunkUnpack gitSrc commit dir = do
812+ let git = callProcessAndLogOutput (Notice, Notice) . gitProc dir
813+ git $ [ "clone" ]
814+ ++ ["--recursive" | _gitSource_fetchSubmodules gitSrc]
815+ ++ [ T.unpack $ gitUriToText $ _gitSource_url gitSrc ]
816+ ++ do branch <- maybeToList $ _gitSource_branch gitSrc
817+ [ "--branch", T.unpack $ untagName branch ]
818+ git ["reset", "--hard", Ref.toHexString commit]
819+ when (_gitSource_fetchSubmodules gitSrc) $
820+ git ["submodule", "update", "--recursive", "--init"]
821+
598822--TODO: add a rollback mode to pack to the original thunk
599−packThunk :: MonadObelisk m => FilePath -> m ()
823+packThunk :: MonadObelisk m => ThunkPackConfig -> FilePath -> m ThunkPtr
600824packThunk = packThunk' False
601825
602−packThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
603−packThunk' noTrail thunkDir = readThunk thunkDir >>= \case
604− Left err -> failWith $ T.pack $ "thunk pack: " <> show err
605− Right (ThunkData_Packed _) -> failWith "pack: thunk is already packed"
606− Right (ThunkData_Checkout _) -> do
607− withSpinner' ("Packing thunk " <> T.pack thunkDir)
608− (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $ do
609− thunkPtr <- getThunkPtr thunkDir
610− callProcessAndLogOutput (Debug, Error) $ proc "rm" ["-rf", thunkDir]
611− liftIO $ createThunk thunkDir thunkPtr
612−
613−getThunkPtr :: MonadObelisk m => FilePath -> m ThunkPtr
614−getThunkPtr = getThunkPtr' True
615−
616−getThunkPtr' :: forall m. MonadObelisk m => Bool -> FilePath -> m ThunkPtr
617−getThunkPtr' checkClean thunkDir = do
618− when checkClean $ ensureCleanGitRepo thunkDir True $
826+packThunk' :: MonadObelisk m => Bool -> ThunkPackConfig -> FilePath -> m ThunkPtr
827+packThunk' noTrail (ThunkPackConfig force thunkConfig) thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
828+ Right ThunkData_Packed{} -> failWith [i|Thunk at ${thunkDir} is is already packed|]
829+ _ -> withSpinner'
830+ ("Packing thunk " <> T.pack thunkDir)
831+ (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $
832+ do
833+ let checkClean = if force then CheckClean_NoCheck else CheckClean_FullCheck
834+ thunkPtr <- modifyThunkPtrByConfig thunkConfig <$> getThunkPtr checkClean thunkDir (_thunkConfig_private thunkConfig)
835+ liftIO $ removePathForcibly thunkDir
836+ createThunk thunkDir $ Right thunkPtr
837+ pure thunkPtr
838+
839+modifyThunkPtrByConfig :: ThunkConfig -> ThunkPtr -> ThunkPtr
840+modifyThunkPtrByConfig (ThunkConfig markPrivate') ptr = case markPrivate' of
841+ Nothing -> ptr
842+ Just markPrivate -> ptr { _thunkPtr_source = case _thunkPtr_source ptr of
843+ ThunkSource_Git s -> ThunkSource_Git $ s { _gitSource_private = markPrivate }
844+ ThunkSource_GitHub s -> ThunkSource_GitHub $ s { _gitHubSource_private = markPrivate }
845+ }
846+
847+data CheckClean
848+ = CheckClean_FullCheck
849+ -- ^ Check that the repo is clean, including .gitignored files
850+ | CheckClean_NotIgnored
851+ -- ^ Check that the repo is clean, not including .gitignored files
852+ | CheckClean_NoCheck
853+ -- ^ Don't check that the repo is clean
854+
855+getThunkPtr :: forall m. MonadObelisk m => CheckClean -> FilePath -> Maybe Bool -> m ThunkPtr
856+getThunkPtr gitCheckClean dir mPrivate = do
857+ let repoLocations = nubOrd $ map (first normalise)
858+ [(".git", "."), (unpackedDirName </> ".git", unpackedDirName)]
859+ repoLocation' <- liftIO $ flip findM repoLocations $ doesDirectoryExist . (dir </>) . fst
860+ thunkDir <- case repoLocation' of
861+ Nothing -> failWith [i|Can't find an unpacked thunk in ${dir}|]
862+ Just (_, path) -> pure $ normalise $ dir </> path
863+
864+ let (checkClean, checkIgnored) = case gitCheckClean of
865+ CheckClean_FullCheck -> (True, True)
866+ CheckClean_NotIgnored -> (True, False)
867+ CheckClean_NoCheck -> (False, False)
868+ when checkClean $ ensureCleanGitRepo thunkDir checkIgnored
619869 "thunk pack: thunk checkout contains unsaved modifications"
620870
621871 -- Check whether there are any stashes
622− stashOutput <- readGitProcess thunkDir ["stash", "list"]
623− when checkClean $ case T.null stashOutput of
624− False -> do
872+ when checkClean $ do
873+ stashOutput <- readGitProcess thunkDir ["stash", "list"]
874+ unless (T.null stashOutput) $
625875 failWith $ T.unlines $
626876 [ "thunk pack: thunk checkout has stashes"
627877 , "git stash list:"
628878 ] ++ T.lines stashOutput
629− True -> return ()
879+
880+ -- Get current branch
881+ (mCurrentBranch, mCurrentCommit) <- do
882+ b <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
883+ c <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "HEAD"]
884+ case b of
885+ (Just "HEAD") -> failWith $ T.unlines
886+ [ "thunk pack: You are in 'detached HEAD' state."
887+ , "If you want to pack at the current ref \
888+ \then please create a new branch with 'git checkout -b <new-branch-name>' and push this upstream."
889+ ]
890+ _ -> return (b, c)
630891
631892 -- Get information on all branches and their (optional) designated upstream
632893 -- correspondents
633− (headDump :: [Text]) <- T.lines <$> readGitProcess thunkDir
894+ headDump :: [Text] <- T.lines <$> readGitProcess thunkDir
634895 [ "for-each-ref"
635− , "--format=%(refname:short) %(upstream:short)"
896+ , "--format=%(refname:short) %(upstream:short) %(upstream:remotename)"
636897 , "refs/heads/"
637898 ]
638− (headInfo :: Map Text (Maybe Text)) <- fmap Map.fromList $ forM headDump $ \line -> do
639− (branch : restOfLine) <- pure $ T.words line
640− mUpstream <- case restOfLine of
641− [] -> pure Nothing
642− [u] -> pure $ Just u
643− (_:_) -> failWith "git for-each-ref invalid output"
644− pure (branch, mUpstream)
899+
900+ (headInfo :: Map Text (Maybe (Text, Text)))
901+ <- fmap Map.fromList $ forM headDump $ \line -> do
902+ (branch : restOfLine) <- pure $ T.words line
903+ mUpstream <- case restOfLine of
904+ [] -> pure Nothing
905+ [u, r] -> pure $ Just (u, r)
906+ (_:_) -> failWith "git for-each-ref invalid output"
907+ pure (branch, mUpstream)
908+
909+ putLog Debug $ "branches: " <> T.pack (show headInfo)
645910
646911 let errorMap :: Map Text ()
647− headUpstream :: Map Text Text
912+ headUpstream :: Map Text (Text, Text)
648913 (errorMap, headUpstream) = flip Map.mapEither headInfo $ \case
649914 Nothing -> Left ()
650915 Just b -> Right b
651916
917+ putLog Debug $ "branches with upstream branch set: " <> T.pack (show headUpstream)
918+
652919 -- Check that every branch has a remote equivalent
653920 when checkClean $ do
654921 let untrackedBranches = Map.keys errorMap
655922 when (not $ L.null untrackedBranches) $ failWith $ T.unlines $
656923 [ "thunk pack: Certain branches in the thunk have no upstream branch \
657− \ set. This means don't know to check whether all your work is \
658− \ saved. The offending branches are:"
924+ \set. This means we don't know to check whether all your work is \
925+ \saved. The offending branches are:"
659926 , ""
660927 , T.unwords untrackedBranches
661928 , ""
@@ -665,12 +932,12 @@ getThunkPtr' checkClean thunkDir = do
665932 ((\branch -> "git push -u origin " <> branch) <$> untrackedBranches) ++
666933 [ ""
667934 , "These will push the branches to the default remote under the same \
668− \ name, and (thanks to the `-u`) remember that choice so you don't \
669− \ get this error again."
935+ \name, and (thanks to the `-u`) remember that choice so you don't \
936+ \get this error again."
670937 ]
671938
672939 -- loosely by https://stackoverflow.com/questions/7773939/show-git-ahead-and-behind-info-for-all-branches-including-remotes
673− stats <- iforM headUpstream $ \branch upstream -> do
940+ stats <- ifor headUpstream $ \branch (upstream, _remote) -> do
674941 (stat :: [Text]) <- T.lines <$> readGitProcess thunkDir
675942 [ "rev-list", "--left-right"
676943 , T.unpack branch <> "..." <> T.unpack upstream
@@ -687,21 +954,18 @@ getThunkPtr' checkClean thunkDir = do
687954 [ "thunk pack: Certain branches in the thunk have commits not yet pushed upstream:"
688955 , ""
689956 ] ++
690− (flip map (Map.toList nonGood) $ \(branch, (upstream, (ahead, behind))) -> mconcat
957+ flip map (Map.toList nonGood) (\(branch, (upstream, (ahead, behind))) -> mconcat
691958 [" ", branch, " ahead: ", T.pack (show ahead), " behind: ", T.pack (show behind), " remote branch ", upstream]) ++
692959 [ ""
693− , "Please push these upstream and try again."
960+ , "Please push these upstream and try again. (Or just fetch, if they are somehow \
961+ \pushed but this repo's remote tracking branches don't know it.)"
694962 ]
695963
696− -- We assume it's safe to pack the thunk at this point
697−
698− -- Get current branch `git rev-parse --abbrev-ref HEAD`
699− mCurrentBranch <- listToMaybe
700− <$> T.lines
701− <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
964+ when checkClean $ do
965+ -- We assume it's safe to pack the thunk at this point
966+ putLog Informational "All changes safe in git remotes. OK to pack thunk."
702967
703− let remote = maybe "origin" id $
704− flip Map.lookup headUpstream =<< mCurrentBranch
968+ let remote = maybe "origin" snd $ flip Map.lookup headUpstream =<< mCurrentBranch
705969
706970 [remoteUri'] <- fmap T.lines $ readGitProcess thunkDir
707971 [ "config"
@@ -712,60 +976,111 @@ getThunkPtr' checkClean thunkDir = do
712976 remoteUri <- case parseGitUri remoteUri' of
713977 Nothing -> failWith $ "Could not identify git remote: " <> remoteUri'
714978 Just uri -> pure uri
715− uriThunkPtr remoteUri mCurrentBranch
979+ uriThunkPtr remoteUri mPrivate mCurrentBranch mCurrentCommit
716980
717981-- | Get the latest revision available from the given source
718982getLatestRev :: MonadObelisk m => ThunkSource -> m ThunkRev
719983getLatestRev os = do
720− let gitS = case os of
721− ThunkSource_GitHub s -> forgetGithub s
722− ThunkSource_Git s -> s
984+ let gitS = thunkSourceToGitSource os
723985 (_, commit) <- gitGetCommitBranch (_gitSource_url gitS) (untagName <$> _gitSource_branch gitS)
724986 case os of
725987 ThunkSource_GitHub s -> githubThunkRev s commit
726988 ThunkSource_Git s -> gitThunkRev s commit
727989
728−uriThunkPtr :: MonadObelisk m => URI -> Maybe Text -> m ThunkPtr
729−uriThunkPtr uri mbranch = do
730− (_, commit) <- gitGetCommitBranch uri mbranch
731− let src = uriToThunkSource uri mbranch
732− rev <- case src of
733− ThunkSource_GitHub s -> githubThunkRev s commit
734− ThunkSource_Git s -> gitThunkRev s commit
990+-- | Convert a URI to a thunk
991+--
992+-- If the URL is a github URL, we try to just download an archive for
993+-- performance. If that doesn't work (e.g. authentication issue), we fall back
994+-- on just doing things the normal way for git repos in general, and save it as
995+-- a regular git thunk.
996+uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> Maybe Text -> m ThunkPtr
997+uriThunkPtr uri mPrivate mbranch mcommit = do
998+ commit <- case mcommit of
999+ Nothing -> gitGetCommitBranch uri mbranch >>= return . snd
1000+ (Just c) -> return c
1001+ (src, rev) <- uriToThunkSource uri mPrivate mbranch >>= \case
1002+ ThunkSource_GitHub s -> do
1003+ rev <- runExceptT $ githubThunkRev s commit
1004+ case rev of
1005+ Right r -> pure (ThunkSource_GitHub s, r)
1006+ Left e -> do
1007+ putLog Warning "\
1008+\Failed to fetch archive from GitHub. This is probably a private repo. \
1009+\Falling back on normal fetchgit. Original failure:"
1010+ errorToWarning e
1011+ let s' = forgetGithub True s
1012+ (,) (ThunkSource_Git s') <$> gitThunkRev s' commit
1013+ ThunkSource_Git s -> (,) (ThunkSource_Git s) <$> gitThunkRev s commit
7351014 pure $ ThunkPtr
7361015 { _thunkPtr_rev = rev
7371016 , _thunkPtr_source = src
7381017 }
7391018
7401019-- | N.B. Cannot infer all fields.
741−uriToThunkSource :: URI -> Maybe Text -> ThunkSource
742−uriToThunkSource u
743− | Right uriAuth <- uriAuthority u
744− , Just scheme <- unRText <$> uriScheme u
1020+--
1021+-- If the thunk is a GitHub thunk and fails, we do *not* fall back like with
1022+-- `uriThunkPtr`. Unlike a plain URL, a thunk src explicitly states which method
1023+-- should be employed, and so we respect that.
1024+uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> m ThunkSource
1025+uriToThunkSource (GitUri u) mPrivate
1026+ | Right uriAuth <- URI.uriAuthority u
1027+ , Just scheme <- URI.unRText <$> URI.uriScheme u
7451028 , case scheme of
746− "ssh" -> uriAuth == Authority
747− { authUserInfo = Just $ UserInfo (fromRight' $ mkUsername "git") Nothing
748− , authHost = fromRight' $ mkHost "github.com"
749− , authPort = Nothing
1029+ "ssh" -> uriAuth == URI.Authority
1030+ { URI.authUserInfo = Just $ URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
1031+ , URI.authHost = fromRight' $ URI.mkHost "github.com"
1032+ , URI.authPort = Nothing
7501033 }
7511034 s -> s `L.elem` [ "git", "https", "http" ] -- "http:" just redirects to "https:"
752− && unRText (authHost uriAuth) == "github.com"
753− , Just (_, owner :| [repoish]) <- uriPath u
754− = \mbranch -> ThunkSource_GitHub $ GitHubSource
755− { _gitHubSource_owner = N $ unRText owner
756− , _gitHubSource_repo = N $ let
757− repoish' = unRText repoish
758− in case T.stripSuffix ".git" repoish' of
759− Just repo -> repo
760− Nothing -> repoish'
761− , _gitHubSource_branch = N <$> mbranch
762− }
1035+ && URI.unRText (URI.authHost uriAuth) == "github.com"
1036+ , Just (_, owner :| [repoish]) <- URI.uriPath u
1037+ = \mbranch -> do
1038+ isPrivate <- getIsPrivate
1039+ pure $ ThunkSource_GitHub $ GitHubSource
1040+ { _gitHubSource_owner = N $ URI.unRText owner
1041+ , _gitHubSource_repo = N $ let
1042+ repoish' = URI.unRText repoish
1043+ in fromMaybe repoish' $ T.stripSuffix ".git" repoish'
1044+ , _gitHubSource_branch = N <$> mbranch
1045+ , _gitHubSource_private = isPrivate
1046+ }
7631047
764− | otherwise = \mbranch -> ThunkSource_Git $ GitSource
765− { _gitSource_url = u
766− , _gitSource_branch = N <$> mbranch
767− , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
768− }
1048+ | otherwise = \mbranch -> do
1049+ isPrivate <- getIsPrivate
1050+ pure $ ThunkSource_Git $ GitSource
1051+ { _gitSource_url = GitUri u
1052+ , _gitSource_branch = N <$> mbranch
1053+ , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
1054+ , _gitSource_private = isPrivate
1055+ }
1056+ where
1057+ getIsPrivate = maybe (guessGitRepoIsPrivate $ GitUri u) pure mPrivate
1058+
1059+guessGitRepoIsPrivate :: MonadObelisk m => GitUri -> m Bool
1060+guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
1061+ [] -> pure True
1062+ uriAttempt:xs -> do
1063+ result <- readCreateProcessWithExitCode $
1064+ isolateGitProc $
1065+ gitProcNoRepo
1066+ [ "ls-remote"
1067+ , "--quiet"
1068+ , "--exit-code"
1069+ , "--symref"
1070+ , T.unpack $ gitUriToText uriAttempt
1071+ ]
1072+ case result of
1073+ (ExitSuccess, _, _) -> pure False -- Must be a public repo
1074+ _ -> loop xs
1075+ where
1076+ urisToTry = nubOrd $
1077+ -- Include the original URI if it isn't using SSH because SSH will certainly fail.
1078+ [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>
1079+ [changeScheme "https" uri, changeScheme "http" uri]
1080+ changeScheme scheme (GitUri u) = GitUri $ u
1081+ { URI.uriScheme = URI.mkScheme scheme
1082+ , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u
1083+ }
7691084
7701085-- Funny signature indicates no effects depend on the optional branch name.
7711086githubThunkRev
@@ -777,19 +1092,19 @@ githubThunkRev
7771092githubThunkRev s commit = do
7781093 owner <- forcePP $ _gitHubSource_owner s
7791094 repo <- forcePP $ _gitHubSource_repo s
780− revTarball <- mkPathPiece $ commit <> ".tar.gz"
781− let archiveUri = URI
782− { uriScheme = Just $ fromRight' $ mkScheme "https"
783− , uriAuthority = Right $ Authority
784− { authUserInfo = Nothing
785− , authHost = fromRight' $ mkHost "github.com"
786− , authPort = Nothing
1095+ revTarball <- URI.mkPathPiece $ commit <> ".tar.gz"
1096+ let archiveUri = GitUri $ URI.URI
1097+ { URI.uriScheme = Just $ fromRight' $ URI.mkScheme "https"
1098+ , URI.uriAuthority = Right $ URI.Authority
1099+ { URI.authUserInfo = Nothing
1100+ , URI.authHost = fromRight' $ URI.mkHost "github.com"
1101+ , URI.authPort = Nothing
7871102 }
788− , uriPath = Just ( False
789− , owner :| [ repo, fromRight' $ mkPathPiece "archive", revTarball ]
1103+ , URI.uriPath = Just ( False
1104+ , owner :| [ repo, fromRight' $ URI.mkPathPiece "archive", revTarball ]
7901105 )
791− , uriQuery = []
792− , uriFragment = Nothing
1106+ , URI.uriQuery = []
1107+ , URI.uriFragment = Nothing
7931108 }
7941109 hash <- getNixSha256ForUriUnpacked archiveUri
7951110 putLog Debug $ "Nix sha256 is " <> hash
@@ -798,8 +1113,8 @@ githubThunkRev s commit = do
7981113 , _thunkRev_nixSha256 = hash
7991114 }
8001115 where
801− forcePP :: Name entity -> m (RText 'PathPiece)
802− forcePP = mkPathPiece . untagName
1116+ forcePP :: Name entity -> m (URI.RText 'URI.PathPiece)
1117+ forcePP = URI.mkPathPiece . untagName
8031118
8041119gitThunkRev
8051120 :: MonadObelisk m
@@ -808,13 +1123,13 @@ gitThunkRev
8081123 -> m ThunkRev
8091124gitThunkRev s commit = do
8101125 let u = _gitSource_url s
811− protocols = ["https", "ssh", "git"]
812− Just scheme <- pure $ unRText <$> uriScheme u
1126+ protocols = ["file", "https", "ssh", "git"]
1127+ scheme = maybe "file" URI.unRText $ URI.uriScheme $ (\(GitUri x) -> x) u
8131128 unless (T.toLower scheme `elem` protocols) $
8141129 failWith $ "obelisk currently only supports "
815− <> T.intercalate ", " protocols <> " protocols for non-GitHub remotes"
1130+ <> T.intercalate ", " protocols <> " protocols for plain Git remotes"
8161131 hash <- nixPrefetchGit u commit $ _gitSource_fetchSubmodules s
817− putLog Debug $ "Nix sha256 is " <> hash
1132+ putLog Informational $ "Nix sha256 is " <> hash
8181133 pure $ ThunkRev
8191134 { _thunkRev_commit = commitNameToRef (N commit)
8201135 , _thunkRev_nixSha256 = hash
@@ -825,10 +1140,14 @@ gitThunkRev s commit = do
8251140--
8261141-- If the branch name is passed in, it is returned exactly as-is. If it is not
8271142-- passed it, the default branch of the repo is used instead.
1143+
8281144gitGetCommitBranch
829− :: MonadObelisk m => URI -> Maybe Text -> m (Text, CommitId)
1145+ :: MonadObelisk m => GitUri -> Maybe Text -> m (Text, CommitId)
8301146gitGetCommitBranch uri mbranch = withExitFailMessage ("Failure for git remote " <> uriMsg) $ do
831− bothMaps <- rethrowE =<< liftIO (gitLsRemote (show uri) (GitRef_Branch <$> mbranch))
1147+ (_, bothMaps) <- gitLsRemote
1148+ (T.unpack $ gitUriToText uri)
1149+ (GitRef_Branch <$> mbranch)
1150+ Nothing
8321151 branch <- case mbranch of
8331152 Nothing -> withExitFailMessage "Failed to find default branch" $ do
8341153 b <- rethrowE $ gitLookupDefaultBranch bothMaps
@@ -836,18 +1155,27 @@ gitGetCommitBranch uri mbranch = withExitFailMessage ("Failure for git remote "
8361155 pure b
8371156 Just b -> pure b
8381157 commit <- rethrowE $ gitLookupCommitForRef bothMaps (GitRef_Branch branch)
839− putLog Debug $ "Latest commit in branch " <> branch
1158+ putLog Informational $ "Latest commit in branch " <> branch
8401159 <> " from remote repo " <> uriMsg
8411160 <> " is " <> commit
8421161 pure (branch, commit)
8431162 where
8441163 rethrowE = either failWith pure
845− uriMsg = T.pack $ show uri
1164+ uriMsg = gitUriToText uri
1165+
1166+parseGitUri :: Text -> Maybe GitUri
1167+parseGitUri x = GitUri <$> (parseFileURI x <|> parseAbsoluteURI x <|> parseSshShorthand x)
1168+
1169+parseFileURI :: Text -> Maybe URI.URI
1170+parseFileURI uri = if "/" `T.isPrefixOf` uri then parseAbsoluteURI ("file://" <> uri) else Nothing
8461171
847−parseGitUri :: Text -> Maybe URI
848−parseGitUri x = mkURI x <|> parseSshShorthand x
1172+parseAbsoluteURI :: Text -> Maybe URI.URI
1173+parseAbsoluteURI uri = do
1174+ parsedUri <- URI.mkURI uri
1175+ guard $ URI.isPathAbsolute parsedUri
1176+ pure parsedUri
8491177
850−parseSshShorthand :: Text -> Maybe URI
1178+parseSshShorthand :: Text -> Maybe URI.URI
8511179parseSshShorthand uri = do
8521180 -- This is what git does to check that the remote
8531181 -- is not a local file path when parsing shorthand.
@@ -860,4 +1188,4 @@ parseSshShorthand uri = do
8601188 -- This check is used to disambiguate a filepath containing a colon from shorthand
8611189 guard $ isNothing (T.findIndex (=='/') authAndHostname)
8621190 && not (T.null colonAndPath)
863− mkURI properUri
1191+ URI.mkURI properUri