@@ -109,7 +109,7 @@ func LoadJsonFile(filePath string) map[string]interface{} {
109109 if FileExists (filePath ) {
110110 fileContent , err := ioutil .ReadFile (GetFilePath (filePath )) // just pass the file name
111111 if err != nil {
112- log .Err ("Can't read file: " , filePath , err )
112+ log .Err ("Can't read file:" , filePath , err )
113113 return nil
114114 }
115115
@@ -191,7 +191,7 @@ func getRawData(data map[string]interface{}) {
191191 // for every host get data
192192 var rawData []interface {}
193193 hosts := pyraconv .ToInterfaceMap (data ["hosts" ])
194- log .Dbg ("Data hosts: " , hosts )
194+ log .Dbg ("Data hosts:" , hosts )
195195 results := pyraconv .ToInterfaceMap (data ["results" ])
196196 masterName := pyraconv .ToString (hosts ["master" ])
197197 masterResults := pyraconv .ToInterfaceMap (results [masterName ])
@@ -300,7 +300,7 @@ func generateMdReport(checkId string, reportFilename string, reportData map[stri
300300 reporTpl := templates .Lookup (reportFileName )
301301 data := reportData
302302 if reporTpl == nil {
303- log .Err ("Template " + checkId + ".tpl not found. " )
303+ log .Err ("Template " + checkId + ".tpl not found" )
304304 getRawData (data )
305305 reportFileName = "raw.tpl"
306306 reporTpl = templates .Lookup (reportFileName )
@@ -415,6 +415,7 @@ func main() {
415415 projectDataPtr := flag .String ("project" , "" , "target project used during uploading" )
416416 pathDataPtr := flag .String ("path" , "" , "path to artifacts directory used during uploading" )
417417 apiUrlDataPtr := flag .String ("apiurl" , "" , "API URL for reports uploading" )
418+
418419 flag .Parse ()
419420 checkData = * checkDataPtr
420421
@@ -431,27 +432,24 @@ func main() {
431432 log .DEBUG = false
432433 }
433434
434- if * modeDataPtr == "upload" {
435+ switch * modeDataPtr {
436+ case "upload" :
435437 token := * tokenDataPtr
436438 project := * projectDataPtr
437439 path := * pathDataPtr
438440 apiUrl := * apiUrlDataPtr
439441
440442 if len (token ) == 0 {
441- log .Err ("Token is not defined" )
442- return
443+ log .Fatal ("Token is not defined" )
443444 }
444445 if len (apiUrl ) == 0 {
445- log .Err ("API URL is not defined" )
446- return
446+ log .Fatal ("API URL is not defined" )
447447 }
448448 if len (project ) == 0 {
449- log .Err ("Project (for reports uploading) is not defined" )
450- return
449+ log .Fatal ("Project (for reports uploading) is not defined" )
451450 }
452451 if len (path ) == 0 {
453- log .Err ("Artifacts directory is not defined" )
454- return
452+ log .Fatal ("Artifacts directory is not defined" )
455453 }
456454
457455 err := upload .UploadReport (apiUrl , token , project , path )
@@ -460,28 +458,47 @@ func main() {
460458 os .Exit (1 )
461459 }
462460
461+ return
462+ case "loadcfg" :
463+ path := * pathDataPtr
464+ if len (path ) == 0 {
465+ log .Fatal ("Config path is not defined" )
466+ }
467+
468+ config , err := loadConfig (path )
469+ if err != nil {
470+ log .Fatal (fmt .Sprintf ("Cannot load config. %s" , err ))
471+ os .Exit (1 )
472+ }
473+
474+ if len (config ) == 0 {
475+ log .Fatal (fmt .Sprintf ("Config '%s' is empty" , path ))
476+ }
477+
478+ outputConfig (config )
479+
463480 return
464481 }
465482
466483 if FileExists (checkData ) {
467484 resultData = LoadJsonFile (checkData )
468485
469486 if resultData == nil {
470- log .Fatal ("ERROR: File given by --checkdata content wrong json data. " )
487+ log .Fatal ("File given by --checkdata content wrong json data" )
471488 return
472489 }
473490
474491 resultData ["source_path_full" ] = checkData
475492 resultData ["source_path_parts" ] = strings .Split (checkData , string (os .PathSeparator ))
476493 } else {
477- log .Err ("ERROR: File given by --checkdata not found" )
494+ log .Err ("File given by --checkdata not found" )
478495 return
479496 }
480497
481498 if resultData != nil {
482499 checkId = pyraconv .ToString (resultData ["checkId" ])
483500 } else {
484- log .Fatal ("ERROR: Content given by --checkdata is wrong json content. " )
501+ log .Fatal ("Content defined by ' --checkdata' is invalid JSON " )
485502 }
486503
487504 checkId = strings .ToUpper (checkId )
@@ -490,7 +507,7 @@ func main() {
490507
491508 err := reorderHosts (resultData )
492509 if err != nil {
493- log .Err ("There is no data to generate the report. " )
510+ log .Err ("There is no data to generate the report" )
494511 }
495512
496513 config := cfg .NewConfig ()
@@ -511,13 +528,13 @@ func main() {
511528
512529 reportDone := generateMdReports (checkId , resultData , outputDir )
513530 if ! reportDone {
514- log .Fatal ("Cannot generate report. Data file or template is wrong. " )
531+ log .Fatal ("Cannot generate report. Data file or template is wrong" )
515532 }
516533}
517534
518535func preprocessReportData (checkId string , config cfg.Config ,
519536 data map [string ]interface {}) error {
520- switch checkId {
537+ switch strings . ToUpper ( checkId ) {
521538 case "A002" :
522539 // Try to load actual Postgres versions.
523540 err := config .LoadVersions ()
0 commit comments