DO NOT MERGE: pretend vendor update of library-go dep

This commit brings in the changes done in openshift/library-go#1531
liouk · Jun 1, 2023 · f6df017 · f6df017
1 parent 603c3af
commit f6df017
Show file tree

Hide file tree

Showing 6 changed files with 1,448 additions and 39 deletions.
diff --git a/pkg/cli/login/loginoptions.go b/pkg/cli/login/loginoptions.go
@@ -265,7 +265,7 @@ func (o *LoginOptions) gatherAuthInfo() error {
 	clientConfig.CertFile = o.CertFile
 	clientConfig.KeyFile = o.KeyFile
 
-	token, err := tokenrequest.RequestToken(o.Config, o.getAuthChallengeHandler())
+	token, err := tokenrequest.RequestTokenWithChallengeHandlers(o.Config, o.getAuthChallengeHandler())
 	if err != nil {
 		return err
 	}

diff --git a/pkg/helpers/authchallengers/negotiator_test.go b/pkg/helpers/authchallengers/negotiator_test.go
@@ -729,7 +729,7 @@ func TestSetDefaultOsinConfig(t *testing.T) {
 			ClientConfig: &restclient.Config{Host: tc.hostWrapper(s.URL)},
 			TokenFlow:    tc.tokenFlow,
 		}
-		if err := opts.SetDefaultOsinConfig(); err != nil {
+		if err := opts.SetDefaultOsinConfig("openshift-challenging-client", nil); err != nil {
 			t.Errorf("%s: unexpected SetDefaultOsinConfig error: %v", tc.name, err)
 			continue
 		}

diff --git a/vendor/github.com/openshift/library-go/pkg/oauth/tokenrequest/callback_server.go b/vendor/github.com/openshift/library-go/pkg/oauth/tokenrequest/callback_server.go