Skip to content

Commit

Permalink
Use fd.Parent().FullName() as that is how errors are currently rendered
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkawakami-cybozu
kkawakami-cybozu committed Jul 29, 2024
1 parent 659e4ee commit dba6174
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 67 deletions.
44 changes: 22 additions & 22 deletions cmd/protoc-gen-go-cybozu-validate/field.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (r *Renderer) renderFloat(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "FloatCmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "FloatCmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -198,7 +198,7 @@ func (r *Renderer) renderDouble(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "DoubleCmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "DoubleCmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -247,7 +247,7 @@ func (r *Renderer) renderInt32(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Int32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Int32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -296,7 +296,7 @@ func (r *Renderer) renderInt64(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Int64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Int64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -345,7 +345,7 @@ func (r *Renderer) renderUint32(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Uint32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Uint32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -394,7 +394,7 @@ func (r *Renderer) renderUint64(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Uint64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Uint64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -443,7 +443,7 @@ func (r *Renderer) renderSint32(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Sint32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Sint32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -492,7 +492,7 @@ func (r *Renderer) renderSint64(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Sint64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Sint64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -541,7 +541,7 @@ func (r *Renderer) renderFixed32(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Fixed32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Fixed32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -590,7 +590,7 @@ func (r *Renderer) renderFixed64(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Fixed64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Fixed64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -639,7 +639,7 @@ func (r *Renderer) renderSfixed32(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Sfixed32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Sfixed32Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -688,7 +688,7 @@ func (r *Renderer) renderSfixed64(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "Sfixed64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Sfixed64Cmp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -750,21 +750,21 @@ func (r *Renderer) renderString(f *protogen.Field) error {
case validate.StringRules_NFKD:
r.FL(`v = %s.String(v)`, identNormNFKD)
case validate.StringRules_PRECIS_USERNAME_CASE_MAPPED:
ei := r.addError(f, "PRECISUsernameCaseMapped", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "PRECISUsernameCaseMapped", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if v2, err := %s.String(v); err != nil {`, identPRECISUsernameCaseMapped)
r.FL(`el = append(el, %s("%%w: %%v, %%w", Err%s, v, err))`, identErrorf, ei.name)
r.PL(`} else {`)
r.PL(`v = v2`)
r.PL(`}`)
case validate.StringRules_PRECIS_USERNAME_CASE_PRESERVED:
ei := r.addError(f, "PRECISUsernameCasePreserved", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "PRECISUsernameCasePreserved", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if v2, err := %s.String(v); err != nil {`, identPRECISUsernameCasePreserved)
r.FL(`el = append(el, %s("%%w: %%v, %%w", Err%s, v, err))`, identErrorf, ei.name)
r.PL(`} else {`)
r.PL(`v = v2`)
r.PL(`}`)
case validate.StringRules_PRECIS_OPAQUE_STRING:
ei := r.addError(f, "PRECISOpaqueString", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "PRECISOpaqueString", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if v2, err := %s.String(v); err != nil {`, identPRECISOpaqueString)
r.FL(`el = append(el, %s("%%w: %%v, %%w", Err%s, v, err))`, identErrorf, ei.name)
r.PL(`} else {`)
Expand All @@ -784,7 +784,7 @@ func (r *Renderer) renderString(f *protogen.Field) error {
if rule.MinLength != nil {
conds = append(conds, fmt.Sprintf("vlen < %#v", *rule.MinLength))
}
ei := r.addError(f, "StringLen", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "StringLen", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if vlen := %s(v); %s {`, identRuneCountInString, strings.Join(conds, " || "))
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand All @@ -795,7 +795,7 @@ func (r *Renderer) renderString(f *protogen.Field) error {
return fieldError(fmt.Sprintf("invalid regular expression %q: %v", *rule.Regex, err), fd)
}
r.addRegexp(f, *rule.Regex)
ei := r.addError(f, "StringRegexp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "StringRegexp", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if !regex_%s.MatchString(v) {`, f.GoIdent.GoName)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand All @@ -804,7 +804,7 @@ func (r *Renderer) renderString(f *protogen.Field) error {
switch val := rule.Predefined.(type) {
case *validate.StringRules_Email:
if val.Email {
ei := r.addError(f, "Email", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "Email", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if a, err := %s(v); err != nil {`, identMailParseAddress)
r.FL(`el = append(el, %s("%%w: %%v, %%w", Err%s, v, err))`, identErrorf, ei.name)
r.PL(`} else if a.Name != "" {`)
Expand All @@ -815,7 +815,7 @@ func (r *Renderer) renderString(f *protogen.Field) error {
}
case *validate.StringRules_Uri:
if val.Uri {
ei := r.addError(f, "URI", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "URI", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if u, err := %s(v); err != nil {`, identURLParse)
r.FL(`el = append(el, %s("%%w: %%v, %%w", Err%s, v, err))`, identErrorf, ei.name)
r.PL(`} else if !u.IsAbs() {`)
Expand All @@ -826,7 +826,7 @@ func (r *Renderer) renderString(f *protogen.Field) error {
}
case *validate.StringRules_E164:
if val.E164 {
ei := r.addError(f, "E164", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "E164", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if !%s.MatchString(v) {`, identE164Pattern)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.FL(`} else if len(v)-%s(v, "-") > 16 {`, identStringsCount)
Expand Down Expand Up @@ -878,7 +878,7 @@ func (r *Renderer) renderBytes(f *protogen.Field) error {
default:
r.FL(`if v := x.%s; true {`, f.GoName)
}
ei := r.addError(f, "BytesLen", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "BytesLen", fmt.Sprintf("invalid value for %s of %s", fd.Name(), fd.Parent().FullName()))
r.FL(`if vlen := len(v); %s {`, cond)
r.FL(`el = append(el, %s("%%w: %%v", Err%s, v))`, identErrorf, ei.name)
r.PL(`}`)
Expand Down Expand Up @@ -954,7 +954,7 @@ func (r *Renderer) renderMessageField(f *protogen.Field) error {
}

if required {
ei := r.addError(f, "MessageRequiredField", fmt.Sprintf("required field %s of %s is missing", fd.Name(), fd.Parent().Name()))
ei := r.addError(f, "MessageRequiredField", fmt.Sprintf("required field %s of %s is missing", fd.Name(), fd.Parent().FullName()))
r.PL(`if v == nil {`)
r.FL(`el = append(el, Err%s)`, ei.name)
r.PL(`}`)
Expand Down
Loading

0 comments on commit dba6174

Please sign in to comment.