Skip to content
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.

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

Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt #14489

Merged

Conversation

dims
Copy link
Contributor

@dims dims commented Sep 19, 2022

Cherry-pick #13256 to release-3.5 branch

form3tech fork is outdated as well :( (introduced in #12580)

So pick up the changes from @Haimantika in #13256 from main to release-3.5 (At one point we were waiting for 3.6, but given that otel changes got picked to 3.5, we should do this as well.

Longer term plan was to ensure k/k only depends on github.com/golang-jwt/jwt, see:

Also note that form3tech is no longer active as well. So better to switch to something where we can get help if needed.

Signed-off-by: haimantika mitra haimantikamitra@gmail.com
Signed-off-by: Davanum Srinivas davanum@gmail.com

Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. lgtm. Thanks @dims :)
Rerunning failed tests which seems not related to these changes.

@spzala
Copy link
Member

spzala commented Sep 19, 2022

cc @ahrtr @serathius @mitake

Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with minor comments.

Thank you @dims

We can address the minor comments in a separate PR. If you do not have bandwidth, I can take care of it later in a separate PR.

server/go.mod Outdated Show resolved Hide resolved
server/auth/jwt.go Outdated Show resolved Hide resolved
server/auth/options.go Outdated Show resolved Hide resolved
@dims dims force-pushed the Haimantika-replacejwtgo-in-release-3.5 branch from c2083c8 to 2d4cdf4 Compare September 19, 2022 19:28
@dims dims changed the title Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt [WIP] Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt Sep 19, 2022
@dims dims force-pushed the Haimantika-replacejwtgo-in-release-3.5 branch from 2d4cdf4 to 8be6210 Compare September 19, 2022 19:34
…g-jwt/jwt/v4

Signed-off-by: haimantika mitra <haimantikamitra@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims dims force-pushed the Haimantika-replacejwtgo-in-release-3.5 branch from 8be6210 to 653d6e1 Compare September 19, 2022 19:35
@dims dims changed the title [WIP] Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt Replace github.com/form3tech-oss/jwt-go with https://github.com/golang-jwt/jwt Sep 19, 2022
@dims
Copy link
Contributor Author

dims commented Sep 19, 2022

ok, should be ready now! thanks.

@ahrtr please feel free to update master to this same version.

@ahrtr
Copy link
Member

ahrtr commented Sep 19, 2022

ok, should be ready now! thanks.

@ahrtr please feel free to update master to this same version.

Sure. Thanks @dims .

Usually we keep the backporting PR as it's. Specifically I would suggest to bump to 4.4.2 in the main branch firstly, and cherry pick to 3.5 and 3.4 later. But I won't insist on that.

Anyway, let me take care of the main branch to bumping 4.4.2. Thanks again.

@dims
Copy link
Contributor Author

dims commented Sep 19, 2022

thanks @ahrtr !

@ahrtr
Copy link
Member

ahrtr commented Sep 19, 2022

FYI. I just delivered a PR to take care of the main branch #14491

@ahrtr ahrtr merged commit 89d0fc4 into etcd-io:release-3.5 Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants