Skip to content

Commit bc47159

Browse files
quality issue fix - const for basicAuth
1 parent d431b3a commit bc47159

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

plugin.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ var (
3333

3434
// sonarDashStatic is a static string used in the dashboard URL.
3535
sonarDashStatic = "/dashboard?id="
36+
37+
// basicAuth is the basic authentication string.
38+
basicAuth = "Basic "
3639
)
3740

3841
type (
@@ -743,7 +746,7 @@ func getStatus(task *TaskResponse, report *SonarReport) string {
743746
}
744747
sonarToken := os.Getenv("PLUGIN_SONAR_TOKEN")
745748
projectRequest, err := http.NewRequest("GET", report.ServerURL+"/api/qualitygates/project_status?"+reportRequest.Encode(), nil)
746-
projectRequest.Header.Add("Authorization", "Basic "+sonarToken)
749+
projectRequest.Header.Add("Authorization", basicAuth+sonarToken)
747750
projectResponse, err := netClient.Do(projectRequest)
748751
if err != nil {
749752
logrus.WithFields(logrus.Fields{
@@ -817,7 +820,7 @@ func getStatusID(taskIDOld string, sonarHost string, projectSlug string) (string
817820
fmt.Printf("\n")
818821

819822
// projectRequest, err := http.NewRequest("GET", sonarHost+"/api/qualitygates/project_status?"+reportRequest.Encode(), nil)
820-
// projectRequest.Header.Add("Authorization", "Basic "+token)
823+
// projectRequest.Header.Add("Authorization", basicAuth+token)
821824
// projectResponse, err := netClient.Do(projectRequest)
822825
// if err != nil {
823826
// logrus.WithFields(logrus.Fields{
@@ -888,20 +891,20 @@ func GetProjectStatus(sonarHost string, analysisId string) ([]byte, error) {
888891
// fmt.Printf("Setting Authorization header:" + token)
889892
// Retry with the token encoded in base64
890893
encodedToken := base64.StdEncoding.EncodeToString([]byte(token))
891-
projectRequest.Header.Set("Authorization", "Basic "+encodedToken)
894+
projectRequest.Header.Set("Authorization", basicAuth+encodedToken)
892895

893-
// projectRequest.Header.Add("Authorization", "Basic "+token)
896+
// projectRequest.Header.Add("Authorization", basicAuth+token)
894897
projectResponse, err := netClient.Do(projectRequest)
895898

896899
if err != nil {
897900
fmt.Printf("\n")
898-
fmt.Printf("NIL - Error getting project status, trying again with bearer token...")
901+
fmt.Printf("NIL - Error getting project status, failed!")
899902

900903
return nil, err
901904

902905
}
903906
fmt.Printf("Response Code:" + projectResponse.Status)
904-
buf := []byte{}
907+
// buf := []byte{}
905908
// if status code 401 try again with bearer token
906909
if projectResponse.StatusCode == 401 {
907910
bearer := "Bearer " + token
@@ -984,7 +987,7 @@ func GetLatestTaskID(sonarHost string, projectSlug string) (string, error) {
984987
fmt.Printf("Retrying with encoded token...\n")
985988

986989
encodedToken := base64.StdEncoding.EncodeToString([]byte(sonarToken))
987-
req.Header.Add("Authorization", "Basic "+encodedToken)
990+
req.Header.Add("Authorization", basicAuth+encodedToken)
988991
fmt.Printf("Token encoded: %s\n", encodedToken)
989992
req.SetBasicAuth(encodedToken, "")
990993
resp, err = netClient.Do(req)
@@ -1032,7 +1035,7 @@ func GetLatestTaskID(sonarHost string, projectSlug string) (string, error) {
10321035
func getSonarJobStatus(report *SonarReport) *TaskResponse {
10331036

10341037
taskRequest, err := http.NewRequest("GET", report.CeTaskURL, nil)
1035-
taskRequest.Header.Add("Authorization", "Basic "+os.Getenv("PLUGIN_SONAR_TOKEN"))
1038+
taskRequest.Header.Add("Authorization", basicAuth+os.Getenv("PLUGIN_SONAR_TOKEN"))
10361039
taskResponse, err := netClient.Do(taskRequest)
10371040
if err != nil {
10381041
logrus.WithFields(logrus.Fields{

0 commit comments

Comments
 (0)