Updates kriti pin to 0.2.1

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/2697
GitOrigin-RevId: 89705a3cc5a67c28cbf8d120df190fc4e42c24ff
This commit is contained in:
Solomon Bothwell 2021-10-27 17:25:22 -07:00 committed by hasura-bot
parent faaf34cf94
commit 256b59f030
5 changed files with 16 additions and 17 deletions

View File

@ -3,6 +3,7 @@
## Next release
(Add entries below in the order of server, console, cli, docs, others)
- server: updates kriti to v0.2.1 which adds an `escapeUri` function
- server: add cascade option to `mssql_run_sql` metadata API
- server: fix bug which recreated event triggers every time the graphql-engine started up
- server: fix bug in OpenAPI when multiple REST endpoints have the same URL path but different method

View File

@ -40,7 +40,7 @@ package graphql-engine
source-repository-package
type: git
location: https://github.com/hasura/kriti-lang.git
tag: v0.2.0
tag: v0.2.1
source-repository-package
type: git

View File

@ -210,7 +210,7 @@ constraints: any.Cabal ==3.2.0.0,
jose -demos,
any.kan-extensions ==5.2.1,
any.keys ==3.12.3,
any.kriti-lang ==0.2.0.0,
any.kriti-lang ==0.2.1,
any.lens ==4.19.2,
lens -benchmark-uniplate -dump-splices +inlining -j -old-inline-pragmas -safe +test-doctests +test-hunit +test-properties +test-templates +trustworthy,
any.lens-aeson ==1.1,

View File

@ -476,7 +476,6 @@ runTestWebhookTransform (TestWebhookTransform url payload mt sv) = do
initReq <- liftIO $ HTTP.mkRequestThrow url
let req = initReq & HTTP.body .~ pure (J.encode payload)
dataTransform = mkRequestTransform mt
-- TODO(Solomon) Add SessionVariables
transformedE = applyRequestTransform url dataTransform req sv
case transformedE of

View File

@ -402,20 +402,19 @@ mkUrlTransform engine template transformCtx =
case mkTemplateTransform engine (coerce $ wrapTemplate template) transformCtx of
Left err -> Left err
Right (J.String url) ->
let escapedUrl = T.pack $ URI.escapeURIString (/= '|') (T.unpack url)
in case URI.parseURI (T.unpack escapedUrl) of
Just _ -> Right escapedUrl
Nothing ->
Left $
TransformErrorBundle $
pure $
J.object
[ "error_code" J..= J.String "TransformationError",
-- TODO: This error message is not very
-- helpful. We should find a way to identity what
-- is wrong with the URL.
"message" J..= J.String ("Invalid URL: " <> url)
]
case URI.parseURI (T.unpack url) of
Just _ -> Right url
Nothing ->
Left $
TransformErrorBundle $
pure $
J.object
[ "error_code" J..= J.String "TransformationError",
-- TODO: This error message is not very
-- helpful. We should find a way to identity what
-- is wrong with the URL.
"message" J..= J.String ("Invalid URL: " <> url)
]
Right val ->
Left $
TransformErrorBundle $