Make private methods unpublished

core/agents/spotify/client.go

@@ -25,17 +25,17 @@ type httpDoer interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
-func NewClient(id, secret string, hc httpDoer) *Client {
-	return &Client{id, secret, hc}
+func newClient(id, secret string, hc httpDoer) *client {
+	return &client{id, secret, hc}
 }
 
-type Client struct {
+type client struct {
 	id     string
 	secret string
 	hc     httpDoer
 }
 
-func (c *Client) SearchArtists(ctx context.Context, name string, limit int) ([]Artist, error) {
+func (c *client) searchArtists(ctx context.Context, name string, limit int) ([]Artist, error) {
 	token, err := c.authorize(ctx)
 	if err != nil {
 		return nil, err
@@ -46,7 +46,7 @@ func (c *Client) SearchArtists(ctx context.Context, name string, limit int) ([]A
 	params.Add("q", name)
 	params.Add("offset", "0")
 	params.Add("limit", strconv.Itoa(limit))
-	req, _ := http.NewRequest("GET", apiBaseUrl+"search", nil)
+	req, _ := http.NewRequestWithContext(ctx, "GET", apiBaseUrl+"search", nil)
 	req.URL.RawQuery = params.Encode()
 	req.Header.Add("Authorization", "Bearer "+token)
 
@@ -62,12 +62,12 @@ func (c *Client) SearchArtists(ctx context.Context, name string, limit int) ([]A
 	return results.Artists.Items, err
 }
 
-func (c *Client) authorize(ctx context.Context) (string, error) {
+func (c *client) authorize(ctx context.Context) (string, error) {
 	payload := url.Values{}
 	payload.Add("grant_type", "client_credentials")
 
 	encodePayload := payload.Encode()
-	req, _ := http.NewRequest("POST", "https://accounts.spotify.com/api/token", strings.NewReader(encodePayload))
+	req, _ := http.NewRequestWithContext(ctx, "POST", "https://accounts.spotify.com/api/token", strings.NewReader(encodePayload))
 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Content-Length", strconv.Itoa(len(encodePayload)))
 	auth := c.id + ":" + c.secret
@@ -86,7 +86,7 @@ func (c *Client) authorize(ctx context.Context) (string, error) {
 	return "", errors.New("invalid response")
 }
 
-func (c *Client) makeRequest(req *http.Request, response interface{}) error {
+func (c *client) makeRequest(req *http.Request, response interface{}) error {
 	resp, err := c.hc.Do(req)
 	if err != nil {
 		return err
@@ -105,7 +105,7 @@ func (c *Client) makeRequest(req *http.Request, response interface{}) error {
 	return json.Unmarshal(data, response)
 }
 
-func (c *Client) parseError(data []byte) error {
+func (c *client) parseError(data []byte) error {
 	var e Error
 	err := json.Unmarshal(data, &e)
 	if err != nil {

core/agents/spotify/client_test.go

@@ -11,13 +11,13 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Client", func() {
+var _ = Describe("client", func() {
 	var httpClient *fakeHttpClient
-	var client *Client
+	var client *client
 
 	BeforeEach(func() {
 		httpClient = &fakeHttpClient{}
-		client = NewClient("SPOTIFY_ID", "SPOTIFY_SECRET", httpClient)
+		client = newClient("SPOTIFY_ID", "SPOTIFY_SECRET", httpClient)
 	})
 
 	Describe("ArtistImages", func() {
@@ -29,7 +29,7 @@ var _ = Describe("Client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),
 			})
 
-			artists, err := client.SearchArtists(context.TODO(), "U2", 10)
+			artists, err := client.searchArtists(context.TODO(), "U2", 10)
 			Expect(err).To(BeNil())
 			Expect(artists).To(HaveLen(20))
 			Expect(artists[0].Popularity).To(Equal(82))
@@ -55,7 +55,7 @@ var _ = Describe("Client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(`{"access_token": "NEW_ACCESS_TOKEN","token_type": "Bearer","expires_in": 3600}`)),
 			})
 
-			_, err := client.SearchArtists(context.TODO(), "U2", 10)
+			_, err := client.searchArtists(context.TODO(), "U2", 10)
 			Expect(err).To(MatchError(ErrNotFound))
 		})
 
@@ -67,7 +67,7 @@ var _ = Describe("Client", func() {
 				Body:       io.NopCloser(bytes.NewBufferString(`{"error":"invalid_client","error_description":"Invalid client"}`)),
 			})
 
-			_, err := client.SearchArtists(context.TODO(), "U2", 10)
+			_, err := client.searchArtists(context.TODO(), "U2", 10)
 			Expect(err).To(MatchError("spotify error(invalid_client): Invalid client"))
 		})
 	})

core/agents/spotify/spotify.go

@@ -23,7 +23,7 @@ type spotifyAgent struct {
 	ds     model.DataStore
 	id     string
 	secret string
-	client *Client
+	client *client
 }
 
 func spotifyConstructor(ds model.DataStore) agents.Interface {
@@ -36,7 +36,7 @@ func spotifyConstructor(ds model.DataStore) agents.Interface {
 		Timeout: consts.DefaultHttpClientTimeOut,
 	}
 	chc := utils.NewCachedHTTPClient(hc, consts.DefaultHttpClientTimeOut)
-	l.client = NewClient(l.id, l.secret, chc)
+	l.client = newClient(l.id, l.secret, chc)
 	return l
 }
 
@@ -66,7 +66,7 @@ func (s *spotifyAgent) GetArtistImages(ctx context.Context, id, name, mbid strin
 }
 
 func (s *spotifyAgent) searchArtist(ctx context.Context, name string) (*Artist, error) {
-	artists, err := s.client.SearchArtists(ctx, name, 40)
+	artists, err := s.client.searchArtists(ctx, name, 40)
 	if err != nil || len(artists) == 0 {
 		return nil, model.ErrNotFound
 	}