From a4ee37dd3174d65944f4ea8942a1f29d16e73f09 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Mon, 7 Sep 2020 09:47:14 +0200 Subject: [PATCH] reformat imports --- pkg/op/authrequest_test.go | 1 - pkg/op/client.go | 3 ++- pkg/op/config_test.go | 7 ++++--- pkg/op/discovery_test.go | 11 ++++++----- pkg/op/mock/client.go | 6 +++--- pkg/op/signer.go | 1 + pkg/op/userinfo.go | 2 -- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkg/op/authrequest_test.go b/pkg/op/authrequest_test.go index 39df936..905c136 100644 --- a/pkg/op/authrequest_test.go +++ b/pkg/op/authrequest_test.go @@ -14,7 +14,6 @@ import ( "github.com/caos/oidc/pkg/op" "github.com/caos/oidc/pkg/op/mock" "github.com/caos/oidc/pkg/rp" - rp_mock "github.com/caos/oidc/pkg/rp/mock" "github.com/caos/oidc/pkg/utils" ) diff --git a/pkg/op/client.go b/pkg/op/client.go index 9e8a7dc..ef9b62e 100644 --- a/pkg/op/client.go +++ b/pkg/op/client.go @@ -1,8 +1,9 @@ package op import ( - "github.com/caos/oidc/pkg/oidc" "time" + + "github.com/caos/oidc/pkg/oidc" ) const ( diff --git a/pkg/op/config_test.go b/pkg/op/config_test.go index 473d9c1..79173fb 100644 --- a/pkg/op/config_test.go +++ b/pkg/op/config_test.go @@ -1,8 +1,9 @@ package op -import "testing" - -import "os" +import ( + "os" + "testing" +) func TestValidateIssuer(t *testing.T) { type args struct { diff --git a/pkg/op/discovery_test.go b/pkg/op/discovery_test.go index 39b39bc..c14fac4 100644 --- a/pkg/op/discovery_test.go +++ b/pkg/op/discovery_test.go @@ -6,12 +6,13 @@ import ( "reflect" "testing" - "github.com/caos/oidc/pkg/oidc" - "github.com/caos/oidc/pkg/op" - "github.com/caos/oidc/pkg/op/mock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "gopkg.in/square/go-jose.v2" + + "github.com/caos/oidc/pkg/oidc" + "github.com/caos/oidc/pkg/op" + "github.com/caos/oidc/pkg/op/mock" ) func TestDiscover(t *testing.T) { @@ -147,7 +148,7 @@ func TestSupportedClaims(t *testing.T) { } func Test_SigAlgorithms(t *testing.T) { - m := mock.NewMockSigner(gomock.NewController((t))) + m := mock.NewMockSigner(gomock.NewController(t)) type args struct { s op.Signer } @@ -199,7 +200,7 @@ func Test_SubjectTypes(t *testing.T) { } func Test_AuthMethods(t *testing.T) { - m := mock.NewMockConfiguration(gomock.NewController((t))) + m := mock.NewMockConfiguration(gomock.NewController(t)) type args struct { c op.Configuration } diff --git a/pkg/op/mock/client.go b/pkg/op/mock/client.go index b0d0dca..eed21d5 100644 --- a/pkg/op/mock/client.go +++ b/pkg/op/mock/client.go @@ -1,12 +1,12 @@ package mock import ( - "github.com/caos/oidc/pkg/oidc" "testing" - gomock "github.com/golang/mock/gomock" + "github.com/golang/mock/gomock" - op "github.com/caos/oidc/pkg/op" + "github.com/caos/oidc/pkg/oidc" + "github.com/caos/oidc/pkg/op" ) func NewClient(t *testing.T) op.Client { diff --git a/pkg/op/signer.go b/pkg/op/signer.go index b4f770e..a313934 100644 --- a/pkg/op/signer.go +++ b/pkg/op/signer.go @@ -8,6 +8,7 @@ import ( "gopkg.in/square/go-jose.v2" "github.com/caos/logging" + "github.com/caos/oidc/pkg/oidc" ) diff --git a/pkg/op/userinfo.go b/pkg/op/userinfo.go index 3b4ea10..88ba955 100644 --- a/pkg/op/userinfo.go +++ b/pkg/op/userinfo.go @@ -5,8 +5,6 @@ import ( "net/http" "strings" - "github.com/gorilla/schema" - "github.com/caos/oidc/pkg/oidc" "github.com/caos/oidc/pkg/utils" )