Skip to content

Import external references in the right order #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Import external references in the right order #530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions internal/fields/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@ func (v *Validator) validateScalarElement(key string, val interface{}) error {
return fmt.Errorf(`field "%s" is undefined`, key)
}

if !v.disabledDependencyManagement && definition.External != "" {
def, err := v.FieldDependencyManager.ImportField(definition.External, key)
if err != nil {
return errors.Wrapf(err, "can't import field (field: %s)", key)
}
definition = &def
}

// Convert numeric keyword fields to string for validation.
_, found := v.numericKeywordFields[key]
if (found || v.defaultNumericConversion) && isNumericKeyword(*definition, val) {
Expand Down Expand Up @@ -283,14 +291,6 @@ func (v *Validator) parseElementValue(key string, definition FieldDefinition, va
return nil // it's an array, but it's not possible to extract the single value.
}

if !v.disabledDependencyManagement && definition.External != "" {
var err error
definition, err = v.FieldDependencyManager.ImportField(definition.External, key)
if err != nil {
return errors.Wrapf(err, "can't import field (field: %s)", key)
}
}

var valid bool
switch definition.Type {
case "constant_keyword":
Expand Down