go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-08-10 22:51:31 +02:00
Code Issues Releases Activity

Integrate klog into providers package

Browse Source
This commit is contained in:
Joel Speed
2021-09-30 15:59:23 +01:00
parent 80cdecff8a
commit 28f3aef69b
11 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
providers/gitlab.go
View File

@@ -8,8 +8,8 @@ import (
"strings"
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions"
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger"
"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/requests"
"k8s.io/klog/v2"
)
const (
@@ -177,12 +177,12 @@ func (p *GitLabProvider) addProjectsToSession(ctx context.Context, s *sessions.S
for _, project := range p.allowedProjects {
projectInfo, err := p.getProjectInfo(ctx, s, project.Name)
if err != nil {
logger.Errorf("Warning: project info request failed: %v", err)
klog.Warningf("Warning: project info request failed: %v", err)
continue
}
if projectInfo.Archived {
logger.Errorf("Warning: project %s is archived", project.Name)
klog.Warningf("Warning: project %s is archived", project.Name)
continue
}
@@ -192,14 +192,14 @@ func (p *GitLabProvider) addProjectsToSession(ctx context.Context, s *sessions.S
perms = projectInfo.Permissions.GroupAccess
// group project access is not set for this user then we give up
if perms == nil {
logger.Errorf("Warning: user %q has no project level access to %s",
klog.Warningf("Warning: user %q has no project level access to %s",
s.Email, project.Name)
continue
}
}
if perms.AccessLevel < project.AccessLevel {
logger.Errorf(
klog.Warningf(
"Warning: user %q does not have the minimum required access level for project %q",
s.Email,
project.Name,