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

fix: duplicate brokerClientAuthenticationPlugin definition when oauth and jwt are enabled simultaneously #1160

Merged

Conversation

lhotari
Copy link
Member

@lhotari lhotari commented Apr 16, 2024

Motivation

There will be a duplicate brokerClientAuthenticationPlugin definition when oauth and jwt are enabled simultaneously.

Modifications

Rearrange the conditions so that in pulsar.authConfiguration template, the jwt handling is in the else branch of the oauth enabled condition.

Verifying this change

  • Make sure that the change passes the CI checks.

(Please pick either of the following options)

This change is a trivial rework / code cleanup without any test coverage.

(or)

This change is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added integration tests for end-to-end deployment with large payloads (10MB)
  • Extended integration test for recovery after broker failure

Documentation

Check the box below.

Need to update docs?

  • doc-required

    (If you need help on updating docs, create a doc issue)

  • no-need-doc

    (Please explain why)

  • doc

    (If this PR contains doc changes)

@lhotari lhotari requested review from a team as code owners April 16, 2024 06:21
@github-actions github-actions bot added the no-need-doc This pr does not need any document label Apr 16, 2024
@lhotari
Copy link
Member Author

lhotari commented Apr 16, 2024

CI is currently broken, created #1161 to address that separately.

@lhotari
Copy link
Member Author

lhotari commented Apr 16, 2024

Closing and reopening to get CI fix.

@lhotari lhotari closed this Apr 16, 2024
@lhotari lhotari reopened this Apr 16, 2024
@lhotari lhotari merged commit 93af2bb into master Apr 16, 2024
4 of 5 checks passed
@lhotari lhotari deleted the lh-fix-duplicate-brokerClientAuthenticationPlugin-definition branch April 16, 2024 07:10
ericsyh pushed a commit that referenced this pull request May 24, 2024
… and jwt are enabled simultaneously (#1160)

Fix duplicate brokerClientAuthenticationPlugin definition when oauth and jwt are enabled simultaneously

(cherry picked from commit 93af2bb)
ericsyh pushed a commit that referenced this pull request May 24, 2024
… and jwt are enabled simultaneously (#1160)

Fix duplicate brokerClientAuthenticationPlugin definition when oauth and jwt are enabled simultaneously

(cherry picked from commit 93af2bb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-need-doc This pr does not need any document
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants