From a02f2e8facfe8f1484aee0883b3229e670ffd30e Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Wed, 25 May 2022 11:17:34 +0200
Subject: [PATCH] chore: fix lint violations
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
---
connector/keystone/keystone.go | 3 ++-
connector/keystone/keystone_test.go | 9 ++++-----
connector/ldap/ldap.go | 3 ++-
connector/openshift/openshift.go | 12 ++++++++----
storage/conformance/jwks.go | 1 -
storage/ent/mysql.go | 5 +----
storage/ent/postgres.go | 4 +---
storage/ent/sqlite.go | 4 +---
storage/kubernetes/storage_test.go | 2 +-
storage/sql/crud_test.go | 1 +
storage/sql/migrate_test.go | 1 +
storage/sql/postgres_test.go | 1 +
storage/sql/sqlite.go | 1 +
storage/sql/sqlite_test.go | 1 +
14 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/connector/keystone/keystone.go b/connector/keystone/keystone.go
index c4e98d05..db97b5a7 100644
--- a/connector/keystone/keystone.go
+++ b/connector/keystone/keystone.go
@@ -168,7 +168,8 @@ func (p *conn) Login(ctx context.Context, scopes connector.Scopes, username, pas
func (p *conn) Prompt() string { return "username" }
func (p *conn) Refresh(
- ctx context.Context, scopes connector.Scopes, identity connector.Identity) (connector.Identity, error) {
+ ctx context.Context, scopes connector.Scopes, identity connector.Identity,
+) (connector.Identity, error) {
token, err := p.getAdminToken(ctx)
if err != nil {
return identity, fmt.Errorf("keystone: failed to obtain admin token: %v", err)
diff --git a/connector/keystone/keystone_test.go b/connector/keystone/keystone_test.go
index cf007f19..fc6c01e2 100644
--- a/connector/keystone/keystone_test.go
+++ b/connector/keystone/keystone_test.go
@@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/json"
- "fmt"
"io"
"net/http"
"os"
@@ -454,22 +453,22 @@ func setupVariables(t *testing.T) {
keystoneAdminPassEnv := "DEX_KEYSTONE_ADMIN_PASS"
keystoneURL = os.Getenv(keystoneURLEnv)
if keystoneURL == "" {
- t.Skip(fmt.Sprintf("variable %q not set, skipping keystone connector tests\n", keystoneURLEnv))
+ t.Skipf("variable %q not set, skipping keystone connector tests\n", keystoneURLEnv)
return
}
keystoneAdminURL = os.Getenv(keystoneAdminURLEnv)
if keystoneAdminURL == "" {
- t.Skip(fmt.Sprintf("variable %q not set, skipping keystone connector tests\n", keystoneAdminURLEnv))
+ t.Skipf("variable %q not set, skipping keystone connector tests\n", keystoneAdminURLEnv)
return
}
adminUser = os.Getenv(keystoneAdminUserEnv)
if adminUser == "" {
- t.Skip(fmt.Sprintf("variable %q not set, skipping keystone connector tests\n", keystoneAdminUserEnv))
+ t.Skipf("variable %q not set, skipping keystone connector tests\n", keystoneAdminUserEnv)
return
}
adminPass = os.Getenv(keystoneAdminPassEnv)
if adminPass == "" {
- t.Skip(fmt.Sprintf("variable %q not set, skipping keystone connector tests\n", keystoneAdminPassEnv))
+ t.Skipf("variable %q not set, skipping keystone connector tests\n", keystoneAdminPassEnv)
return
}
authTokenURL = keystoneURL + "/v3/auth/tokens/"
diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go
index df69d60e..54340271 100644
--- a/connector/ldap/ldap.go
+++ b/connector/ldap/ldap.go
@@ -220,7 +220,8 @@ func (c *Config) OpenConnector(logger log.Logger) (interface {
connector.Connector
connector.PasswordConnector
connector.RefreshConnector
-}, error) {
+}, error,
+) {
return c.openConnector(logger)
}
diff --git a/connector/openshift/openshift.go b/connector/openshift/openshift.go
index 05919973..81d2b356 100644
--- a/connector/openshift/openshift.go
+++ b/connector/openshift/openshift.go
@@ -78,7 +78,8 @@ func (c *Config) Open(id string, logger log.Logger) (conn connector.Connector, e
// OpenWithHTTPClient returns a connector which can be used to login users through an upstream
// OpenShift OAuth2 provider. It provides the ability to inject a http.Client.
func (c *Config) OpenWithHTTPClient(id string, logger log.Logger,
- httpClient *http.Client) (conn connector.Connector, err error) {
+ httpClient *http.Client,
+) (conn connector.Connector, err error) {
ctx, cancel := context.WithCancel(context.Background())
wellKnownURL := strings.TrimSuffix(c.Issuer, "/") + wellKnownURLPath
@@ -156,7 +157,8 @@ func (e *oauth2Error) Error() string {
// HandleCallback parses the request and returns the user's identity
func (c *openshiftConnector) HandleCallback(s connector.Scopes,
- r *http.Request) (identity connector.Identity, err error) {
+ r *http.Request,
+) (identity connector.Identity, err error) {
q := r.URL.Query()
if errType := q.Get("error"); errType != "" {
return identity, &oauth2Error{errType, q.Get("error_description")}
@@ -176,7 +178,8 @@ func (c *openshiftConnector) HandleCallback(s connector.Scopes,
}
func (c *openshiftConnector) Refresh(ctx context.Context, s connector.Scopes,
- oldID connector.Identity) (connector.Identity, error) {
+ oldID connector.Identity,
+) (connector.Identity, error) {
var token oauth2.Token
err := json.Unmarshal(oldID.ConnectorData, &token)
if err != nil {
@@ -189,7 +192,8 @@ func (c *openshiftConnector) Refresh(ctx context.Context, s connector.Scopes,
}
func (c *openshiftConnector) identity(ctx context.Context, s connector.Scopes,
- token *oauth2.Token) (identity connector.Identity, err error) {
+ token *oauth2.Token,
+) (identity connector.Identity, err error) {
client := c.oauth2Config.Client(ctx, token)
user, err := c.user(ctx, client)
if err != nil {
diff --git a/storage/conformance/jwks.go b/storage/conformance/jwks.go
index f42d3d18..0f05703e 100644
--- a/storage/conformance/jwks.go
+++ b/storage/conformance/jwks.go
@@ -11,7 +11,6 @@ type keyPair struct {
// keys are generated beforehand so we don't have to generate RSA keys for every test.
var jsonWebKeys = []keyPair{
-
{
Public: mustLoadJWK(`{
"use": "sig",
diff --git a/storage/ent/mysql.go b/storage/ent/mysql.go
index c922eb16..2d3c833b 100644
--- a/storage/ent/mysql.go
+++ b/storage/ent/mysql.go
@@ -14,10 +14,7 @@ import (
entSQL "entgo.io/ent/dialect/sql"
"entgo.io/ent/dialect/sql/schema"
- "github.com/go-sql-driver/mysql"
-
- // Register postgres driver.
- _ "github.com/lib/pq"
+ "github.com/go-sql-driver/mysql" // Register mysql driver.
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
diff --git a/storage/ent/postgres.go b/storage/ent/postgres.go
index 3e8df441..c52c2902 100644
--- a/storage/ent/postgres.go
+++ b/storage/ent/postgres.go
@@ -13,9 +13,7 @@ import (
entSQL "entgo.io/ent/dialect/sql"
"entgo.io/ent/dialect/sql/schema"
-
- // Register postgres driver.
- _ "github.com/lib/pq"
+ _ "github.com/lib/pq" // Register postgres driver.
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
diff --git a/storage/ent/sqlite.go b/storage/ent/sqlite.go
index 3e54e1b7..bb98ac06 100644
--- a/storage/ent/sqlite.go
+++ b/storage/ent/sqlite.go
@@ -7,9 +7,7 @@ import (
"entgo.io/ent/dialect/sql"
"entgo.io/ent/dialect/sql/schema"
-
- // Register sqlite driver.
- _ "github.com/mattn/go-sqlite3"
+ _ "github.com/mattn/go-sqlite3" // Register sqlite driver.
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go
index 4571327a..828ff472 100644
--- a/storage/kubernetes/storage_test.go
+++ b/storage/kubernetes/storage_test.go
@@ -24,7 +24,7 @@ const kubeconfigPathVariableName = "DEX_KUBERNETES_CONFIG_PATH"
func TestStorage(t *testing.T) {
if os.Getenv(kubeconfigPathVariableName) == "" {
- t.Skip(fmt.Sprintf("variable %q not set, skipping kubernetes storage tests\n", kubeconfigPathVariableName))
+ t.Skipf("variable %q not set, skipping kubernetes storage tests\n", kubeconfigPathVariableName)
}
suite.Run(t, new(StorageTestSuite))
diff --git a/storage/sql/crud_test.go b/storage/sql/crud_test.go
index 9e3282e5..7cca1d6f 100644
--- a/storage/sql/crud_test.go
+++ b/storage/sql/crud_test.go
@@ -1,3 +1,4 @@
+//go:build cgo
// +build cgo
package sql
diff --git a/storage/sql/migrate_test.go b/storage/sql/migrate_test.go
index 7ec6d957..4b77eb2f 100644
--- a/storage/sql/migrate_test.go
+++ b/storage/sql/migrate_test.go
@@ -1,3 +1,4 @@
+//go:build cgo
// +build cgo
package sql
diff --git a/storage/sql/postgres_test.go b/storage/sql/postgres_test.go
index d58abc70..3e5f8a8f 100644
--- a/storage/sql/postgres_test.go
+++ b/storage/sql/postgres_test.go
@@ -1,3 +1,4 @@
+//go:build go1.11
// +build go1.11
package sql
diff --git a/storage/sql/sqlite.go b/storage/sql/sqlite.go
index 0994b190..43df671a 100644
--- a/storage/sql/sqlite.go
+++ b/storage/sql/sqlite.go
@@ -1,3 +1,4 @@
+//go:build cgo
// +build cgo
package sql
diff --git a/storage/sql/sqlite_test.go b/storage/sql/sqlite_test.go
index 8be99390..89d06aee 100644
--- a/storage/sql/sqlite_test.go
+++ b/storage/sql/sqlite_test.go
@@ -1,3 +1,4 @@
+//go:build cgo
// +build cgo
package sql
--
GitLab