hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-15 01:12:56 +03:00
Code Issues Projects Releases Wiki Activity

Updates kriti pin to 0.2.1

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Next release ## Next release
(Add entries below in the order of server, console, cli, docs, others) (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: 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 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 - server: fix bug in OpenAPI when multiple REST endpoints have the same URL path but different method

2
cabal.project
View File

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

2
cabal.project.freeze
View File

@ -210,7 +210,7 @@ constraints: any.Cabal ==3.2.0.0,
jose -demos, jose -demos,
any.kan-extensions ==5.2.1, any.kan-extensions ==5.2.1,
any.keys ==3.12.3, any.keys ==3.12.3,
any.kriti-lang ==0.2.0.0, any.kriti-lang ==0.2.1,
any.lens ==4.19.2, 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, 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, any.lens-aeson ==1.1,

1
server/src-lib/Hasura/RQL/DDL/Metadata.hs
View File

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

5
server/src-lib/Hasura/RQL/DDL/RequestTransform.hs
View File

@ -402,9 +402,8 @@ mkUrlTransform engine template transformCtx =
case mkTemplateTransform engine (coerce $ wrapTemplate template) transformCtx of case mkTemplateTransform engine (coerce $ wrapTemplate template) transformCtx of
Left err -> Left err Left err -> Left err
Right (J.String url) -> Right (J.String url) ->
let escapedUrl = T.pack $ URI.escapeURIString (/= '|') (T.unpack url) case URI.parseURI (T.unpack url) of
in case URI.parseURI (T.unpack escapedUrl) of Just _ -> Right url
Just _ -> Right escapedUrl
Nothing -> Nothing ->
Left $ Left $
TransformErrorBundle $ TransformErrorBundle $