git.iko.soy/typeable/oauth2-proxy
on master help sign in
Adjust GitLab options configuration
c84a5a4Nick Meves
pkg/validation/options.go+2−4
compare with master
unifiedsplit
@@ -276,13 +276,11 @@ func parseProviderInfo(o *options.Options, msgs []string) []string {
276 msgs = append(msgs, "oidc provider requires an oidc issuer URL")
276 msgs = append(msgs, "oidc provider requires an oidc issuer URL")
277 }
277 }
278 case *providers.GitLabProvider:
278 case *providers.GitLabProvider:
279− p.Groups = o.Providers[0].GitLabConfig.Group
279+ p.SetAllowedGroups(o.Providers[0].GitLabConfig.Group)
280− err := p.AddProjects(o.Providers[0].GitLabConfig.Projects)
280+ err := p.SetAllowedProjects(o.Providers[0].GitLabConfig.Projects)
281 if err != nil {
281 if err != nil {
282 msgs = append(msgs, "failed to setup gitlab project access level")
282 msgs = append(msgs, "failed to setup gitlab project access level")
283 }
283 }
284− p.SetAllowedGroups(p.PrefixAllowedGroups())
285− p.SetProjectScope()
286
284
287 if p.Verifier == nil {
285 if p.Verifier == nil {
288 // Initialize with default verifier for gitlab.com
286 // Initialize with default verifier for gitlab.com
providers/gitlab_test.go+1−1
@@ -228,7 +228,7 @@ var _ = Describe("Gitlab Provider Tests", func() {
228 p.SetAllowedGroups(in.allowedGroups)
228 p.SetAllowedGroups(in.allowedGroups)
229
229
230 err := p.SetAllowedProjects(in.allowedProjects)
230 err := p.SetAllowedProjects(in.allowedProjects)
231− if err == nil {
231+ if in.expectedError == nil {
232 Expect(err).To(BeNil())
232 Expect(err).To(BeNil())
233 } else {
233 } else {
234 Expect(err).To(MatchError(in.expectedError))
234 Expect(err).To(MatchError(in.expectedError))