Support Go 1.14 (#419)

* Upgrade base image tags and golangci-lint

* Upgrade golang and golangci-lint in travis-ci

* fix:  tests, pointed out by golangci-lint and format files

* Upgrade dependencies

* update changelog

* fix: tests related to https://github.com/pusher/oauth2_proxy/pull/418

* Separate tests using go version build tags

* Update CHANGELOG

* Revert "Separate tests using go version build tags"

This reverts commit 9b7e65eb90cae954dc7b6316345d3207205d488a.

* fix test to support go1.14 and go1.13

Co-authored-by: Joel Speed <Joel.speed@hotmail.co.uk>
This commit is contained in:
Mitsuo Heijo
2020-03-14 10:14:15 +00:00
committed by GitHub
co-authored by Joel Speed
parent 400aea3653
commit 81b9a63e51
11 changed files with 90 additions and 77 deletions
+2 -2
View File
@@ -8,10 +8,10 @@ import (
"time"
oidc "github.com/coreos/go-oidc"
"golang.org/x/oauth2"
"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
"github.com/pusher/oauth2_proxy/pkg/requests"
"golang.org/x/oauth2"
)
// OIDCProvider represents an OIDC based Identity Provider
+7 -8
View File
@@ -8,20 +8,19 @@ import (
"encoding/json"
"errors"
"fmt"
"golang.org/x/oauth2"
"github.com/bmizerany/assert"
"github.com/coreos/go-oidc"
"github.com/dgrijalva/jwt-go"
"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
"net/http"
"net/http/httptest"
"net/url"
"strings"
"testing"
"time"
"github.com/bmizerany/assert"
"github.com/coreos/go-oidc"
"github.com/dgrijalva/jwt-go"
"golang.org/x/oauth2"
"github.com/pusher/oauth2_proxy/pkg/apis/sessions"
)
const accessToken = "access_token"