[data-plane] Add the caching for OIDC JWT token to tokenprovider #3663

Leo6Leo · 2024-02-01T19:53:01Z

Proposed Changes

Add the tokenCache field into the tokenProvider class
Check the cache before requesting the new token. If the token exist in cache, we will use the one in the cache, otherwise request the new token and write it into the cache.

Release Note

Adding cache mechanism to OIDC JWT token

Docs

codecov · 2024-02-01T19:58:29Z

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (02be94e) 74.39% compared to head (8606b6e) 61.91%.

Files	Patch %	Lines
...eventing/kafka/broker/core/oidc/TokenProvider.java	0.00%	14 Missing ⚠️

Additional details and impacted files

@@              Coverage Diff              @@
##               main    #3663       +/-   ##
=============================================
- Coverage     74.39%   61.91%   -12.49%     
- Complexity      845      846        +1     
=============================================
  Files            97      188       +91     
  Lines          3207    12797     +9590     
  Branches        273      275        +2     
=============================================
+ Hits           2386     7923     +5537     
- Misses          654     4244     +3590     
- Partials        167      630      +463

Flag	Coverage Δ
java-unittests	`74.21% <0.00%> (-0.19%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

control-plane/pkg/contract/contract.pb.go

data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java

…o add-cache-to-token-provider

This reverts commit 0ccf69c.

Leo6Leo · 2024-02-02T16:08:29Z

/retest

creydr

Thanks a lot for working on this @Leo6Leo.
Left only two nits. Otherwise looking good.

data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java

…r/core/oidc/TokenProvider.java Co-authored-by: Christoph Stäbler <cstabler@redhat.com>

creydr

Thanks a lot for fixing this @Leo6Leo!

/lgtm

knative-prow · 2024-02-05T14:17:09Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: creydr, Leo6Leo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Leo6Leo,creydr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

creydr · 2024-02-05T14:44:39Z

@Leo6Leo can you rerun hack/update-codegen.sh

creydr · 2024-02-05T14:58:23Z

/lgtm cancel

creydr · 2024-02-06T06:53:24Z

Can you rebase your PR and the rerun update-codegen.sh?

creydr

/lgtm

…tive-extensions#3663) * Add the caching to tokenprovider * Add the boiler * Running the codegen * Running the codegen * Revert "Running the codegen" This reverts commit 0ccf69c. * Use constant, set buffer before token expire, remove unnecessary change * Codegen changes * Codegen changes * Update data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java Co-authored-by: Christoph Stäbler <cstabler@redhat.com> * Fix the review comments * Run codegen * Codegen changes * Code gen again --------- Co-authored-by: Christoph Stäbler <cstabler@redhat.com>

* Update contract with fields for OIDC information (knative-extensions#3632) * Update contract to include OIDC information * Run hack/update-codegen.sh * Move OIDC SA to egress * Expose OIDC audience of KafkaChannel in its status (knative-extensions#3622) * Provision .status.address.audience and .status.addresses[*].audience in KafkaChannel * Add kafka Channel e2e test to check if audience is provisioned * Run goimport * Update deps * Auto generate Triggers OIDC identity service account and expose in its status (knative-extensions#3604) * Support auto generation of Triggers identity service account and expose in AuthStatus Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * make ServiceAccountLister public Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * add oidc unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * integrate oidc unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * add some logic to reconcile triggers, if the features config map gets updated Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * revert vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix unit test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix Verify Deps and Codegen test Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * fix unit test and reconcile triggers, in case of the features configmap changes Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> --------- Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> * Create KafkaSources OIDC service account and expose in its status (knative-extensions#3660) * Create KafkaSources OIDC service account and expose in its status * Run goimport * Provision contract with OIDC information (knative-extensions#3646) * Provision contract with OIDC information * Add DLS audience in KafkaChannel CRD * Update KafkaSource to expose its sinks audience in status * Update Trigger test to include OIDC SA in contract * Propagate KafkaSources OIDC serviceAccountName to consumer and consumergroup * Propagate triggerv2s serviceAccountName to consumergroup * Fix unit test * [data-plane] Add the caching for OIDC JWT token to tokenprovider (knative-extensions#3663) * Add the caching to tokenprovider * Add the boiler * Running the codegen * Running the codegen * Revert "Running the codegen" This reverts commit 0ccf69c. * Use constant, set buffer before token expire, remove unnecessary change * Codegen changes * Codegen changes * Update data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java Co-authored-by: Christoph Stäbler <cstabler@redhat.com> * Fix the review comments * Run codegen * Codegen changes * Code gen again --------- Co-authored-by: Christoph Stäbler <cstabler@redhat.com> * Receiver reject requests for wrong audience (knative-extensions#3675) * Receiver: reject request for wrong audience * Switch to AuthenticationHandler * Fix "Request has already been read" issue * Change TokenVerifier to an interface * Initialize TokenVerifier in main * Add test for AuthenticationHandler * Only initialize OIDC discovery config in main and create a TokenVerifier per verticle instance. * Rerun hack/update-codegen.sh * Move TokenVerifier setup into setup() to prevent null pointer exception when vertx is null * Update KafkaChannel OIDC e2e tests, to run OIDC conformance tests so the receiver is tested too. * Run OIDC e2e tests as part of the reconciler suite * Fix KafkaChannelOIDC e2e test * Fix lint issue * Address review comments * Dispatcher authenticate requests (knative-extensions#3677) * Change TokenProvider to return future to get a token * Dispatcher add OIDC to token, when target has an audience set * Add e2e test * Support exposing the Audience of a Broker (knative-extensions#3600) * Support exposing the Audience of a Broker * fix formatting * fix formatting * test fixes * Populate broker.status.addresses[*].audience field too * Run goimports and gofmt * Fix unit test --------- Co-authored-by: Christoph Stäbler <cstabler@redhat.com> * Add broker OIDC e2e tests (knative-extensions#3685) * Add broker OIDC e2e tests * Fix broker template to allow TLS & OIDC configuration on dead letter sink * Remove unneeded check when setting broker audience (knative-extensions#3708) * Check status code of OIDC discovery response (knative-extensions#3707) * Check status code of OIDC discovery endpoint * Run update-codegen.sh * Only allow 200 status code on OIDC discovery endpoint * Run update-deps.sh * Add OIDC tests to encryption/auth test suite * run make generate-release * TokenVerifier: execute blocking calls in parallel (knative-extensions#3728) * TokenVerifier: execute blocking calls in parallel * Revert "TokenVerifier: execute blocking calls in parallel" This reverts commit f3dbde9. * Revert: removed changes in contract.pb.go * Cancel receiver pod start on invalid OIDC config only if authentication.oidc is enabled (knative-extensions#3761) * Cancel pod start on invalid OIDC config only if authentication.oidc is enabled * Update namespaced broker to copy features configmap too. * Add unit test for FeaturesConfig class (knative-extensions#3771) * Add unit test for FeaturesConfig class * Update data-plane/core/src/test/java/dev/knative/eventing/kafka/broker/core/features/FeaturesConfigTest.java Co-authored-by: Calum Murray <cmurray@redhat.com> --------- Co-authored-by: Calum Murray <cmurray@redhat.com> * Run make generate-release again --------- Signed-off-by: pingjiang <xiangpingjiang1998@gmail.com> Co-authored-by: cola <45722758+xiangpingjiang@users.noreply.github.com> Co-authored-by: Leo Li <leoli@redhat.com> Co-authored-by: Gunish Matta <33680363+gunishmatta@users.noreply.github.com> Co-authored-by: Partha Ghosh <112557191+parth721@users.noreply.github.com> Co-authored-by: Calum Murray <cmurray@redhat.com>

Add the caching to tokenprovider

099fb9c

knative-prow bot requested review from aliok and matzew February 1, 2024 19:53

knative-prow bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. area/data-plane labels Feb 1, 2024

Leo6Leo changed the title ~~Add the caching for OIDC JWT token to tokenprovider~~ [data-plane] Add the caching for OIDC JWT token to tokenprovider Feb 1, 2024

Add the boiler

873f2d7

Leo6Leo changed the title ~~[data-plane] Add the caching for OIDC JWT token to tokenprovider~~ [WIP] [data-plane] Add the caching for OIDC JWT token to tokenprovider Feb 1, 2024

knative-prow bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 1, 2024

Running the codegen

8336229

knative-prow bot added the area/control-plane label Feb 2, 2024

Leo6Leo changed the title ~~[WIP] [data-plane] Add the caching for OIDC JWT token to tokenprovider~~ [data-plane] Add the caching for OIDC JWT token to tokenprovider Feb 2, 2024

knative-prow bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 2, 2024

Leo6Leo requested a review from creydr February 2, 2024 13:42

creydr suggested changes Feb 2, 2024

View reviewed changes

knative-prow bot assigned creydr Feb 2, 2024

Leo6Leo added 4 commits February 2, 2024 09:23

Running the codegen

0ccf69c

Merge remote-tracking branch 'origin/add-cache-to-token-provider' int…

8f2922a

…o add-cache-to-token-provider

Revert "Running the codegen"

647acae

This reverts commit 0ccf69c.

Use constant, set buffer before token expire, remove unnecessary change

bfcda15

Leo6Leo requested a review from creydr February 2, 2024 17:19

Leo6Leo added 3 commits February 2, 2024 14:32

Codegen changes

49315fb

Merge branch 'main' into add-cache-to-token-provider

20d3f70

Codegen changes

2e58953

creydr reviewed Feb 5, 2024

View reviewed changes

data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java Outdated Show resolved Hide resolved

data-plane/core/src/main/java/dev/knative/eventing/kafka/broker/core/oidc/TokenProvider.java Outdated Show resolved Hide resolved

Leo6Leo and others added 2 commits February 5, 2024 08:36

Update data-plane/core/src/main/java/dev/knative/eventing/kafka/broke…

002b4af

…r/core/oidc/TokenProvider.java Co-authored-by: Christoph Stäbler <cstabler@redhat.com>

Fix the review comments

0f871a1

Leo6Leo requested a review from creydr February 5, 2024 13:37

creydr approved these changes Feb 5, 2024

View reviewed changes

knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024

knative-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024

Run codegen

39fe324

Leo6Leo requested a review from creydr February 5, 2024 15:11

Codegen changes

7fd6d45

Code gen again

8606b6e

creydr reviewed Feb 6, 2024

View reviewed changes

knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2024

knative-prow bot merged commit 2c8b901 into knative-extensions:main Feb 6, 2024
31 of 33 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[data-plane] Add the caching for OIDC JWT token to tokenprovider #3663

[data-plane] Add the caching for OIDC JWT token to tokenprovider #3663

Leo6Leo commented Feb 1, 2024

codecov bot commented Feb 1, 2024 •

edited

Leo6Leo commented Feb 2, 2024

creydr left a comment

creydr left a comment

knative-prow bot commented Feb 5, 2024

creydr commented Feb 5, 2024

creydr commented Feb 5, 2024

creydr commented Feb 6, 2024

creydr left a comment

[data-plane] Add the caching for OIDC JWT token to tokenprovider #3663

[data-plane] Add the caching for OIDC JWT token to tokenprovider #3663

Conversation

Leo6Leo commented Feb 1, 2024

Proposed Changes

codecov bot commented Feb 1, 2024 • edited

Codecov Report

Leo6Leo commented Feb 2, 2024

creydr left a comment

Choose a reason for hiding this comment

creydr left a comment

Choose a reason for hiding this comment

knative-prow bot commented Feb 5, 2024

creydr commented Feb 5, 2024

creydr commented Feb 5, 2024

creydr commented Feb 6, 2024

creydr left a comment

Choose a reason for hiding this comment

codecov bot commented Feb 1, 2024 •

edited