reverting formatting changes

pkg/apis/options/legacy_options.go

@@ -192,9 +192,10 @@ type LegacyHeaders struct {
 	PassUserHeaders   bool `flag:"pass-user-headers" cfg:"pass_user_headers"`
 	PassAuthorization bool `flag:"pass-authorization-header" cfg:"pass_authorization_header"`
 
-	SetBasicAuth          bool `flag:"set-basic-auth" cfg:"set_basic_auth"`
-	SetXAuthRequest       bool `flag:"set-xauthrequest" cfg:"set_xauthrequest"`
-	SetAuthorization      bool `flag:"set-authorization-header" cfg:"set_authorization_header"`
+	SetBasicAuth     bool `flag:"set-basic-auth" cfg:"set_basic_auth"`
+	SetXAuthRequest  bool `flag:"set-xauthrequest" cfg:"set_xauthrequest"`
+	SetAuthorization bool `flag:"set-authorization-header" cfg:"set_authorization_header"`
+
 	SetIntrospectionValue bool `flag:"set-introspection-value" cfg:"set_introspection_value"`
 
 	PreferEmailToUser    bool   `flag:"prefer-email-to-user" cfg:"prefer_email_to_user"`

pkg/apis/sessions/session_state.go

@@ -31,9 +31,10 @@ type SessionState struct {
 	IntrospectClaims  string   `msgpack:"ic,omitempty"`
 
 	// Internal helpers, not serialized
-	Clock                clock.Clock `msgpack:"-"`
-	Lock                 Lock        `msgpack:"-"`
-	SessionJustRefreshed bool        `msgpack:"-"`
+	Clock clock.Clock `msgpack:"-"`
+	Lock  Lock        `msgpack:"-"`
+
+	SessionJustRefreshed bool `msgpack:"-"`
 }
 
 func (s *SessionState) ObtainLock(ctx context.Context, expiration time.Duration) error {

pkg/providers/oidc/provider.go

@@ -24,10 +24,11 @@ type providerJSON struct {
 // Endpoints represents the endpoints discovered as part of the OIDC discovery process
 // that will be used by the authentication providers.
 type Endpoints struct {
-	AuthURL            string
-	TokenURL           string
-	JWKsURL            string
-	UserInfoURL        string
+	AuthURL     string
+	TokenURL    string
+	JWKsURL     string
+	UserInfoURL string
+
 	IntrospectEndpoint string
 }
 
@@ -91,10 +92,11 @@ type discoveryProvider struct {
 // Endpoints returns the discovered endpoints needed for an authentication provider.
 func (p *discoveryProvider) Endpoints() Endpoints {
 	return Endpoints{
-		AuthURL:            p.authURL,
-		TokenURL:           p.tokenURL,
-		JWKsURL:            p.jwksURL,
-		UserInfoURL:        p.userInfoURL,
+		AuthURL:     p.authURL,
+		TokenURL:    p.tokenURL,
+		JWKsURL:     p.jwksURL,
+		UserInfoURL: p.userInfoURL,
+
 		IntrospectEndpoint: p.introspectEndpoint,
 	}
 }

pkg/util/util_test.go

@@ -87,7 +87,7 @@ mmu20Q5sWqggb0WNk1GoHIlpiObgY38KfnNSZ5Ra/QuXLF3QM2NdK5bT1iNFfPG3
 fQklEouz/2lqZkRhsKSeXFKQ+h8GtNevKwFg6y3wWvH62WF5mTe9eyUE9VWl64y6
 js5ESoVXA+e+QfsMsJrI5XfLV1O8ZxXKAVrYxBnC+WQbrNOjI7VBkjcn/QDmDjBw
 sC1lo4YZwxEQ/bE0kEWI7PT/Skml4bTLw0jsgXNV9Nd8
------END CERTIFICATE-----
+-----END CERTIFICATE-----		
 `
 	cert1CertSubj = "CN=oauth2-proxy test cert1 ca"
 	cert1Cert     = `-----BEGIN CERTIFICATE-----