From 35021438c991e8f47e43c1ed149a62e08fee29c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 20:28:22 +0000 Subject: [PATCH 1/4] build(deps): bump golangci/golangci-lint-action from 5 to 6 (#427) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5 to 6. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v5...v6) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci-golang-sbom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-golang-sbom.yml b/.github/workflows/ci-golang-sbom.yml index ad7bf89a..0eed871e 100644 --- a/.github/workflows/ci-golang-sbom.yml +++ b/.github/workflows/ci-golang-sbom.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Lint - uses: golangci/golangci-lint-action@v5 + uses: golangci/golangci-lint-action@v6 with: version: v1.56.2 skip-pkg-cache: true From 52743fa61b96c000903813bed90756bc43a20e12 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 May 2024 01:03:18 +0530 Subject: [PATCH 2/4] Remove OWNERS file (#428) * Remove OWNERS file Signed-off-by: Feny Mehta * reverting the toolchaim-common upgrade Signed-off-by: Feny Mehta --------- Signed-off-by: Feny Mehta --- OWNERS | 21 --------------------- go.mod | 3 ++- go.sum | 7 ++++--- 3 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 OWNERS diff --git a/OWNERS b/OWNERS deleted file mode 100644 index 6d2d2e1c..00000000 --- a/OWNERS +++ /dev/null @@ -1,21 +0,0 @@ -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- alexeykazakov -- dipak-pawar -- MatousJobanek -- michaelkleinhenz -- nurali-techie -- sbryzak -- xcoulon -- tinakurian - -reviewers: -- alexeykazakov -- dipak-pawar -- MatousJobanek -- michaelkleinhenz -- nurali-techie -- sbryzak -- xcoulon -- tinakurian \ No newline at end of file diff --git a/go.mod b/go.mod index 14374ab0..491f988b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go v1.44.100 - github.com/codeready-toolchain/api v0.0.0-20240425165440-d0a6da0060a5 + github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5 github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a github.com/go-logr/logr v1.2.3 github.com/gofrs/uuid v4.2.0+incompatible @@ -59,6 +59,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-github/v52 v52.0.0 // indirect github.com/google/go-querystring v1.1.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect github.com/googleapis/gax-go/v2 v2.7.1 // indirect github.com/gorilla/mux v1.8.0 // indirect diff --git a/go.sum b/go.sum index 2f320315..6a96bbc8 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/codeready-toolchain/api v0.0.0-20240425165440-d0a6da0060a5 h1:L6NhQrzGY6vWIBjXYfmJ/Q+k/4Sb+iQYKVjtR6LT2Q4= -github.com/codeready-toolchain/api v0.0.0-20240425165440-d0a6da0060a5/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= +github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5 h1:BPIwkb0fqJEJ5GjMFgkoo13f8AY5UTWmPD4Hcm1GqoU= +github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a h1:6ZqyPuT74RYEUToWCjPNieaEZ69wEx32te+8NafqNis= github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a/go.mod h1:bluFxwf6L4eWtNlrL3niZaJjFH6UwJnYabls5ay+EQA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -286,7 +286,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= From 6f2788a6116ac3616bc33ff641930add1447c7a3 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 9 May 2024 20:50:55 +0530 Subject: [PATCH 3/4] Updating the UUID dependency to google (#429) Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 4 +- pkg/auth/keymanager_test.go | 14 +++---- pkg/auth/tokenparser_test.go | 66 +++++++++++++++---------------- pkg/middleware/middleware_test.go | 12 +++--- pkg/proxy/proxy_test.go | 11 ++---- 6 files changed, 53 insertions(+), 56 deletions(-) diff --git a/go.mod b/go.mod index 491f988b..98e893c6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go v1.44.100 github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5 - github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a + github.com/codeready-toolchain/toolchain-common v0.0.0-20240507174147-ed50ce546b3c github.com/go-logr/logr v1.2.3 github.com/gofrs/uuid v4.2.0+incompatible github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 6a96bbc8..b6ef2661 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5 h1:BPIwkb0fqJEJ5GjMFgkoo13f8AY5UTWmPD4Hcm1GqoU= github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a h1:6ZqyPuT74RYEUToWCjPNieaEZ69wEx32te+8NafqNis= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a/go.mod h1:bluFxwf6L4eWtNlrL3niZaJjFH6UwJnYabls5ay+EQA= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240507174147-ed50ce546b3c h1:9EhiQ0dX1HrrpI7MYqvT/mmLNeMpTzWtwEEyWo3a1aA= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240507174147-ed50ce546b3c/go.mod h1:W2DY2gc5tC71iY1SM6pftJ5ML+Vo29pEzMbhLQpX8z0= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/pkg/auth/keymanager_test.go b/pkg/auth/keymanager_test.go index 22296afd..ad528247 100644 --- a/pkg/auth/keymanager_test.go +++ b/pkg/auth/keymanager_test.go @@ -16,8 +16,8 @@ import ( authsupport "github.com/codeready-toolchain/toolchain-common/pkg/test/auth" testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config" - "github.com/gofrs/uuid" "github.com/golang-jwt/jwt/v5" + "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -39,25 +39,25 @@ func (s *TestKeyManagerSuite) TestKeyFetching() { // create test keys tokengenerator := authsupport.NewTokenManager() - kid0 := uuid.Must(uuid.NewV4()).String() + kid0 := uuid.NewString() _, err := tokengenerator.AddPrivateKey(kid0) require.NoError(s.T(), err) - kid1 := uuid.Must(uuid.NewV4()).String() + kid1 := uuid.NewString() _, err = tokengenerator.AddPrivateKey(kid1) require.NoError(s.T(), err) // create two test tokens, both valid - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" jwt0, err := tokengenerator.GenerateSignedToken(*identity0, kid0, authsupport.WithEmailClaim(email0)) require.NoError(s.T(), err) - username1 := uuid.Must(uuid.NewV4()).String() + username1 := uuid.NewString() identity1 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username1, } email1 := identity1.Username + "@email.tld" diff --git a/pkg/auth/tokenparser_test.go b/pkg/auth/tokenparser_test.go index 1c6ef3d3..98e5c7b4 100644 --- a/pkg/auth/tokenparser_test.go +++ b/pkg/auth/tokenparser_test.go @@ -15,7 +15,7 @@ import ( authsupport "github.com/codeready-toolchain/toolchain-common/pkg/test/auth" testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config" - "github.com/gofrs/uuid" + "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -35,10 +35,10 @@ func (s *TestTokenParserSuite) TestTokenParser() { // create test keys tokengenerator := authsupport.NewTokenManager() - kid0 := uuid.Must(uuid.NewV4()).String() + kid0 := uuid.NewString() _, err := tokengenerator.AddPrivateKey(kid0) require.NoError(s.T(), err) - kid1 := uuid.Must(uuid.NewV4()).String() + kid1 := uuid.NewString() _, err = tokengenerator.AddPrivateKey(kid1) require.NoError(s.T(), err) @@ -71,17 +71,17 @@ func (s *TestTokenParserSuite) TestTokenParser() { s.Run("parse valid tokens", func() { // create two test tokens, both valid - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" jwt0, err := tokengenerator.GenerateSignedToken(*identity0, kid0, authsupport.WithEmailClaim(email0)) require.NoError(s.T(), err) - username1 := uuid.Must(uuid.NewV4()).String() + username1 := uuid.NewString() identity1 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username1, } email1 := identity1.Username + "@email.tld" @@ -110,9 +110,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { s.Run("parse invalid token", func() { // create invalid test token (wrong set of claims, no email), signed with key1 - invalidUsername := uuid.Must(uuid.NewV4()).String() + invalidUsername := uuid.NewString() invalidIdentity := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: invalidUsername, } invalidJWT, err := tokengenerator.GenerateSignedToken(*invalidIdentity, kid1) @@ -139,13 +139,13 @@ func (s *TestTokenParserSuite) TestTokenParser() { s.Run("token signed by unknown key", func() { // new key - kidX := uuid.Must(uuid.NewV4()).String() + kidX := uuid.NewString() _, err := tokengenerator.AddPrivateKey(kidX) require.NoError(s.T(), err) // generate valid token - usernameX := uuid.Must(uuid.NewV4()).String() + usernameX := uuid.NewString() identityX := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: usernameX, } emailX := identityX.Username + "@email.tld" @@ -160,9 +160,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("no KID header in token", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -179,9 +179,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("missing claim: preferred_username", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -199,9 +199,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("missing claim: email", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } // generate non-serialized token @@ -216,9 +216,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("missing claim: sub", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -235,9 +235,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("signature is good but token expired", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -256,9 +256,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("signature is good but token not valid yet", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -277,9 +277,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("signature is good and token expiration is within leeway", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -297,9 +297,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("token signed by known key but the signature is invalid", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -311,7 +311,7 @@ func (s *TestTokenParserSuite) TestTokenParser() { // replace signature with garbage str := strings.Split(jwt0string, ".") require.Len(s.T(), str, 3) - str[2] = uuid.Must(uuid.NewV4()).String() + str[2] = uuid.NewString() jwt0string = strings.Join(str, ".") // validate token _, err = tokenParser.FromString(jwt0string) @@ -321,9 +321,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { s.Run("parse valid token with original_sub claim", func() { // create a test token with an original_sub claim - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" @@ -343,9 +343,9 @@ func (s *TestTokenParserSuite) TestTokenParser() { }) s.Run("parse valid token with aud claim", func() { - username0 := uuid.Must(uuid.NewV4()).String() + username0 := uuid.NewString() identity0 := &authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), + ID: uuid.New(), Username: username0, } email0 := identity0.Username + "@email.tld" diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go index 1449c63a..bf8309d7 100644 --- a/pkg/middleware/middleware_test.go +++ b/pkg/middleware/middleware_test.go @@ -20,7 +20,7 @@ import ( authsupport "github.com/codeready-toolchain/toolchain-common/pkg/test/auth" testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config" - "github.com/gofrs/uuid" + "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -46,16 +46,16 @@ func (s *TestAuthMiddlewareSuite) TestAuthMiddleware() { func (s *TestAuthMiddlewareSuite) TestAuthMiddlewareService() { // create a TokenGenerator and a key tokengenerator := authsupport.NewTokenManager() - kid0 := uuid.Must(uuid.NewV4()).String() + kid0 := uuid.NewString() _, err := tokengenerator.AddPrivateKey(kid0) require.NoError(s.T(), err) // create some test tokens identity0 := authsupport.Identity{ - ID: uuid.Must(uuid.NewV4()), - Username: uuid.Must(uuid.NewV4()).String(), + ID: uuid.New(), + Username: uuid.NewString(), } - emailClaim0 := authsupport.WithEmailClaim(uuid.Must(uuid.NewV4()).String() + "@email.tld") + emailClaim0 := authsupport.WithEmailClaim(uuid.NewString() + "@email.tld") // valid token tokenValid, err := tokengenerator.GenerateSignedToken(identity0, kid0, emailClaim0) require.NoError(s.T(), err) @@ -63,7 +63,7 @@ func (s *TestAuthMiddlewareSuite) TestAuthMiddlewareService() { tokenInvalidNoEmail, err := tokengenerator.GenerateSignedToken(identity0, kid0) require.NoError(s.T(), err) // invalid token - garbage - tokenInvalidGarbage := uuid.Must(uuid.NewV4()).String() + tokenInvalidGarbage := uuid.NewString() // invalid token - expired expTime := time.Now().Add(-60 * time.Second) expClaim := authsupport.WithExpClaim(expTime) diff --git a/pkg/proxy/proxy_test.go b/pkg/proxy/proxy_test.go index 05f0ad78..249ca590 100644 --- a/pkg/proxy/proxy_test.go +++ b/pkg/proxy/proxy_test.go @@ -35,7 +35,7 @@ import ( authsupport "github.com/codeready-toolchain/toolchain-common/pkg/test/auth" testconfig "github.com/codeready-toolchain/toolchain-common/pkg/test/config" - "github.com/gofrs/uuid" + "github.com/google/uuid" routev1 "github.com/openshift/api/route/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -171,8 +171,7 @@ func (s *TestProxySuite) checkPlainHTTPErrors(fakeApp *fake.ProxyFakeApp) { req, err := http.NewRequest("GET", "http://localhost:8081/api/mycoolworkspace/pods", nil) require.NoError(s.T(), err) require.NotNil(s.T(), req) - userID, err := uuid.NewV4() - require.NoError(s.T(), err) + userID := uuid.New() req.Header.Set("Authorization", "Bearer "+s.token(userID, authsupport.WithSubClaim(""))) resp, err := http.DefaultClient.Do(req) @@ -385,8 +384,7 @@ func (s *TestProxySuite) checkWebLogin() { func (s *TestProxySuite) checkProxyOK(fakeApp *fake.ProxyFakeApp, p *Proxy) { s.Run("successfully proxy", func() { - userID, err := uuid.NewV4() - require.NoError(s.T(), err) + userID := uuid.New() encodedSAToken := base64.RawURLEncoding.EncodeToString([]byte("clusterSAToken")) encodedSSOToken := base64.RawURLEncoding.EncodeToString([]byte(s.token(userID))) @@ -1158,8 +1156,7 @@ func (s *TestProxySuite) request() *http.Request { req, err := http.NewRequest("GET", "http://localhost:8081/api/mycoolworkspace/pods", nil) require.NoError(s.T(), err) require.NotNil(s.T(), req) - userID, err := uuid.NewV4() - require.NoError(s.T(), err) + userID := uuid.New() req.Header.Set("Authorization", "Bearer "+s.token(userID)) return req From 7c68f29dcdf1bf7fe1ada9990c1dd192b021bab8 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 13 May 2024 17:00:06 +0530 Subject: [PATCH 4/4] Adding updated OWNERS file (#430) * Adding updated OWNERS file Signed-off-by: Feny Mehta * Update OWNERS --------- Signed-off-by: Feny Mehta Co-authored-by: Alexey Kazakov --- OWNERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 00000000..a07d9bca --- /dev/null +++ b/OWNERS @@ -0,0 +1,20 @@ +# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md + +approvers: +- alexeykazakov +- MatousJobanek +- sbryzak +- xcoulon +- rajivnathan +- ranakan19 +- mfrancisc + +reviewers: +- alexeykazakov +- MatousJobanek +- michaelkleinhenz +- sbryzak +- xcoulon +- rajivnathan +- ranakan19 +- mfrancisc \ No newline at end of file