cleanup of imports, addition of logger interface, ability to change h…

…ttp.Client (#5)

* cleanup of imports, addition of logger interface, ability to change http.Client

* change way of working with default logging

README.md

@@ -25,10 +25,11 @@ go get github.com/s12v/[email protected]
 package main
 
 import (
+	"log"
+	"time"
+
 	"github.com/s12v/go-jwks"
 	"github.com/square/go-jose"
-	"time"
-	"log"
 )
 
 func main() {

cache.go

@@ -2,8 +2,9 @@ package jwks
 
 import (
 	"fmt"
-	"github.com/patrickmn/go-cache"
 	"time"
+
+	"github.com/patrickmn/go-cache"
 )
 
 type Cache interface {

cache_test.go

@@ -1,9 +1,10 @@
 package jwks
 
 import (
-	"github.com/patrickmn/go-cache"
 	"testing"
 	"time"
+
+	"github.com/patrickmn/go-cache"
 )
 
 func TestDefaultCache_Get(t *testing.T) {

client.go

@@ -2,10 +2,10 @@ package jwks
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/square/go-jose"
 	"golang.org/x/sync/semaphore"
-	"log"
-	"time"
 )
 
 type JWKSClient interface {
@@ -62,7 +62,7 @@ func (c *jWKSClient) GetKey(keyId string, use string) (jwk *jose.JSONWebKey, err
 			go func() {
 				defer c.sem.Release(1)
 				if _, err := c.refreshKey(keyId, use); err != nil {
-					log.Printf("unable to refresh key: %v", err)
+					logger.Printf("unable to refresh key: %v", err)
 				}
 			}()
 		}

client_mock.go

@@ -26,10 +26,10 @@ func (c *jWKSClientMock) GetKey(keyId string, use string) (*jose.JSONWebKey, err
 	return mockKey(c.secret), nil
 }
 
-func mockKey(secret string) (*jose.JSONWebKey) {
+func mockKey(secret string) *jose.JSONWebKey {
 	return &jose.JSONWebKey{
 		KeyID:     "key1",
 		Algorithm: "HS256",
-		Key: []byte(secret),
+		Key:       []byte(secret),
 	}
 }

client_test.go

@@ -1,9 +1,10 @@
 package jwks
 
 import (
-	"github.com/square/go-jose"
 	"testing"
 	"time"
+
+	"github.com/square/go-jose"
 )
 
 func TestJWKSClient_GetKey(t *testing.T) {
@@ -40,7 +41,7 @@ func TestJWKSClient_GetKeyWithPrefetch(t *testing.T) {
 		keyId,
 		&cacheEntry{
 			refresh: 0,
-			jwk: &mockJwk,
+			jwk:     &mockJwk,
 		},
 		time.Unix(0, 0),
 	)

logger.go

@@ -0,0 +1,22 @@
+package jwks
+
+import (
+	"log"
+)
+
+type jwksLogger interface {
+	Printf(format string, v ...interface{})
+}
+
+// This is necessary to work around go1.12 requirement
+type defaultLogger struct{}
+
+func (defaultLogger) Printf(format string, v ...interface{}) {
+	log.Printf(format, v...)
+}
+
+var logger jwksLogger = defaultLogger{}
+
+func SetLogger(l jwksLogger) {
+	logger = l
+}

source.go

@@ -3,9 +3,9 @@ package jwks
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/square/go-jose"
-	"log"
 	"net/http"
+
+	"github.com/square/go-jose"
 )
 
 type JWKSSource interface {
@@ -17,15 +17,19 @@ type WebSource struct {
 	jwksUri string
 }
 
-func NewWebSource(jwksUri string) *WebSource {
+func NewWebSource(jwksUri string, client *http.Client) *WebSource {
+	if client == nil {
+		client = new(http.Client)
+	}
+
 	return &WebSource{
-		client:  new(http.Client),
+		client:  client,
 		jwksUri: jwksUri,
 	}
 }
 
 func (s *WebSource) JSONWebKeySet() (*jose.JSONWebKeySet, error) {
-	log.Printf("Fetchng JWKS from %s", s.jwksUri)
+	logger.Printf("Fetching JWKS from %s", s.jwksUri)
 	resp, err := s.client.Get(s.jwksUri)
 	if err != nil {
 		return nil, err