Moved http Client into struct.

Formatted url creation
Whyeasy · Jun 24, 2020 · cd4818b · cd4818b
1 parent 25bc0ff
commit cd4818b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/lib/client/client.go b/lib/client/client.go
@@ -35,29 +35,25 @@ type MeasurementsStats struct {
 
 //ExporterClient contains SonarCloud information for connecting
 type ExporterClient struct {
-	Token        string
-	Organization string
+	sqc *sonar.Client
 }
 
 //New returns a new Client connection to SonarCloud
 func New(c internal.Config) *ExporterClient {
 	return &ExporterClient{
-		Token:        c.Token,
-		Organization: c.Organization,
+		sqc: sonar.NewClient(c.Token, c.Organization),
 	}
 }
 
 //GetStats retrieves data from API to create metrics from.
 func (c *ExporterClient) GetStats() (*Stats, error) {
 
-	sqc := sonar.NewClient(c.Token, c.Organization)
-
-	projects, err := getProjects(sqc)
+	projects, err := getProjects(c.sqc)
 	if err != nil {
 		return nil, err
 	}
 
-	measurements, err := getMeasurements(sqc, projects)
+	measurements, err := getMeasurements(c.sqc, projects)
 	if err != nil {
 		return nil, err
 	}

diff --git a/lib/sonar/measurements.go b/lib/sonar/measurements.go
@@ -2,6 +2,7 @@ package sonar
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 )
@@ -24,7 +25,8 @@ type MeasurementResponse struct {
 
 //ProjectMeasurements retrieves the measurements we pass through about the projects.
 func (c *Client) ProjectMeasurements(key string) (*MeasurementResponse, error) {
-	url := c.sonarConnectionString + "/measures/component?metricKeys=ncloc,coverage,vulnerabilities,bugs,violations&component=" + key
+
+	url := fmt.Sprintf("%s/measures/component?metricKeys=ncloc,coverage,vulnerabilities,bugs,violations&component=%s", c.sonarConnectionString, key)
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {

diff --git a/lib/sonar/projects.go b/lib/sonar/projects.go
@@ -2,6 +2,7 @@ package sonar
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -28,7 +29,7 @@ type ProjectResponse struct {
 //ListProjects lists the current projects in the organization.
 func (c *Client) ListProjects(opt *ListOptions) (*ProjectResponse, error) {
 
-	url := c.sonarConnectionString + "/projects/search?organization=" + c.organization + "&p=" + strconv.Itoa(opt.Page)
+	url := fmt.Sprintf("%s/projects/search?organization=%s&p=%s", c.sonarConnectionString, c.organization, strconv.Itoa(opt.Page))
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {