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 (
16
16
github.com/mitchellh/mapstructure v1.1.2
17
17
github.com/onsi/ginkgo v1.12.0
18
18
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
20
20
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8
21
21
github.com/pborman/uuid v1.2.0
22
22
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
735
735
github.com/openzipkin/zipkin-go v0.1.6 /go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw =
736
736
github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2 h1:2KtDe3jI6ftXGj5M875WVvv6pBIk4K9DyrwPuE+XfOc =
737
737
github.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 =
738
740
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 h1:F3zzxoBJJANdKMxmSOi5z/HWiVT+gwOdhROkEwDWD2M =
739
741
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 /go.mod h1:loVINznYhgBIkmv83kU4yee88RS0BBk+hqOw9r4bhJk =
740
742
github.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 {
88
88
if err != nil {
89
89
r .State = scapiv1alpha2 .FailState
90
90
r .Errors = append (r .Errors , err .Error ())
91
+ r .Log = buf .String ()
92
+ return r
91
93
}
92
94
93
95
objs := []interface {}{bundle , bundle .CSV }
@@ -97,7 +99,7 @@ func BundleValidationTest(dir string) scapiv1alpha2.ScorecardTestResult {
97
99
for _ , crd := range bundle .V1beta1CRDs {
98
100
objs = append (objs , crd )
99
101
}
100
- validationResults := apivalidation .AllValidators .Validate (objs ... )
102
+ validationResults := apivalidation .DefaultBundleValidators .Validate (objs ... )
101
103
for _ , result := range validationResults {
102
104
for _ , e := range result .Errors {
103
105
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 {
199
199
for _ , crd := range bundle .V1beta1CRDs {
200
200
objs = append (objs , crd )
201
201
}
202
- validationResults := apivalidation .AllValidators .Validate (objs ... )
202
+ validationResults := apivalidation .DefaultBundleValidators .Validate (objs ... )
203
203
for _ , result := range validationResults {
204
204
for _ , e := range result .Errors {
205
205
res .Errors = append (res .Errors , & e )
You can’t perform that action at this time.
0 commit comments