Go mod (#1)

s12v · May 10, 2019 · a674b38 · a674b38
1 parent f1e704a
commit a674b38
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,13 @@
 language: go
 
 go:
-  - "1.8"
-  - "1.9"
-  - "1.10"
+  - "1.12"
 
-install:
-  - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-  - dep ensure
+env:
+  - GO111MODULE=on
 
 script:
-  - go test . -v -coverprofile=coverage.txt -covermode=atomic
+  - make
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/Makefile b/Makefile
@@ -0,0 +1,8 @@
+.PHONY: all
+all: clean test
+
+clean:
+	rm -rf ./bin || true
+
+test:
+	go test -v ./... -coverprofile=coverage.txt -covermode=atomic
diff --git a/README.md b/README.md
@@ -6,8 +6,10 @@ A Go library to retrieve RSA public keys from a JWKS (JSON Web Key Set) endpoint
 
 ## Installation
 
+Using [Go modules](https://github.com/golang/go/wiki/Modules)
+
 ```bash
-dep ensure --add "github.com/s12v/go-jwks@v0.1.1"
+go get github.com/s12v/go-jwks@v0.2.0
 ```
 
 ## Dependencies

diff --git a/cache.go b/cache.go
@@ -1,9 +1,9 @@
 package jwks
 
 import (
+	"fmt"
 	"github.com/patrickmn/go-cache"
 	"time"
-	"fmt"
 )
 
 type Cache interface {

diff --git a/cache_test.go b/cache_test.go
@@ -1,8 +1,8 @@
 package jwks
 
 import (
-	"testing"
 	"github.com/patrickmn/go-cache"
+	"testing"
 	"time"
 )
 

diff --git a/client.go b/client.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/square/go-jose"
 	"golang.org/x/sync/semaphore"
-	"time"
 	"log"
+	"time"
 )
 
 type JWKSClient interface {

diff --git a/client_test.go b/client_test.go
@@ -1,8 +1,8 @@
 package jwks
 
 import (
-	"testing"
 	"github.com/square/go-jose"
+	"testing"
 	"time"
 )
 

diff --git a/go.mod b/go.mod
@@ -0,0 +1,12 @@
+module github.com/s12v/go-jwks
+
+go 1.12
+
+require (
+	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/square/go-jose v2.1.6+incompatible
+	golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8
+	golang.org/x/net v0.0.0-20180729183719-c4299a1a0d85
+	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
+	gopkg.in/square/go-jose.v2 v2.3.1 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,12 @@
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/square/go-jose v2.1.6+incompatible h1:vlXeaqoFPTA+Q4bWegkZ8PhPq6Ke9np2Bkyi09tMdQc=
+github.com/square/go-jose v2.1.6+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8=
+golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8 h1:h7zdf0RiEvWbYBKIx4b+q41xoUVnMmvsGZnIVE5syG8=
+golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20180729183719-c4299a1a0d85 h1:L8D6kGKB6IflRbLijfnSTkgmss6PZ/Q2MG7XefweZB4=
+golang.org/x/net v0.0.0-20180729183719-c4299a1a0d85/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
+gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
diff --git a/source.go b/source.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/square/go-jose"
-	"net/http"
 	"log"
+	"net/http"
 )
 
 type JWKSSource interface {