@@ -22,7 +22,6 @@ import (
2222
2323 y "github.com/ghodss/yaml"
2424 log "github.com/sirupsen/logrus"
25- "gopkg.in/yaml.v2"
2625)
2726
2827type Meta struct {
@@ -57,8 +56,8 @@ func (i imageValidator) PullBundleImage(imageTag, directory string) error {
5756// Outputs:
5857// error: ValidattionError which contains a list of errors
5958func (i imageValidator ) ValidateBundleFormat (directory string ) error {
60- var manifestsFound , metadataFound bool
61- var annotationsDir , manifestsDir string
59+ var manifestsFound , metadataFound , annotationsFound , dependenciesFound bool
60+ var metadataDir , manifestsDir string
6261 var validationErrors []error
6362
6463 items , err := ioutil .ReadDir (directory )
@@ -76,7 +75,7 @@ func (i imageValidator) ValidateBundleFormat(directory string) error {
7675 case strings .TrimSuffix (MetadataDir , "/" ):
7776 i .logger .Debug ("Found metadata directory" )
7877 metadataFound = true
79- annotationsDir = filepath .Join (directory , MetadataDir )
78+ metadataDir = filepath .Join (directory , MetadataDir )
8079 }
8180 }
8281 }
@@ -99,16 +98,62 @@ func (i imageValidator) ValidateBundleFormat(directory string) error {
9998 validationErrors = append (validationErrors , err )
10099 }
101100
102- // Validate annotations.yaml
103- annotationsFile , err := ioutil .ReadFile ( filepath . Join ( annotationsDir , AnnotationsFile ) )
101+ // Validate annotations file
102+ files , err := ioutil .ReadDir ( metadataDir )
104103 if err != nil {
105- fmtErr := fmt .Errorf ("Unable to read annotations.yaml file: %s" , err .Error ())
106- validationErrors = append (validationErrors , fmtErr )
104+ validationErrors = append (validationErrors , err )
105+ }
106+
107+ // Look for the metadata and manifests sub-directories to find the annotations file
108+ fileAnnotations := & AnnotationMetadata {}
109+ dependenciesFile := & registry.DependenciesFile {}
110+ for _ , f := range files {
111+ if ! annotationsFound {
112+ err = registry .DecodeFile (filepath .Join (metadataDir , f .Name ()), fileAnnotations )
113+ if err == nil && fileAnnotations .Annotations != nil {
114+ annotationsFound = true
115+ continue
116+ }
117+ }
118+
119+ if ! dependenciesFound {
120+ err = parseDependenciesFile (filepath .Join (metadataDir , f .Name ()), dependenciesFile )
121+ if err == nil && len (dependenciesFile .Dependencies ) > 0 {
122+ dependenciesFound = true
123+ }
124+ }
125+ }
126+
127+ if ! annotationsFound {
128+ validationErrors = append (validationErrors , fmt .Errorf ("Could not find annotations file" ))
129+ } else {
130+ i .logger .Info ("Found annotations file" )
131+ errs := validateAnnotations (mediaType , fileAnnotations )
132+ if errs != nil {
133+ validationErrors = append (validationErrors , errs ... )
134+ }
135+ }
136+
137+ if ! dependenciesFound {
138+ i .logger .Info ("Could not find dependencies file" )
139+ } else {
140+ i .logger .Info ("Found dependencies file" )
141+ errs := validateDependencies (dependenciesFile )
142+ if errs != nil {
143+ validationErrors = append (validationErrors , errs ... )
144+ }
145+ }
146+
147+ if len (validationErrors ) > 0 {
107148 return NewValidationError (validationErrors )
108149 }
109150
110- var fileAnnotations AnnotationMetadata
151+ return nil
152+ }
111153
154+ // Validate the annotations file
155+ func validateAnnotations (mediaType string , fileAnnotations * AnnotationMetadata ) []error {
156+ var validationErrors []error
112157 annotations := map [string ]string {
113158 MediatypeLabel : mediaType ,
114159 ManifestsLabel : ManifestsDir ,
@@ -118,18 +163,9 @@ func (i imageValidator) ValidateBundleFormat(directory string) error {
118163 ChannelDefaultLabel : "" ,
119164 }
120165
121- i .logger .Debug ("Validating annotations.yaml" )
122-
123- err = yaml .Unmarshal (annotationsFile , & fileAnnotations )
124- if err != nil {
125- validationErrors = append (validationErrors , fmt .Errorf ("Unable to parse annotations.yaml file" ))
126- }
127-
128166 for label , item := range annotations {
129167 val , ok := fileAnnotations .Annotations [label ]
130- if ok {
131- i .logger .Debugf (`Found annotation "%s" with value "%s"` , label , val )
132- } else {
168+ if ! ok {
133169 aErr := fmt .Errorf ("Missing annotation %q" , label )
134170 validationErrors = append (validationErrors , aErr )
135171 }
@@ -160,16 +196,37 @@ func (i imageValidator) ValidateBundleFormat(directory string) error {
160196 }
161197 }
162198
163- _ , err = ValidateChannelDefault (annotations [ChannelsLabel ], annotations [ChannelDefaultLabel ])
199+ _ , err : =ValidateChannelDefault (annotations [ChannelsLabel ], annotations [ChannelDefaultLabel ])
164200 if err != nil {
165201 validationErrors = append (validationErrors , err )
166202 }
203+ return validationErrors
204+ }
167205
168- if len (validationErrors ) > 0 {
169- return NewValidationError (validationErrors )
206+ // Validate the dependencies file
207+ func validateDependencies (dependenciesFile * registry.DependenciesFile ) []error {
208+ var validationErrors []error
209+
210+ // Validate dependencies if exists
211+ for _ , d := range dependenciesFile .Dependencies {
212+ dep := d .GetTypeValue ()
213+ errs := []error {}
214+ if dep != nil {
215+ switch dp := dep .(type ) {
216+ case registry.GVKDependency :
217+ errs = dp .Validate ()
218+ case registry.PackageDependency :
219+ errs = dp .Validate ()
220+ default :
221+ errs = append (errs , fmt .Errorf ("Unsupported dependency type %s" , d .GetType ()))
222+ }
223+ } else {
224+ errs = append (errs , fmt .Errorf ("Unsupported dependency type %s" , d .GetType ()))
225+ }
226+ validationErrors = append (validationErrors , errs ... )
170227 }
171228
172- return nil
229+ return validationErrors
173230}
174231
175232// ValidateBundleContent confirms that the CSV and CRD files inside the bundle
@@ -289,6 +346,32 @@ func (i imageValidator) ValidateBundleContent(manifestDir string) error {
289346 return nil
290347}
291348
349+ func parseDependenciesFile (path string , depFile * registry.DependenciesFile ) error {
350+ deps := registry.Dependencies {}
351+ err := registry .DecodeFile (path , & deps )
352+
353+ if err != nil || len (deps .RawMessage ) == 0 {
354+ return fmt .Errorf ("Unable to decode the dependencies file %s" , path )
355+ }
356+
357+ depList := []registry.Dependency {}
358+ for _ , v := range deps .RawMessage {
359+ jsonStr , _ := json .Marshal (v )
360+ dep := registry.Dependency {}
361+ err := json .Unmarshal (jsonStr , & dep )
362+ if err != nil {
363+ return err
364+ }
365+
366+ dep .Value = string (jsonStr )
367+ depList = append (depList , dep )
368+ }
369+
370+ depFile .Dependencies = depList
371+
372+ return nil
373+ }
374+
292375// Validate if the file is kubecle-able
293376func validateKubectlable (fileBytes []byte ) error {
294377 exampleFileBytesJSON , err := y .YAMLToJSON (fileBytes )
0 commit comments