File tree Expand file tree Collapse file tree 5 files changed +12
-3
lines changed Expand file tree Collapse file tree 5 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 1+ entries :
2+ - description : >
3+ Fix bug in `bundle validate` that erroneously causes errors when a CRD manifest contains versions
4+ not present in a bundled CSV by bumping the api library version.
5+ kind: bugfix
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ require (
1616 github.com/mitchellh/mapstructure v1.1.2
1717 github.com/onsi/ginkgo v1.12.0
1818 github.com/onsi/gomega v1.9.0
19- github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2
19+ github.com/operator-framework/api v0.3.8
2020 github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8
2121 github.com/pborman/uuid v1.2.0
2222 github.com/pkg/errors v0.9.1
Original file line number Diff line number Diff line change @@ -735,6 +735,8 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
735735github.com/openzipkin/zipkin-go v0.1.6 /go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw =
736736github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2 h1:2KtDe3jI6ftXGj5M875WVvv6pBIk4K9DyrwPuE+XfOc =
737737github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2 /go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q =
738+ github.com/operator-framework/api v0.3.8 h1:tJykTCmwGKZBsPVTCfxbwz6nTF6dzmKydWJtC40erc8 =
739+ github.com/operator-framework/api v0.3.8 /go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q =
738740github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 h1:F3zzxoBJJANdKMxmSOi5z/HWiVT+gwOdhROkEwDWD2M =
739741github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 /go.mod h1:loVINznYhgBIkmv83kU4yee88RS0BBk+hqOw9r4bhJk =
740742github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k =
Original file line number Diff line number Diff line change @@ -88,6 +88,8 @@ func BundleValidationTest(dir string) scapiv1alpha2.ScorecardTestResult {
8888 if err != nil {
8989 r .State = scapiv1alpha2 .FailState
9090 r .Errors = append (r .Errors , err .Error ())
91+ r .Log = buf .String ()
92+ return r
9193 }
9294
9395 objs := []interface {}{bundle , bundle .CSV }
@@ -97,7 +99,7 @@ func BundleValidationTest(dir string) scapiv1alpha2.ScorecardTestResult {
9799 for _ , crd := range bundle .V1beta1CRDs {
98100 objs = append (objs , crd )
99101 }
100- validationResults := apivalidation .AllValidators .Validate (objs ... )
102+ validationResults := apivalidation .DefaultBundleValidators .Validate (objs ... )
101103 for _ , result := range validationResults {
102104 for _ , e := range result .Errors {
103105 r .Errors = append (r .Errors , e .Error ())
Original file line number Diff line number Diff line change @@ -199,7 +199,7 @@ func (t *BundleValidationTest) Run(ctx context.Context) *schelpers.TestResult {
199199 for _ , crd := range bundle .V1beta1CRDs {
200200 objs = append (objs , crd )
201201 }
202- validationResults := apivalidation .AllValidators .Validate (objs ... )
202+ validationResults := apivalidation .DefaultBundleValidators .Validate (objs ... )
203203 for _ , result := range validationResults {
204204 for _ , e := range result .Errors {
205205 res .Errors = append (res .Errors , & e )
You can’t perform that action at this time.
0 commit comments