Remove uploader cache

Author: Kleidukos

src/Distribution/Server/Features/PackageInfoJSON.hs

@@ -59,8 +59,6 @@ import qualified Data.List as List
 import Data.Time (UTCTime)
 import Distribution.Server.Users.Types (UserName (..), UserInfo(..))
 import Distribution.Server.Features.Users (UserFeature(lookupUserInfo))
-import Data.Map (Map)
-import qualified Data.Map as Map
 
 
 data PackageInfoJSONFeature = PackageInfoJSONFeature {
@@ -97,18 +95,17 @@ initPackageInfoJSONFeature env = do
                \and the values are whether the version is preferred or not"
         vInfo = "Get basic package information at a specific metadata revision"
 
-        uploaderCache = undefined
         jsonResources = [
           (Framework.extendResource (corePackagePage coreR)) {
                 Framework.resourceDesc = [(Framework.GET, info)]
               , Framework.resourceGet  =
-                  [("json", servePackageBasicDescription coreR uploaderCache userFeature
+                  [("json", servePackageBasicDescription coreR userFeature
                             preferred packageInfoState)]
               }
           , (Framework.extendResource (coreCabalFileRev coreR)) {
                 Framework.resourceDesc = [(Framework.GET, vInfo)]
               , Framework.resourceGet  =
-                  [("json", servePackageBasicDescription coreR uploaderCache userFeature
+                  [("json", servePackageBasicDescription coreR userFeature
                      preferred packageInfoState)]
               }
           ]
@@ -202,14 +199,13 @@ dtoToBasicDescription dto =
 --   A listing of versions and their deprecation states
 servePackageBasicDescription
   :: CoreResource
-  -> Map PackageIdentifier UserName
   -> UserFeature
   -> Preferred.VersionsFeature
   -> Framework.StateComponent Framework.AcidState PackageInfoState
   -> Framework.DynamicPath
      -- ^ URI specifying a package and version `e.g. lens or lens-4.11`
   -> Framework.ServerPartE Framework.Response
-servePackageBasicDescription resource uploaderCache userFeature preferred packageInfoState dpath = do
+servePackageBasicDescription resource  userFeature preferred packageInfoState dpath = do
 
   let metadataRev :: Maybe Int = lookup "revision" dpath >>= Framework.fromReqURI
 
@@ -230,7 +226,7 @@ servePackageBasicDescription resource uploaderCache userFeature preferred packag
       cachedDescr <- Framework.queryState packageInfoState $ GetDescriptionFor (pkgid, metadataRev)
       descr :: PackageBasicDescriptionDTO <- case cachedDescr of
         Just d  -> do
-            uploader <- getPackageUploader pkgid uploaderCache
+            uploader <- undefined
             return $ basicDescriptionToDTO uploader d
         Nothing -> do
           dto <- getPackageDescr pkgid metadataRev
@@ -290,15 +286,6 @@ servePackageBasicDescription resource uploaderCache userFeature preferred packag
         . Preferred.classifyVersions prefInfo
         $ fmap packageVersion pkgs
 
-getPackageUploader
-  :: PackageIdentifier
-  -> Map PackageIdentifier UserName
-  -> Framework.ServerPartE UserName
-getPackageUploader pkgId cache =
-  case Map.lookup pkgId cache of
-    Just u -> pure u
-    Nothing -> Framework.errNotFound "Could not find uploader" []
-
 -- | Our backup doesn't produce any entries, and backup restore
 --   returns an empty state. Our responses are cheap enough to
 --   compute that we would rather regenerate them by need than