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

cli: fix parse error returned on console api (close #4126) (#4152)

Browse Source
This commit is contained in:
Aravind Shankar 2020-03-25 16:12:39 +05:30 committed by GitHub
parent ac9e1b90d4
commit 41757b5f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 80 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -25,6 +25,7 @@
### Other changes
- cli: fix parse error returned on console api (close #4126)
- console and cli-ext: fix parsing of wrapped types in SDL
- cli: fix typo in cli example for squash (fix #4047) (#4049)
- console: fix run_sql migration modal messaging (close #4020) (#4060)

89
cli/migrate/database/hasuradb/hasuradb.go
View File

@ -184,45 +184,44 @@ func (h *HasuraDB) UnLock() error {
return err
}
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
// Handle migration version here
if horror.Path != "" {
jsonData, err := json.Marshal(h.migrationQuery)
if err != nil {
return err
}
var migrationQuery interface{}
err = json.Unmarshal(jsonData, &migrationQuery)
if err != nil {
return err
}
res, err := jsonpath.JsonPathLookup(migrationQuery, horror.Path)
if err == nil {
queryData, err := json.MarshalIndent(res, "", " ")
switch herror := NewHasuraError(body, h.config.isCMD).(type) {
case HasuraError:
// Handle migration version here
if herror.Path != "" {
jsonData, err := json.Marshal(h.migrationQuery)
if err != nil {
return err
}
horror.migrationQuery = string(queryData)
}
re1, err := regexp.Compile(`\$.args\[([0-9]+)\]*`)
if err != nil {
return err
}
result := re1.FindAllStringSubmatch(horror.Path, -1)
if len(result) != 0 {
migrationNumber, ok := h.jsonPath[result[0][1]]
if ok {
horror.migrationFile = migrationNumber
var migrationQuery interface{}
err = json.Unmarshal(jsonData, &migrationQuery)
if err != nil {
return err
}
res, err := jsonpath.JsonPathLookup(migrationQuery, herror.Path)
if err == nil {
queryData, err := json.MarshalIndent(res, "", " ")
if err != nil {
return err
}
herror.migrationQuery = string(queryData)
}
re1, err := regexp.Compile(`\$.args\[([0-9]+)\]*`)
if err != nil {
return err
}
result := re1.FindAllStringSubmatch(herror.Path, -1)
if len(result) != 0 {
migrationNumber, ok := h.jsonPath[result[0][1]]
if ok {
herror.migrationFile = migrationNumber
}
}
}
return herror
default:
return herror
}
return horror.Error(h.config.isCMD)
}
return nil
}
@ -304,16 +303,9 @@ func (h *HasuraDB) getVersions() (err error) {
return err
}
var horror HasuraError
// If status != 200 return error
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
var hres HasuraSQLRes
@ -375,19 +367,11 @@ func (h *HasuraDB) ensureVersionTable() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
var hres HasuraSQLRes
err = json.Unmarshal(body, &hres)
if err != nil {
h.logger.Debug(err)
@ -416,12 +400,7 @@ func (h *HasuraDB) ensureVersionTable() error {
}
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
err = json.Unmarshal(body, &hres)

90
cli/migrate/database/hasuradb/metadata.go
View File

@ -31,14 +31,8 @@ func (h *HasuraDB) ExportMetadata() (map[string][]byte, error) {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return nil, fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return nil, horror.Error(h.config.isCMD)
return nil, NewHasuraError(body, h.config.isCMD)
}
var c yaml.MapSlice
@ -74,14 +68,8 @@ func (h *HasuraDB) ResetMetadata() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
return nil
}
@ -100,14 +88,8 @@ func (h *HasuraDB) ReloadMetadata() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
return nil
}
@ -125,14 +107,8 @@ func (h *HasuraDB) GetInconsistentMetadata() (bool, []database.InconsistentMetad
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return false, nil, err
}
return false, nil, horror.Error(h.config.isCMD)
return false, nil, NewHasuraError(body, h.config.isCMD)
}
var inMet InconsistentMetadata
@ -160,14 +136,8 @@ func (h *HasuraDB) DropInconsistentMetadata() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return err
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
return nil
}
@ -221,34 +191,32 @@ func (h *HasuraDB) ApplyMetadata() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
if horror.Path != "" {
jsonData, err := json.Marshal(query)
if err != nil {
return err
}
var metadataQuery interface{}
err = json.Unmarshal(jsonData, &metadataQuery)
if err != nil {
return err
}
lookup, err := jsonpath.JsonPathLookup(metadataQuery, horror.Path)
if err == nil {
queryData, err := json.MarshalIndent(lookup, "", " ")
switch herror := NewHasuraError(body, h.config.isCMD).(type) {
case HasuraError:
if herror.Path != "" {
jsonData, err := json.Marshal(query)
if err != nil {
return err
}
horror.migrationQuery = "offending object: \n\r\n\r" + string(queryData)
var metadataQuery interface{}
err = json.Unmarshal(jsonData, &metadataQuery)
if err != nil {
return err
}
lookup, err := jsonpath.JsonPathLookup(metadataQuery, herror.Path)
if err == nil {
queryData, err := json.MarshalIndent(lookup, "", " ")
if err != nil {
return err
}
herror.migrationQuery = "offending object: \n\r\n\r" + string(queryData)
}
}
return herror
default:
return herror
}
return horror.Error(h.config.isCMD)
}
return nil
}
@ -266,14 +234,8 @@ func (h *HasuraDB) Query(data interface{}) error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
return nil
}

9
cli/migrate/database/hasuradb/schema_dump.go
View File

@ -1,7 +1,6 @@
package hasuradb
import (
"encoding/json"
"net/http"
)
@ -22,14 +21,8 @@ func (h *HasuraDB) ExportSchemaDump(schemaNames []string) ([]byte, error) {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return nil, err
}
return nil, horror.Error(h.config.isCMD)
return nil, NewHasuraError(body, h.config.isCMD)
}
return body, nil

41
cli/migrate/database/hasuradb/settings.go
View File

@ -26,14 +26,8 @@ func (h *HasuraDB) ensureSettingsTable() error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
var hres HasuraSQLRes
@ -67,12 +61,7 @@ func (h *HasuraDB) ensureSettingsTable() error {
h.logger.Debug("response: ", string(body))
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
err = json.Unmarshal(body, &hres)
@ -110,14 +99,8 @@ func (h *HasuraDB) setDefaultSettings() error {
return err
}
var horror HasuraError
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
h.logger.Debug(err)
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
return nil
@ -138,16 +121,9 @@ func (h *HasuraDB) GetSetting(name string) (value string, err error) {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
// If status != 200 return error
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return value, fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return value, horror.Error(h.config.isCMD)
return value, NewHasuraError(body, h.config.isCMD)
}
var hres HasuraSQLRes
@ -187,16 +163,9 @@ func (h *HasuraDB) UpdateSetting(name string, value string) error {
}
h.logger.Debug("response: ", string(body))
var horror HasuraError
// If status != 200 return error
if resp.StatusCode != http.StatusOK {
err = json.Unmarshal(body, &horror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(body))
}
return horror.Error(h.config.isCMD)
return NewHasuraError(body, h.config.isCMD)
}
var hres HasuraSQLRes

32
cli/migrate/database/hasuradb/types.go
View File

@ -8,7 +8,6 @@ import (
"github.com/hasura/graphql-engine/cli/migrate/database"
"github.com/qor/transition"
log "github.com/sirupsen/logrus"
)
const (
@ -203,7 +202,7 @@ type SchemaDump struct {
CleanOutput bool `json:"clean_output"`
}
func (h *HasuraError) CMDError() error {
func (h HasuraError) Error() string {
var errorStrings []string
errorStrings = append(errorStrings, fmt.Sprintf("[%s] %s (%s)", h.Code, h.ErrorMessage, h.Path))
if h.migrationFile != "" {
@ -222,27 +221,22 @@ func (h *HasuraError) CMDError() error {
errorStrings = append(errorStrings, fmt.Sprintf("Hint: %s", h.Internal.Error.Hint))
}
}
return fmt.Errorf(strings.Join(errorStrings, "\r\n"))
return strings.Join(errorStrings, "\r\n")
}
func (h *HasuraError) APIError() error {
data, err := json.Marshal(&h)
if err != nil {
return err
}
return fmt.Errorf("Data Error: %s", string(data))
}
func (h *HasuraError) Error(isCMD bool) error {
var err error
switch isCMD {
// NewHasuraError - returns error based on data and isCmd
func NewHasuraError(data []byte, isCmd bool) error {
switch isCmd {
case true:
err = h.CMDError()
case false:
err = h.APIError()
var herror HasuraError
err := json.Unmarshal(data, &herror)
if err != nil {
return fmt.Errorf("failed parsing json: %v; response from API: %s", err, string(data))
}
return herror
default:
return fmt.Errorf("Data Error: %s", string(data))
}
log.Debug(err)
return err
}
type HasuraSQLRes struct {