From dea1d3383c5f0487d037e86bc476f7c725117609 Mon Sep 17 00:00:00 2001
From: "m.nabokikh" <maksim.nabokikh@flant.com>
Date: Mon, 24 May 2021 19:34:22 +0400
Subject: [PATCH] Deprecation warning log message
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
---
connector/ldap/ldap.go | 2 +-
pkg/log/deprecated.go | 5 +++++
server/deviceflowhandlers.go | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 pkg/log/deprecated.go
diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go
index 75a7d284..1b995181 100644
--- a/connector/ldap/ldap.go
+++ b/connector/ldap/ldap.go
@@ -192,7 +192,7 @@ func userMatchers(c *Config, logger log.Logger) []UserMatcher {
return c.GroupSearch.UserMatchers
}
- logger.Warn(`ldap: fields groupSearch userAttr/groupAttr are deprecated, use groupSearch.userMatchers instead.`)
+ log.Deprecated(logger, `LDAP: use groupSearch.userMatchers option instead of "userAttr/groupAttr" fields.`)
return []UserMatcher{
{
UserAttr: c.GroupSearch.UserAttr,
diff --git a/pkg/log/deprecated.go b/pkg/log/deprecated.go
new file mode 100644
index 00000000..f20e8b4c
--- /dev/null
+++ b/pkg/log/deprecated.go
@@ -0,0 +1,5 @@
+package log
+
+func Deprecated(logger Logger, f string, args ...interface{}) {
+ logger.Warnf("Deprecated: "+f, args...)
+}
diff --git a/server/deviceflowhandlers.go b/server/deviceflowhandlers.go
index 5ec7eb8e..fb73f257 100644
--- a/server/deviceflowhandlers.go
+++ b/server/deviceflowhandlers.go
@@ -11,6 +11,7 @@ import (
"strings"
"time"
+ "github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
)
@@ -152,7 +153,7 @@ func (s *Server) handleDeviceCode(w http.ResponseWriter, r *http.Request) {
}
func (s *Server) handleDeviceTokenDeprecated(w http.ResponseWriter, r *http.Request) {
- s.logger.Warn(`The deprecated "/device/token" endpoint was called. It will be removed, use "/token" instead.`)
+ log.Deprecated(s.logger, `The /device/token endpoint was called. It will be removed, use /token instead.`)
w.Header().Set("Content-Type", "application/json")
switch r.Method {
--
GitLab