Add type-safe artifact lane resolution
This commit is contained in:
@@ -1948,7 +1948,7 @@ type runnerModules struct {
|
||||
extractors map[string]*runnerExtractor
|
||||
mergers map[string]*runnerMerger
|
||||
normalizers map[string]*runnerNormalizer
|
||||
validators map[string]contracts.Validator
|
||||
validators map[string]contracts.LegacyRawValidator
|
||||
output *runnerOutputEncoder
|
||||
inputBuildErr error
|
||||
chunkerBuildErr error
|
||||
@@ -1967,7 +1967,7 @@ func defaultRunnerModules() *runnerModules {
|
||||
normalizers: map[string]*runnerNormalizer{
|
||||
"normalize": {key: "normalize"},
|
||||
},
|
||||
validators: map[string]contracts.Validator{
|
||||
validators: map[string]contracts.LegacyRawValidator{
|
||||
"configured": &runnerValidator{name: "configured"},
|
||||
"second-validator": &runnerValidator{name: "second-validator"},
|
||||
},
|
||||
@@ -2015,26 +2015,26 @@ func newRunnerRegistries(t *testing.T, modules *runnerModules) Registries {
|
||||
}
|
||||
for key, extractor := range modules.extractors {
|
||||
extractor := extractor
|
||||
if err := registries.Extractors.Register(key, func() (contracts.Extractor, error) { return extractor, nil }); err != nil {
|
||||
if err := registries.Extractors.RegisterLegacyRaw(key, func() (contracts.LegacyRawExtractor, error) { return extractor, nil }); err != nil {
|
||||
t.Fatalf("register extractor %q: %v", key, err)
|
||||
}
|
||||
}
|
||||
for key, merger := range modules.mergers {
|
||||
merger := merger
|
||||
if err := registries.Mergers.Register(key, func() (contracts.Merger, error) { return merger, nil }); err != nil {
|
||||
if err := registries.Mergers.RegisterLegacyRaw(key, func() (contracts.LegacyRawMerger, error) { return merger, nil }); err != nil {
|
||||
t.Fatalf("register merger %q: %v", key, err)
|
||||
}
|
||||
}
|
||||
for key, normalizer := range modules.normalizers {
|
||||
normalizer := normalizer
|
||||
if err := registries.Normalizers.Register(key, func() (contracts.Normalizer, error) { return normalizer, nil }); err != nil {
|
||||
if err := registries.Normalizers.RegisterLegacyRaw(key, func() (contracts.LegacyRawNormalizer, error) { return normalizer, nil }); err != nil {
|
||||
t.Fatalf("register normalizer %q: %v", key, err)
|
||||
}
|
||||
}
|
||||
for key, validator := range modules.validators {
|
||||
validator := validator
|
||||
spec := ValidatorSpec{Key: key, ExecutionClass: validator.ExecutionClass()}
|
||||
if err := registries.Validators.RegisterWithSpec(spec, func() (contracts.Validator, error) { return validator, nil }); err != nil {
|
||||
if err := registries.Validators.RegisterLegacyRawWithSpec(spec, func() (contracts.LegacyRawValidator, error) { return validator, nil }); err != nil {
|
||||
t.Fatalf("register validator %q: %v", key, err)
|
||||
}
|
||||
}
|
||||
@@ -2653,7 +2653,7 @@ func assertRunError(t *testing.T, err error, want string) {
|
||||
}
|
||||
}
|
||||
|
||||
func resolvedValidatorForTest(validator contracts.Validator) ResolvedValidator {
|
||||
func resolvedValidatorForTest(validator contracts.LegacyRawValidator) ResolvedValidator {
|
||||
return ResolvedValidator{
|
||||
Binding: Binding(validator.Name()),
|
||||
ExecutionClass: validator.ExecutionClass(),
|
||||
|
||||
Reference in New Issue
Block a user