Skip to content

Switch to openshift/osincli #1924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to openshift/osincli #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.23.0
toolchain go1.23.4

require (
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2
github.com/blang/semver/v4 v4.0.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/distribution/distribution/v3 v3.0.0-20230511163743-f7717b7855ca
Expand All @@ -23,6 +22,7 @@ require (
github.com/openshift/api v0.0.0-20250124212313-a770960d61e0
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.7.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e h1:ZU22z/2YRFLyf/
github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2 h1:x8Brv0YNEe6jY3V/hQglIG2nd8g5E2Zj5ubGKkPQctQ=
github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:XyjUkMA8GN+tOOPXvnbi3XuRxWFvTJntqvTFnjmhzbk=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
Expand Down Expand Up @@ -211,6 +209,8 @@ github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c h1:6X
github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7 h1:4iliLcvr1P9EUMZgIaSNEKNQQzBn+L6PSequlFOuB6Q=
github.com/openshift/client-go v0.0.0-20250125113824-8e1f0b8fa9a7/go.mod h1:2tcufBE4Cu6RNgDCxcUJepa530kGo5GFVfR9BSnndhI=
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2 h1:9oADVMmPa4G60MQtoSjD26aD/vZreqbIAfiUiO220eY=
github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2/go.mod h1:Riv9DbfKiX3y9ebcS4PHU4zLhVXu971+4jCVwKIue5M=
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
4 changes: 2 additions & 2 deletions pkg/oauth/tokenrequest/request_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"slices"
"strings"

"github.com/RangelReale/osincli"
"github.com/openshift/osincli"

apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -43,7 +43,7 @@ const (
// openShiftCLIBrowserClientID the name of the CLI client for logging in through a browser
openShiftCLIBrowserClientID = "openshift-cli-client"

// pkce_s256 is sha256 hash per RFC7636, copied from github.com/RangelReale/osincli/pkce.go
// pkce_s256 is sha256 hash per RFC7636, copied from github.com/openshift/osincli/pkce.go
pkce_s256 = "S256"

// token fakes the missing osin.TOKEN const
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/tokenrequest/request_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"testing"
"time"

"github.com/RangelReale/osincli"
"github.com/google/go-cmp/cmp"
"github.com/openshift/osincli"

"k8s.io/apimachinery/pkg/util/diff"
restclient "k8s.io/client-go/rest"
Expand Down
0 ...github.com/RangelReale/osincli/.gitignore → ...r/github.com/openshift/osincli/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...or/github.com/RangelReale/osincli/LICENSE → vendor/github.com/openshift/osincli/LICENSE
View file
Open in desktop
File renamed without changes.
0 .../github.com/RangelReale/osincli/README.md → ...or/github.com/openshift/osincli/README.md
View file
Open in desktop
File renamed without changes.
0 .../github.com/RangelReale/osincli/access.go → ...or/github.com/openshift/osincli/access.go
View file
Open in desktop
File renamed without changes.
0 ...thub.com/RangelReale/osincli/authorize.go → ...github.com/openshift/osincli/authorize.go
View file
Open in desktop
File renamed without changes.
0 .../github.com/RangelReale/osincli/client.go → ...or/github.com/openshift/osincli/client.go
View file
Open in desktop
File renamed without changes.
0 .../github.com/RangelReale/osincli/config.go → ...or/github.com/openshift/osincli/config.go
View file
Open in desktop
File renamed without changes.
0 .../github.com/RangelReale/osincli/custom.go → ...or/github.com/openshift/osincli/custom.go
View file
Open in desktop
File renamed without changes.
0 ...r/github.com/RangelReale/osincli/error.go → vendor/github.com/openshift/osincli/error.go
View file
Open in desktop
File renamed without changes.
0 ...or/github.com/RangelReale/osincli/pkce.go → vendor/github.com/openshift/osincli/pkce.go
View file
Open in desktop
File renamed without changes.
0 ...ithub.com/RangelReale/osincli/response.go → .../github.com/openshift/osincli/response.go
View file
Open in desktop
File renamed without changes.
0 ...or/github.com/RangelReale/osincli/util.go → vendor/github.com/openshift/osincli/util.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ github.com/Azure/go-ntlmssp
# github.com/NYTimes/gziphandler v1.1.1
## explicit; go 1.11
github.com/NYTimes/gziphandler
# github.com/RangelReale/osincli v0.0.0-20160924135400-fababb0555f2
## explicit
github.com/RangelReale/osincli
# github.com/antlr4-go/antlr/v4 v4.13.0
## explicit; go 1.20
github.com/antlr4-go/antlr/v4
Expand Down Expand Up @@ -428,6 +425,9 @@ github.com/openshift/client-go/user/clientset/versioned/typed/user/v1
github.com/openshift/client-go/user/informers/externalversions/internalinterfaces
github.com/openshift/client-go/user/informers/externalversions/user/v1
github.com/openshift/client-go/user/listers/user/v1
# github.com/openshift/osincli v0.0.0-20160924135400-fababb0555f2
## explicit
github.com/openshift/osincli
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
Expand Down