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

cli: fix action timeout not being picked up in metadata operations (close #6220)

Browse Source 
GITHUB_PR_NUMBER: 6354
GITHUB_PR_URL: https://github.com/hasura/graphql-engine/pull/6354

Co-authored-by: Aravind K P <8335904+scriptonist@users.noreply.github.com>
GitOrigin-RevId: 9869712d496d8e0733f9b25d44962e9a978ebc24
This commit is contained in:
hasura-bot 2020-12-24 10:36:35 +05:30
parent 64a0a14fe2
commit a18cd6b1bc
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -97,6 +97,7 @@ and be accessible according to the permissions that were configured for the role
- console: misc bug fixes (close #4785, #6330, #6288) - console: misc bug fixes (close #4785, #6330, #6288)
- cli: add missing global flags for seed command (#5565) - cli: add missing global flags for seed command (#5565)
- cli: allow seeds as alias for seed command (#5693) - cli: allow seeds as alias for seed command (#5693)
- cli: fix action timeouts not being picked up in metadata operations (#6220)
- build: add `test_server_pg_13` to the CI to run the server tests on Postgres v13 (#6070) - build: add `test_server_pg_13` to the CI to run the server tests on Postgres v13 (#6070)
## v1.3.3 ## v1.3.3

2
cli/metadata/actions/actions.go
View File

@ -124,6 +124,7 @@ input SampleInput {
for oldActionIndex, oldActionObj := range oldAction.Actions { for oldActionIndex, oldActionObj := range oldAction.Actions {
if action.Name == oldActionObj.Name { if action.Name == oldActionObj.Name {
sdlFromResp.Actions[actionIndex].Permissions = oldAction.Actions[oldActionIndex].Permissions sdlFromResp.Actions[actionIndex].Permissions = oldAction.Actions[oldActionIndex].Permissions
sdlFromResp.Actions[actionIndex].Definition.Timeout = oldAction.Actions[oldActionIndex].Definition.Timeout
sdlFromResp.Actions[actionIndex].Definition.Kind = oldAction.Actions[oldActionIndex].Definition.Kind sdlFromResp.Actions[actionIndex].Definition.Kind = oldAction.Actions[oldActionIndex].Definition.Kind
sdlFromResp.Actions[actionIndex].Definition.Type = oldAction.Actions[oldActionIndex].Definition.Type sdlFromResp.Actions[actionIndex].Definition.Type = oldAction.Actions[oldActionIndex].Definition.Type
sdlFromResp.Actions[actionIndex].Definition.Handler = oldAction.Actions[oldActionIndex].Definition.Handler sdlFromResp.Actions[actionIndex].Definition.Handler = oldAction.Actions[oldActionIndex].Definition.Handler
@ -295,6 +296,7 @@ func (a *ActionConfig) Build(metadata *yaml.MapSlice) error {
if action.Name == newActionObj.Name { if action.Name == newActionObj.Name {
isFound = true isFound = true
sdlFromResp.Actions[newActionIndex].Permissions = oldAction.Actions[actionIndex].Permissions sdlFromResp.Actions[newActionIndex].Permissions = oldAction.Actions[actionIndex].Permissions
sdlFromResp.Actions[newActionIndex].Definition.Timeout = oldAction.Actions[actionIndex].Definition.Timeout
sdlFromResp.Actions[newActionIndex].Definition.Kind = oldAction.Actions[actionIndex].Definition.Kind sdlFromResp.Actions[newActionIndex].Definition.Kind = oldAction.Actions[actionIndex].Definition.Kind
sdlFromResp.Actions[newActionIndex].Definition.Handler = oldAction.Actions[actionIndex].Definition.Handler sdlFromResp.Actions[newActionIndex].Definition.Handler = oldAction.Actions[actionIndex].Definition.Handler
sdlFromResp.Actions[newActionIndex].Definition.ForwardClientHeaders = oldAction.Actions[actionIndex].Definition.ForwardClientHeaders sdlFromResp.Actions[newActionIndex].Definition.ForwardClientHeaders = oldAction.Actions[actionIndex].Definition.ForwardClientHeaders

1
cli/metadata/actions/types/types.go
View File

@ -73,6 +73,7 @@ type ActionDef struct {
OutputType string `json:"output_type" yaml:"output_type,omitempty"` OutputType string `json:"output_type" yaml:"output_type,omitempty"`
ForwardClientHeaders bool `json:"-" yaml:"forward_client_headers,omitempty"` ForwardClientHeaders bool `json:"-" yaml:"forward_client_headers,omitempty"`
Headers []yaml.MapSlice `json:"-" yaml:"headers,omitempty"` Headers []yaml.MapSlice `json:"-" yaml:"headers,omitempty"`
Timeout int `json:"-" yaml:"timeout,omitempty"`
} }
type CustomTypes struct { type CustomTypes struct {