fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

fix(Aeson): HashMap to KeyMap; update imports

Browse Source
This commit is contained in:
Stephan Barth 2024-05-30 10:24:49 +02:00
parent 59cd492fb1
commit b82030a9d2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Utils/Metrics.hs
View File

@ -53,7 +53,8 @@ import qualified Data.Set as Set
import Jobs.Types import Jobs.Types
import qualified Data.Aeson as Aeson import qualified Data.Aeson as Aeson
import qualified Data.HashMap.Strict as HashMap --import qualified Data.HashMap.Strict as HashMap
import qualified Data.Aeson.KeyMap as KeyMap
import Data.IntervalMap.Strict (IntervalMap) import Data.IntervalMap.Strict (IntervalMap)
import qualified Data.IntervalMap.Strict as IntervalMap import qualified Data.IntervalMap.Strict as IntervalMap
@ -64,6 +65,8 @@ import qualified Utils.Pool as Custom
import GHC.Stack import GHC.Stack
import Data.Maybe
{-# ANN module ("HLint: ignore Use even" :: String) #-} {-# ANN module ("HLint: ignore Use even" :: String) #-}
@ -491,7 +494,7 @@ classifyJobWorkerState :: JobWorkerId -> JobWorkerState -> Prometheus.Label4
classifyJobWorkerState wId jws = (showWorkerId wId, tag, maybe "n/a" pack mJobCtl, maybe "n/a" pack mJob) classifyJobWorkerState wId jws = (showWorkerId wId, tag, maybe "n/a" pack mJobCtl, maybe "n/a" pack mJob)
where where
Aeson.Object obj = Aeson.toJSON jws Aeson.Object obj = Aeson.toJSON jws
Aeson.String tag = obj HashMap.! "state" Aeson.String tag = fromJust $ obj KeyMap.!? "state"
mJobCtl = asum mJobCtl = asum
[ classifyJobCtl <$> jws ^? _jobWorkerJobCtl [ classifyJobCtl <$> jws ^? _jobWorkerJobCtl
, "perform" <$ jws ^? _jobWorkerJob , "perform" <$ jws ^? _jobWorkerJob

3
src/Utils/Tokens.hs
View File

@ -25,7 +25,7 @@ import Data.Aeson.Types (Parser)
import qualified Data.Aeson as JSON import qualified Data.Aeson as JSON
import qualified Data.Aeson.Parser as JSON import qualified Data.Aeson.Parser as JSON
import qualified Data.Aeson.Parser.Internal as JSON (jsonEOF') import qualified Data.Aeson.Parser.Internal as JSON (jsonEOF')
import qualified Data.Aeson.Internal as JSON (iparse, formatError) import qualified Data.Aeson.Types as JSON (iparse, formatError)
import qualified Data.HashMap.Strict as HashMap import qualified Data.HashMap.Strict as HashMap
@ -137,6 +137,7 @@ decodeBearer (Jwt bs) = do
Jose.Jwe (_header, payload) -> return payload Jose.Jwe (_header, payload) -> return payload
parser <- bearerParseJSON' parser <- bearerParseJSON'
bearer@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . uncurry JSON.formatError) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content' bearer@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . uncurry JSON.formatError) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content'
-- bearer@BearerToken{..} <- either (throwM . BearerTokenInvalidFormat . _) return $ JSON.eitherDecodeStrictWith JSON.jsonEOF' (JSON.iparse parser) content'
bearerIssuedFor' <- getsSite $ view clusterID bearerIssuedFor' <- getsSite $ view clusterID
unless (bearerIssuedFor' == bearerIssuedFor) $ unless (bearerIssuedFor' == bearerIssuedFor) $
throwM BearerTokenWrongAudience throwM BearerTokenWrongAudience