@@ -340,11 +340,11 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
340
340
341
341
// We print errors by default and warnings if -v is used. If we get none,
342
342
// this would be an extra new line.
343
- if len (errorMarkers ) != 0 || (d .Suggest && len (warningMarkers ) != 0 ) {
343
+ if len (errorMarkers ) != 0 || len ( infoMarkers ) != 0 || (d .Suggest && len (warningMarkers ) != 0 ) {
344
344
fmt .Fprintln (out )
345
345
}
346
346
347
- errors , warnings := "" , ""
347
+ errors , warnings , infos := "" , "" , ""
348
348
if len (errorMarkers ) == 1 {
349
349
errors = "1 error"
350
350
} else if len (errorMarkers ) > 1 {
@@ -355,16 +355,26 @@ func (d *ProjectStatusDescriber) Describe(namespace, name string) (string, error
355
355
} else if len (warningMarkers ) > 1 {
356
356
warnings = fmt .Sprintf ("%d warnings" , len (warningMarkers ))
357
357
}
358
+ if len (infoMarkers ) > 0 {
359
+ infos = fmt .Sprintf ("%d info" , len (infoMarkers ))
360
+ }
358
361
359
- switch {
360
- case ! d .Suggest && len (errorMarkers ) > 0 && len (warningMarkers ) > 0 :
361
- fmt .Fprintf (out , "%s and %s identified, use '%[3]s status -v' to see details.\n " , errors , warnings , d .CommandBaseName )
362
-
363
- case ! d .Suggest && len (errorMarkers ) > 0 && errorSuggestions > 0 :
364
- fmt .Fprintf (out , "%s identified, use '%[2]s status -v' to see details.\n " , errors , d .CommandBaseName )
362
+ markerStrings := []string {errors , warnings , infos }
363
+ markerString := ""
364
+ count := 0
365
+ for _ , m := range markerStrings {
366
+ if len (m ) > 0 {
367
+ if count > 0 {
368
+ markerString = fmt .Sprintf ("%s, " , markerString )
369
+ }
370
+ markerString = fmt .Sprintf ("%s%s" , markerString , m )
371
+ count ++
372
+ }
373
+ }
365
374
366
- case ! d .Suggest && len (warningMarkers ) > 0 :
367
- fmt .Fprintf (out , "%s identified, use '%[2]s status -v' to see details.\n " , warnings , d .CommandBaseName )
375
+ switch {
376
+ case ! d .Suggest && ((len (errorMarkers ) > 0 && errorSuggestions > 0 ) || len (warningMarkers ) > 0 || len (infoMarkers ) > 0 ):
377
+ fmt .Fprintf (out , "%s identified, use '%s status -v' to see details.\n " , markerString , d .CommandBaseName )
368
378
369
379
case (len (services ) == 0 ) && (len (standaloneDCs ) == 0 ) && (len (standaloneImages ) == 0 ):
370
380
fmt .Fprintln (out , "You have no services, deployment configs, or build configs." )
0 commit comments