@@ -45,8 +45,6 @@ const (
4545 lineBreak2 = "|----------------------------------------------------------------|"
4646)
4747
48-
49-
5048type (
5149 Config struct {
5250 Key string
9189 SkipScan bool
9290 WaitQualityGate bool
9391 Workspace string
94- SonarOPS string
92+ SonarOPS string
9593 }
9694 Output struct {
9795 OutputFile string // File where plugin output are saved
@@ -186,8 +184,6 @@ type (
186184 }
187185)
188186
189-
190-
191187type AnalysisResponse struct {
192188 Analyses []struct {
193189 Key string `json:"key"`
@@ -516,15 +512,18 @@ func (p Plugin) Exec() error {
516512
517513 if p .Config .TaskId != "" || p .Config .SkipScan {
518514 fmt .Println ("Skipping Scan..." )
519- fmt .Println ("\n Waiting for quality gate validation...\n " )
515+ fmt .Println ("" )
516+ fmt .Println ("Waiting for quality gate validation..." )
517+ fmt .Println ("" )
520518 status , err = PreFlightGetLatestTaskID (p .Config )
521519 if err != nil {
522520 fmt .Printf ("\n \n ==> Error getting the latest scanID\n \n " )
523521 logConfigInfo ("Error" , err .Error ())
524522 return err
525523 }
526524 } else {
527- fmt .Println ("Starting Analysis\n " )
525+ fmt .Println ("Starting Analysis" )
526+ fmt .Println ("" )
528527 cmd := exec .Command ("sonar-scanner" , args ... )
529528 cmd .Stdout = os .Stdout
530529 cmd .Stderr = os .Stderr
@@ -534,7 +533,13 @@ func (p Plugin) Exec() error {
534533 logConfigInfo ("Error" , err .Error ())
535534 // return err
536535 }
537- fmt .Println ("\n ==> Sonar Analysis Finished!\n \n Static Analysis Result:\n \n " )
536+ fmt .Println ("" )
537+ fmt .Println ("==> Sonar Analysis Finished!" )
538+ fmt .Println ("" )
539+ fmt .Println ("" )
540+ fmt .Println ("Static Analysis Result:" )
541+ fmt .Println ("" )
542+ fmt .Println ("" )
538543
539544 cmd = exec .Command ("cat" , taskFilePath )
540545 cmd .Stdout = os .Stdout
@@ -570,21 +575,25 @@ func (p Plugin) Exec() error {
570575 return err
571576 }
572577
573- fmt .Println ("Waiting for quality gate validation...\n " )
578+ fmt .Println ("Waiting for quality gate validation..." )
579+ fmt .Println ("" )
574580
575581 status = getStatus (task , report )
576582 } else {
577- fmt .Println ("Delaying for quality gate validation...\n " )
583+ fmt .Println ("Delaying for quality gate validation..." )
584+ fmt .Println ("" )
578585 status = "OK"
579586 }
580587 }
581-
582- fmt .Println ("\n ==> SONAR PROJECT DASHBOARD <==" )
588+ fmt .Println ("" )
589+ fmt .Println ("==> SONAR PROJECT DASHBOARD <==" )
590+ fmt .Println ("" )
583591 fmt .Println (p .Config .Host + sonarDashStatic + p .Config .Key )
584- fmt .Println ("\n ==> Harness CIE SonarQube Plugin with Quality Gateway <==\n " )
592+ fmt .Println ("==> Harness CIE SonarQube Plugin with Quality Gateway <==" )
593+ fmt .Println ("" )
585594
586595 displayQualityGateStatus (status , p .Config .QualityEnabled == "true" )
587-
596+
588597 if status != p .Config .Quality && p .Config .QualityEnabled == "true" {
589598 fmt .Fprintln (os .Stderr , "ERROR: QualityGate status failed." )
590599 logrus .WithFields (logrus.Fields {
@@ -684,9 +693,6 @@ func getStatus(task *TaskResponse, report *SonarReport) string {
684693 }
685694 }
686695
687- // reportRequest := url.Values{
688- // "analysisId": {task.Task.AnalysisID},
689- // }
690696 sonarToken := os .Getenv ("PLUGIN_SONAR_TOKEN" )
691697
692698 // First try with Basic Auth
@@ -810,12 +816,12 @@ func getStatusID(taskIDOld string, sonarHost string, projectSlug string) (string
810816 qg_projectKey := os .Getenv ("PLUGIN_SONAR_KEY" )
811817
812818 fmt .Printf ("%+v" , projectReport )
813- fmt .Printf ( " \n " )
819+ fmt .Println ( " " )
814820 result := ParseJunit (projectReport , qg_projectKey )
815821 file , _ := xml .MarshalIndent (result , "" , " " )
816822 _ = os .WriteFile ("sonarResults.xml" , file , 0644 )
817823
818- fmt .Printf ( " \n " )
824+ fmt .Println ( " " )
819825 fmt .Printf ("\n ======> JUNIT Exporter <======\n " )
820826
821827 //JUNIT
0 commit comments