这是indexloc提供的服务，不要输入任何密码
Skip to content

cli: event trigger retry_conf support to squash (close #4296) #4324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2020
Merged

cli: event trigger retry_conf support to squash (close #4296) #4324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18aff83
cli: add retry_conf in event trigger for squashing migrations
arvi3411301 Apr 7, 2020
bd5f118
update CHANGELOG.md
arvi3411301 Apr 7, 2020
73a1a95
Merge branch 'master' into issue-4296
arvi3411301 Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The order and collapsed state of columns is now persisted across page navigation

### Bug fixes and improvements

- cli: add retry_conf in event trigger for squashing migrations (close #4296) (#4324)
- cli: allow customization of server api paths (close #4016)
- cli: clean up migration files created during a failed migrate api (close #4312) (#4319)
- cli: add support for multiple versions of plugin (close #4105)
Expand Down
15 changes: 12 additions & 3 deletions cli/migrate/database/hasuradb/squash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,23 @@ func (q CustomQuery) MergeEventTriggers(squashList *database.CustomList) error {
prevElems := make([]*list.Element, 0)
for _, val := range g.Group {
element := val.(*list.Element)
switch element.Value.(type) {
case *trackTableInput:
switch obj := element.Value.(type) {
case *createEventTriggerInput:
if obj.Replace {
for _, e := range prevElems {
squashList.Remove(e)
}
err := eventTriggerTransition.Trigger("delete_event_trigger", &evCfg, nil)
if err != nil {
return err
}
}
err := eventTriggerTransition.Trigger("create_event_trigger", &evCfg, nil)
if err != nil {
return err
}
prevElems = append(prevElems, element)
case *unTrackTableInput:
case *deleteEventTriggerInput:
err := eventTriggerTransition.Trigger("delete_event_trigger", &evCfg, nil)
if err != nil {
return err
Expand Down
27 changes: 18 additions & 9 deletions cli/migrate/database/hasuradb/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,17 @@ type createEventTriggerInput struct {
Definition *createEventTriggerOperationInput `json:"definition,omitempty" yaml:"definition,omitempty"`
Headers interface{} `json:"headers" yaml:"headers"`
Replace bool `json:"replace" yaml:"replace"`
RetryConf *createEventTriggerRetryConfInput `json:"retry_conf" yaml:"retry_conf"`

createEventTriggerOperationInput
}

type createEventTriggerRetryConfInput struct {
IntervalSec int `json:"interval_sec" yaml:"interval_sec"`
NumRetries int `json:"num_retries" yaml:"num_retries"`
TimeOutSec int `json:"timeout_sec" yaml:"timeout_sec"`
}

type createEventTriggerOperationInput struct {
Insert interface{} `json:"insert,omitempty" yaml:"insert,omitempty"`
Update interface{} `json:"update,omitempty" yaml:"update,omitempty"`
Expand All @@ -493,22 +500,24 @@ func (c *createEventTriggerInput) MarshalJSON() ([]byte, error) {
c.Definition = nil
}
return json.Marshal(&struct {
Name string `json:"name" yaml:"name"`
Table tableSchema `json:"table" yaml:"table"`
Webhook string `json:"webhook,omitempty" yaml:"webhook,omitempty"`
WebhookFromEnv string `json:"webhook_from_env,omitempty" yaml:"webhook_from_env,omitempty"`
Headers interface{} `json:"headers" yaml:"headers"`
Replace bool `json:"replace" yaml:"replace"`
Insert interface{} `json:"insert,omitempty" yaml:"insert,omitempty"`
Update interface{} `json:"update,omitempty" yaml:"update,omitempty"`
Delete interface{} `json:"delete,omitempty" yaml:"delete,omitempty"`
Name string `json:"name" yaml:"name"`
Table tableSchema `json:"table" yaml:"table"`
Webhook string `json:"webhook,omitempty" yaml:"webhook,omitempty"`
WebhookFromEnv string `json:"webhook_from_env,omitempty" yaml:"webhook_from_env,omitempty"`
Headers interface{} `json:"headers" yaml:"headers"`
Replace bool `json:"replace" yaml:"replace"`
RetryConf *createEventTriggerRetryConfInput `json:"retry_conf" yaml:"retry_conf"`
Insert interface{} `json:"insert,omitempty" yaml:"insert,omitempty"`
Update interface{} `json:"update,omitempty" yaml:"update,omitempty"`
Delete interface{} `json:"delete,omitempty" yaml:"delete,omitempty"`
}{
Name: c.Name,
Table: c.Table,
Webhook: c.Webhook,
WebhookFromEnv: c.WebhookFromEnv,
Headers: c.Headers,
Replace: c.Replace,
RetryConf: c.RetryConf,
Insert: c.Insert,
Update: c.Update,
Delete: c.Delete,
Expand Down