Use native configuration validation and diagnostics
This commit is contained in:
@@ -122,7 +122,7 @@ func TestNotariusCredentialReferenceFailures(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err := LoadPipeline(path)
|
||||
if err == nil || !strings.Contains(err.Error(), test.want) {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), test.want) {
|
||||
t.Fatalf("LoadPipeline() error = %v, want classification %q", err, test.want)
|
||||
}
|
||||
})
|
||||
@@ -135,7 +135,7 @@ func TestNotariusRejectsRetiredCredentialField(t *testing.T) {
|
||||
if err := os.WriteFile(path, []byte(pipelineYAML), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := LoadPipeline(path); err == nil || !strings.Contains(err.Error(), "decode.unknown_field") {
|
||||
if _, err := LoadPipeline(path); err == nil || !strings.Contains(configurationErrorText(err), "decode.unknown_field") {
|
||||
t.Fatalf("LoadPipeline() error = %v, want unknown field", err)
|
||||
}
|
||||
}
|
||||
@@ -198,7 +198,7 @@ notarius:
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err := LoadPipeline(blankPath)
|
||||
if err == nil || !strings.Contains(err.Error(), "working_directory is required") {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), "working_directory is required") {
|
||||
t.Fatalf("LoadPipeline() error = %v, want required working directory", err)
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ func TestNotariusCacheControlNormalizationAndValidation(t *testing.T) {
|
||||
cfg := validNotariusConfig()
|
||||
cfg.ChunkCache = mode
|
||||
err := validateNotarius(cfg, nil)
|
||||
if err == nil || !strings.Contains(err.Error(), "pipeline.notarius.chunk_cache") {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), "pipeline.notarius.chunk_cache") {
|
||||
t.Fatalf("validateNotarius() error = %v, want chunk_cache error", err)
|
||||
}
|
||||
})
|
||||
@@ -343,11 +343,11 @@ func TestNotariusStrictYAML(t *testing.T) {
|
||||
t.Fatalf("write pipeline: %v", err)
|
||||
}
|
||||
_, err := LoadPipeline(path)
|
||||
want := "strict decode failed"
|
||||
want := "decode.unknown_field"
|
||||
if tt.name == "duplicate reference selector" {
|
||||
want = "yaml.duplicate_key"
|
||||
}
|
||||
if err == nil || !strings.Contains(err.Error(), want) {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), want) {
|
||||
t.Fatalf("LoadPipeline() error = %v, want containing %q", err, want)
|
||||
}
|
||||
})
|
||||
@@ -413,7 +413,7 @@ func TestNotariusReferenceValidationRejectsInvalidBindings(t *testing.T) {
|
||||
cfg := validNotariusConfig()
|
||||
cfg.References = tt.references
|
||||
err := validateNotarius(cfg, nil)
|
||||
if err == nil || !strings.Contains(err.Error(), tt.wantField) || !strings.Contains(err.Error(), tt.wantReason) {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), tt.wantField) || !strings.Contains(configurationErrorText(err), tt.wantReason) {
|
||||
t.Fatalf("validateNotarius() error = %v, want field %q and reason %q", err, tt.wantField, tt.wantReason)
|
||||
}
|
||||
})
|
||||
@@ -435,7 +435,7 @@ func TestNotariusReferenceLimit(t *testing.T) {
|
||||
}
|
||||
return
|
||||
}
|
||||
if err == nil || !strings.Contains(err.Error(), "at most 256 bindings") {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), "at most 256 bindings") {
|
||||
t.Fatalf("validateNotarius() above limit error = %v", err)
|
||||
}
|
||||
})
|
||||
@@ -482,7 +482,7 @@ func TestNotariusValidationFailureDoesNotMutateConfig(t *testing.T) {
|
||||
before := cloneNotariusConfigForTest(cfg)
|
||||
|
||||
err := validateNotarius(cfg, nil)
|
||||
if err == nil || !strings.Contains(err.Error(), test.want) {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), test.want) {
|
||||
t.Fatalf("validateNotarius() error = %v, want field containing %q", err, test.want)
|
||||
}
|
||||
if !reflect.DeepEqual(cfg, before) {
|
||||
@@ -585,10 +585,10 @@ func TestNotariusDiagnosticsUseSortedMapKeys(t *testing.T) {
|
||||
cfg := validNotariusConfig()
|
||||
test.configure(cfg, keys)
|
||||
err := validateNotarius(cfg, nil)
|
||||
if err == nil || !strings.Contains(err.Error(), test.wantField) {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), test.wantField) {
|
||||
t.Fatalf("validateNotarius() error = %v, want field %q", err, test.wantField)
|
||||
}
|
||||
diagnostics = append(diagnostics, err.Error())
|
||||
diagnostics = append(diagnostics, configurationErrorText(err))
|
||||
}
|
||||
if diagnostics[0] != diagnostics[1] {
|
||||
t.Fatalf("equivalent maps produced different diagnostics:\nfirst: %s\nsecond: %s", diagnostics[0], diagnostics[1])
|
||||
@@ -623,7 +623,7 @@ func TestNotariusSpellCatalogReferenceRequiresEffectiveInput(t *testing.T) {
|
||||
}
|
||||
|
||||
err := Validate(cfg)
|
||||
if err == nil || !strings.Contains(err.Error(), "pipeline.notarius.references.alpha") || !strings.Contains(err.Error(), "requires campaign.inputs.spell_catalog_file or session.inputs.spell_catalog_file") {
|
||||
if err == nil || !strings.Contains(configurationErrorText(err), "pipeline.notarius.references.alpha") || !strings.Contains(configurationErrorText(err), "requires campaign.inputs.spell_catalog_file or session.inputs.spell_catalog_file") {
|
||||
t.Fatalf("Validate() error = %v, want sorted selector and missing spell catalog input", err)
|
||||
}
|
||||
|
||||
@@ -715,7 +715,7 @@ func TestNotariusEnabledValidation(t *testing.T) {
|
||||
if err != nil {
|
||||
if len(tt.wantErr) > 0 {
|
||||
for _, fragment := range tt.wantErr {
|
||||
if !strings.Contains(err.Error(), fragment) {
|
||||
if !strings.Contains(configurationErrorText(err), fragment) {
|
||||
t.Fatalf("Load() error = %v, want containing %q", err, fragment)
|
||||
}
|
||||
}
|
||||
@@ -738,7 +738,7 @@ func TestNotariusEnabledValidation(t *testing.T) {
|
||||
t.Fatalf("Validate() error = nil, want containing %q", tt.wantErr)
|
||||
}
|
||||
for _, fragment := range tt.wantErr {
|
||||
if !strings.Contains(err.Error(), fragment) {
|
||||
if !strings.Contains(configurationErrorText(err), fragment) {
|
||||
t.Fatalf("Validate() error = %v, want containing %q", err, fragment)
|
||||
}
|
||||
}
|
||||
@@ -814,7 +814,7 @@ func TestExtractionReferencesRequireDeclaredOutput(t *testing.T) {
|
||||
t.Fatalf("Validate() error = nil, want containing %q", tt.wantErr)
|
||||
}
|
||||
for _, fragment := range tt.wantErr {
|
||||
if !strings.Contains(err.Error(), fragment) {
|
||||
if !strings.Contains(configurationErrorText(err), fragment) {
|
||||
t.Fatalf("Validate() error = %v, want containing %q", err, fragment)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user