Enable overriding S3 endpoint with AWS_S3_ENDPOINT

This commit is contained in:
Bryan Richter 2023-12-22 18:49:15 +02:00
parent 6331131b68
commit a4cacd6991
No known key found for this signature in database
GPG Key ID: B202264020068BFB

View File

@ -59,6 +59,7 @@ import Stackage.Database.PackageInfo
import Stackage.Database.Query import Stackage.Database.Query
import Stackage.Database.Schema import Stackage.Database.Schema
import Stackage.Database.Types import Stackage.Database.Types
import System.Environment (getEnvironment)
import UnliftIO.Concurrent (getNumCapabilities) import UnliftIO.Concurrent (getNumCapabilities)
import Web.PathPieces (fromPathPiece, toPathPiece) import Web.PathPieces (fromPathPiece, toPathPiece)
import qualified Control.Retry as Retry import qualified Control.Retry as Retry
@ -163,7 +164,12 @@ stackageServerCron StackageCronOptions {..} = do
cabalMutable <- newIORef Map.empty cabalMutable <- newIORef Map.empty
gpdCache <- newIORef IntMap.empty gpdCache <- newIORef IntMap.empty
defaultProcessContext <- mkDefaultProcessContext defaultProcessContext <- mkDefaultProcessContext
aws <- newEnv Discover aws <- do
aws' <- newEnv Discover
endpoint <- lookup "AWS_S3_ENDPOINT" <$> getEnvironment
pure $ case endpoint of
Nothing -> aws'
Just ep -> configure (setEndpoint True (BS8.pack ep) 443 s3) aws'
withLogFunc (setLogMinLevel scoLogLevel lo) $ \logFunc -> do withLogFunc (setLogMinLevel scoLogLevel lo) $ \logFunc -> do
let pantryConfig = let pantryConfig =
PantryConfig PantryConfig