1
0
mirror of https://github.com/rancher/norman.git synced 2025-09-25 06:26:50 +00:00

Fix golangci-lint issues

As part of updating dapper files, golangci-lint was set to be used. This
caused a lot of lint issues to crop up, which this fixes.
This commit is contained in:
Steffan Tucker
2022-07-11 16:38:47 -06:00
parent e8b47ab4c4
commit 1e41884a06
15 changed files with 25 additions and 45 deletions

View File

@@ -9,7 +9,7 @@ import (
)
var (
commenter = regexp.MustCompile("(?m)^( *)zzz#\\((.*)\\)\\((.*)\\)([a-z]+.*):(.*)")
commenter = regexp.MustCompile(`(?m)^( *)zzz#\\((.*)\\)\\((.*)\\)([a-z]+.*):(.*)`)
)
func JSONEncoder(writer io.Writer, v interface{}) error {

View File

@@ -43,6 +43,9 @@ func (m Move) ModifySchema(s *types.Schema, schemas *types.Schemas) error {
if err != nil {
return err
}
if !ok {
return fmt.Errorf("failed to find field %s on schema %s", m.To, s.ID)
}
_, ok = toSchema.ResourceFields[toFieldName]
if ok && !strings.Contains(m.To, "/") && !m.DestDefined {
return fmt.Errorf("field %s already exists on schema %s", m.To, s.ID)