add custom headers for webhooks, refactor retry logic #419

tirumaraiselvan · 2018-09-11T14:17:55Z

No description provided.

…triggers_refactor # Conflicts: # server/src-lib/Hasura/RQL/DDL/Subscribe.hs

hasura-bot · 2018-09-11T14:56:05Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

0x777 · 2018-09-12T06:25:03Z

server/src-lib/Hasura/Events/Lib.hs

+      value <- getHeaderValue header
+      return $ (,) <$> pure name <*> value
+
+    getHeaderName :: HeaderConf -> IO N.HeaderName


this need not be in IO

0x777 · 2018-09-12T06:33:59Z

server/src-lib/Hasura/RQL/Types/Subscribe.hs

+data HeaderType = FromEnv | FromValue deriving (Show, Eq, Lift)
+$(deriveJSON defaultOptions ''HeaderType)
+
+data HeaderConf


data HeaderConf = HeaderConf HeaderName HeaderValue data HeaderValue = HVValue Text | HVEnv Text

The json structure can be as follows:

{ "name" : "Authorization", "valueFromEnv": "ET_AUTH_KEY" }

or

{ "name" : "X-Source", "value": "hasura-et" }

hasura-bot · 2018-09-12T06:35:10Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

0x777 · 2018-09-12T06:37:53Z

server/src-lib/Hasura/Events/Lib.hs

          eventId =  eId e
      eeCtx <- asks getter
-
+      mheaders <- liftIO $ mapM getHeader headerConfs


Don't read these in every webhook call? We don't expect them to change once the server starts. So you might as well validate them and store the resolved header in the cache.

hasura-bot · 2018-09-13T09:19:43Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

# Conflicts: # server/src-lib/Hasura/Events/Lib.hs # server/src-lib/Hasura/RQL/DDL/Subscribe.hs

hasura-bot · 2018-09-14T08:43:07Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-14T09:24:42Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

…rs_headers # Conflicts: # server/src-lib/Hasura/RQL/DDL/Subscribe.hs # server/src-lib/Hasura/RQL/Types/Subscribe.hs

hasura-bot · 2018-09-19T13:21:53Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-19T14:02:28Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-19T14:12:18Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-21T07:07:46Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

0x777 · 2018-09-13T09:01:54Z

server/src-lib/Hasura/RQL/DDL/Subscribe.hs

  schemaCachePolicy = SCPReload
+
+getHeadersFromConf :: [HeaderConf] -> IO [(HeaderName, Maybe T.Text)]
+getHeadersFromConf = mapM getHeader


We don't want to throw errors if the environment variable is not present?

0x777 · 2018-09-19T13:38:07Z

server/src-exec/Ops.hs


 curCatalogVer :: T.Text
-curCatalogVer = "2"
+curCatalogVer = "2.1"


change it it 3

server/src-exec/Ops.hs

0x777 · 2018-09-19T14:17:03Z

server/src-lib/Hasura/RQL/DDL/Subscribe.hs

  phaseTwo q _ = deliverEvent q
  schemaCachePolicy = SCPNoChange

+getHeadersFromConf :: [HeaderConf] -> IO [(HeaderName, Maybe T.Text)]


Let's throw an error if the environment variable is not present.

hasura-bot · 2018-09-21T13:48:27Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-24T07:50:17Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

hasura-bot · 2018-09-24T08:18:56Z

Review app available at: https://hge-ci-pull-419.herokuapp.com

shahidhk · 2018-09-24T11:39:54Z

Needs docs

tirumaraiselvan · 2018-09-24T11:48:12Z

Added headers key to the existing API definition. There are two types of headers value and value_from_env

{
"type": "create_event_trigger", 
"args":
    {
    "name": "testtriggerheaders", 
    "table": "users", 
    "update": { "columns" : ["username", "real_name"]},"insert": { "columns" : ["username"]}, 
    "webhook": "https://httpbin.org/post" , 
    "headers":[{
        "name": "X-Hasura-From-Val", 
        "value": "myvalueNEW"
        }, 
        {
        "name": "X-Hasura-From-Env", 
        "value_from_env": "EVENT_WEBHOOK_HEADER"
        }]
    } 
}

hasura-bot · 2018-09-24T11:50:13Z

Review app https://hge-ci-pull-419.herokuapp.com is deleted

Most of our span names were in the format `snake_case` and usually reflected `name_of_the_function`. This is unfriendly, so we've changed it to match the format used by data connectors, which use a format like "Database request" or "Waiting for connection". It would be nice if `Execute request plan for query field` could be `Execute request plan for query field "person"` but it seems changing the currently used `&'static str` for `String` causes all sorts of other lifetime issues, so I suppose we're better including more information as span attributes instead. Therefore, all our span names need to be pretty much static (or at least, dynamically chosen from a list of static names). Note: I have not changed the `SpanVisibility::Internal` span names for now. Most of these reflect function names and this is pretty useful IMO. Happy to change this later if other feel strongly though. V3_GIT_ORIGIN_REV_ID: f2226b2466e8592676f3f4635d483289f0e3f6aa

tirumaraiselvan added 7 commits September 7, 2018 15:19

implement deliver_event_query

e906b3d

change Int64 -> Int

f08ccc1

remove control.retry and unlock after each webhook call

9a85a81

run retry based on next_retry_at timestamp

de98acd

Merge branch 'master' of github.com:hasura/graphql-engine into event_…

6229a09

…triggers_refactor # Conflicts: # server/src-lib/Hasura/RQL/DDL/Subscribe.hs

clear next_retry_at on delivered or error

383874d

deliver_event does not change schema

cdb527e

tirumaraiselvan changed the title ~~implement custom headers~~ implement custom headers for webhooks Sep 11, 2018

shahidhk added the c/server Related to server label Sep 12, 2018

implement custom headers for webhooks

bd05009

tirumaraiselvan force-pushed the triggers_headers branch from dea475c to bd05009 Compare September 12, 2018 06:17

0x777 reviewed Sep 12, 2018

View reviewed changes

tirumaraiselvan added 2 commits September 13, 2018 14:25

change HeaderConf type

eeda18f

store headers in schema cache

1cf8be1

tirumaraiselvan force-pushed the triggers_headers branch from c37fbd7 to 1cf8be1 Compare September 13, 2018 09:00

Merge branch 'event_triggers_refactor' into triggers_headers

7303e07

# Conflicts: # server/src-lib/Hasura/Events/Lib.hs # server/src-lib/Hasura/RQL/DDL/Subscribe.hs

tirumaraiselvan changed the title ~~implement custom headers for webhooks~~ custom headers for webhooks and refactor retry logic Sep 14, 2018

tirumaraiselvan mentioned this pull request Sep 14, 2018

Event triggers refactor #377

Closed

update catalog to 2.1

52462b0

Merge branch 'master' of github.com:hasura/graphql-engine into trigge…

305ce00

…rs_headers # Conflicts: # server/src-lib/Hasura/RQL/DDL/Subscribe.hs # server/src-lib/Hasura/RQL/Types/Subscribe.hs

tirumaraiselvan added 2 commits September 19, 2018 19:06

add event-trigger webhook header test

4702ed1

use catalog version 3 instead of 2.1

1e65405

create indices on join columns for event_log and event_invocation_logs

feb6f14

tirumaraiselvan force-pushed the triggers_headers branch from f622a84 to feb6f14 Compare September 21, 2018 06:48

0x777 reviewed Sep 21, 2018

View reviewed changes

move webhook header env value to right place

d411b26

throwError if webhook header environment variable is not found

2a02502

0x777 approved these changes Sep 24, 2018

View reviewed changes

Merge branch 'master' into triggers_headers

b56e3d4

shahidhk changed the title ~~custom headers for webhooks and refactor retry logic~~ add custom headers for webhooks, refactor retry logic Sep 24, 2018

shahidhk added the c/docs Related to docs label Sep 24, 2018

shahidhk removed the c/docs Related to docs label Sep 24, 2018

shahidhk merged commit 2cd2b23 into hasura:master Sep 24, 2018

shahidhk mentioned this pull request Sep 24, 2018

set event trigger webhook headers from console #523

Closed

tirumaraiselvan deleted the triggers_headers branch September 26, 2018 11:45

add custom headers for webhooks, refactor retry logic #419

add custom headers for webhooks, refactor retry logic #419

Uh oh!

Conversation

tirumaraiselvan commented Sep 11, 2018

Uh oh!

hasura-bot commented Sep 11, 2018

Uh oh!

0x777 Sep 12, 2018

Choose a reason for hiding this comment

Uh oh!

0x777 Sep 12, 2018

Choose a reason for hiding this comment

Uh oh!

hasura-bot commented Sep 12, 2018

Uh oh!

0x777 Sep 12, 2018

Choose a reason for hiding this comment

Uh oh!

hasura-bot commented Sep 13, 2018

Uh oh!

hasura-bot commented Sep 14, 2018

Uh oh!

hasura-bot commented Sep 14, 2018

Uh oh!

hasura-bot commented Sep 19, 2018

Uh oh!

hasura-bot commented Sep 19, 2018

Uh oh!

hasura-bot commented Sep 19, 2018

Uh oh!

hasura-bot commented Sep 21, 2018

Uh oh!

0x777 Sep 13, 2018

Choose a reason for hiding this comment

Uh oh!

0x777 Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

0x777 Sep 19, 2018

Choose a reason for hiding this comment

Uh oh!

hasura-bot commented Sep 21, 2018

Uh oh!

hasura-bot commented Sep 24, 2018

Uh oh!

hasura-bot commented Sep 24, 2018

Uh oh!

shahidhk commented Sep 24, 2018

Uh oh!

tirumaraiselvan commented Sep 24, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hasura-bot commented Sep 24, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

tirumaraiselvan commented Sep 24, 2018 •

edited

Loading