jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-08 12:17:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve error handling in the plugin config model parser of hgctl (#891)

Browse Source
This commit is contained in:
Kent Dong
2024-04-03 09:49:06 +08:00
committed by GitHub
parent b4f72d3584
commit dfc9ae412e
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/cmd/hgctl/plugin/types/model_parser.go
View File

@@ -50,7 +50,7 @@ func IsObject(typ string) bool {
var ( var (
ErrInvalidModel = errors.New("invalid model") ErrInvalidModel = errors.New("invalid model")
ErrInvalidFiledType = errors.New("invalid field type") ErrInvalidFieldType = errors.New("invalid field type")
) )
type ModelParser struct { type ModelParser struct {
@@ -248,24 +248,24 @@ func (p *ModelParser) parseModelFields(model string) (fields []Model, err error)
if field.Tag != nil { if field.Tag != nil {
ignore, err := fd.setTag(field.Tag.Value) ignore, err := fd.setTag(field.Tag.Value)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to parse tag %q of the field %q", fd.Tag, fd.Name) return nil, errors.Wrapf(err, "failed to parse tag %q of the field %q", field.Tag, fd.Name)
} }
if ignore { if ignore {
continue continue
} }
} }
fd.Type, err = p.parseFiledType(pkgName, field.Type) fd.Type, err = p.parseFieldType(pkgName, field.Type)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to parse type %q of the field %q", field.Type, fd.Name)
} }
if IsObject(fd.Type) { if IsObject(fd.Type) {
subModel, err := p.getModelName(field.Type) subModel, err := p.getModelName(field.Type)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to get the sub-model name of the field %q with type %q", fd.Name, field.Type)
} }
fd.Fields, err = p.parseModelFields(subModel) fd.Fields, err = p.parseModelFields(subModel)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to parse sub-model of the field %q with type %q", fd.Name, field.Type)
} }
} }
fields = append(fields, fd) fields = append(fields, fd)
@@ -316,25 +316,25 @@ func (p *ModelParser) doGetModelName(pkgName string, typ ast.Expr) (string, erro
case *ast.SelectorExpr: // <pkg_name>.<field_name> case *ast.SelectorExpr: // <pkg_name>.<field_name>
pkg, ok := t.X.(*ast.Ident) pkg, ok := t.X.(*ast.Ident)
if !ok { if !ok {
return "", ErrInvalidFiledType return "", ErrInvalidFieldType
} }
pName := pkg.Name + "." pName := pkg.Name + "."
return p.doGetModelName(pName, t.Sel) return p.doGetModelName(pName, t.Sel)
case *ast.Ident: case *ast.Ident:
return pkgName + t.Name, nil return pkgName + t.Name, nil
default: default:
return "", ErrInvalidFiledType return "", ErrInvalidFieldType
} }
} }
func (p *ModelParser) parseFiledType(pkgName string, typ ast.Expr) (string, error) { func (p *ModelParser) parseFieldType(pkgName string, typ ast.Expr) (string, error) {
switch t := typ.(type) { switch t := typ.(type) {
case *ast.StructType: // nested struct case *ast.StructType: // nested struct
return string(JsonTypeObject), nil return string(JsonTypeObject), nil
case *ast.StarExpr: // *int -> int case *ast.StarExpr: // *int -> int
return p.parseFiledType(pkgName, t.X) return p.parseFieldType(pkgName, t.X)
case *ast.ArrayType: // slice or array case *ast.ArrayType: // slice or array
ret, err := p.parseFiledType(pkgName, t.Elt) ret, err := p.parseFieldType(pkgName, t.Elt)
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -342,22 +342,22 @@ func (p *ModelParser) parseFiledType(pkgName string, typ ast.Expr) (string, erro
case *ast.SelectorExpr: // <pkg_name>.<field_name> case *ast.SelectorExpr: // <pkg_name>.<field_name>
pkg, ok := t.X.(*ast.Ident) pkg, ok := t.X.(*ast.Ident)
if !ok { if !ok {
return "", ErrInvalidFiledType return "", ErrInvalidFieldType
} }
pName := pkg.Name + "." pName := pkg.Name + "."
return p.parseFiledType(pName, t.Sel) return p.parseFieldType(pName, t.Sel)
case *ast.Ident: case *ast.Ident:
fName := pkgName + t.Name fName := pkgName + t.Name
if _, ok := p.structs[fName]; ok { if _, ok := p.structs[fName]; ok {
return string(JsonTypeObject), nil return string(JsonTypeObject), nil
} }
if alias, ok := p.alias[fName]; ok { if alias, ok := p.alias[fName]; ok {
return p.parseFiledType(pkgName, alias.expr) return p.parseFieldType(pkgName, alias.expr)
} }
jsonType, err := convert2JsonType(t.Name) jsonType, err := convert2JsonType(t.Name)
return string(jsonType), err return string(jsonType), err
default: default:
return "", ErrInvalidFiledType return "", ErrInvalidFieldType
} }
} }
@@ -375,7 +375,7 @@ func convert2JsonType(typ string) (JsonType, error) {
case "struct": case "struct":
return JsonTypeObject, nil return JsonTypeObject, nil
default: default:
return "", ErrInvalidFiledType return "", ErrInvalidFieldType
} }
} }