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

Follow up on Web MFA TODOs #50417

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

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented Dec 19, 2024

Address TODOS from the recent flight of Web MFA PRs.

Depends on https://github.com/gravitational/teleport.e/pull/5727

TODO update e ref to master once ^ merges

@Joerger Joerger changed the base branch from master to joerger/web-admin-mfa-dialog December 19, 2024 03:21
@Joerger Joerger force-pushed the joerger/web-admin-mfa-dialog branch 4 times, most recently from ebade41 to b5581df Compare January 8, 2025 20:30
@Joerger Joerger force-pushed the joerger/unify-mfa-web-follow-up branch from d6e3cc6 to dd0b108 Compare January 14, 2025 20:30
@Joerger Joerger changed the base branch from joerger/web-admin-mfa-dialog to master January 14, 2025 20:30
@Joerger Joerger marked this pull request as ready for review January 14, 2025 21:14
@github-actions github-actions bot requested review from rudream and ryanclark January 14, 2025 21:14
@Joerger Joerger added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v15 backport/branch/v16 backport/branch/v17 labels Jan 15, 2025
e
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think the e ref should be in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After https://github.com/gravitational/teleport.e/pull/5727 is merged, I'll update the e ref will to master before merging. Or do you think the e ref update is a standalone PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hm, I thought we all normally put e ref updates into a separate PR, but I'm not sure if it really matters. Just thought it might've been accidental

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought we all normally put e ref updates into a separate PR

Usually you'd have an e PR dependent on a teleport PR, so you'd do:

  • telport PR
  • e PR
  • teleport PR to update e Ref

But in this case the teleport PR is dependent on the e PR, so we could do:

  • e PR
  • teleport PR
  • teleport PR to update e Ref

IMO it makes more sense to just combine the last two PRs.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, usually we do OSS PR -> e PR -> update e-ref because e PR's typically need their OSS PR otherwise they'll break, since this e PR won't break without OSS, I think it's fine to save on the extra PR and just update the e ref here.

Just note that you'll need to change the e ref update here after the e PR is merged, since the e commit hash may not be the same after it's merged into master.

@ryanclark
Copy link
Contributor

Will approve once https://github.com/gravitational/teleport.e/pull/5727 is in and e ref is updated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants