From 5f9df6d0807acd96b7f537ad23b60302c74295df Mon Sep 17 00:00:00 2001 From: Yann Hamon Date: Sun, 22 Jan 2023 18:22:39 +0100 Subject: [PATCH] Try migrating to new JSON validation library --- pkg/validator/validator.go | 3 +-- pkg/validator/validator_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/validator/validator.go b/pkg/validator/validator.go index a4ca087..8eac3e5 100644 --- a/pkg/validator/validator.go +++ b/pkg/validator/validator.go @@ -180,8 +180,7 @@ func (val *v) ValidateResource(res resource.Resource) Result { err = schema.Validate(r) if err != nil { - // This error can only happen if the Object to validate is poorly formed. There's no hope of saving this one - return Result{Resource: res, Status: Error, Err: fmt.Errorf("problem validating schema. Check JSON formatting: %s", err)} + return Result{Resource: res, Status: Invalid, Err: fmt.Errorf("problem validating schema. Check JSON formatting: %s", err)} } return Result{Resource: res, Status: Valid} diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go index f6fcd15..b2f3802 100644 --- a/pkg/validator/validator_test.go +++ b/pkg/validator/validator_test.go @@ -372,7 +372,7 @@ lastName: bar } if got := val.ValidateResource(resource.Resource{Bytes: testCase.rawResource}); got.Status != testCase.expect { if got.Err != nil { - t.Errorf("%d - expected %d, got %d: %s", i, testCase.expect, got.Status, got.Err.Error()) + t.Errorf("Test '%s' - expected %d, got %d: %s", testCase.name, testCase.expect, got.Status, got.Err.Error()) } else { t.Errorf("%d - expected %d, got %d", i, testCase.expect, got.Status) }