Skip to content

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #12343

What problem does this PR solve?

Issue Number: close #12340 ref #12249

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

`None`.

@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Sep 28, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 28, 2025
Copy link
Contributor

ti-chi-bot bot commented Sep 28, 2025

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ti-chi-bot
Copy link
Member Author

@wk989898 This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

Copy link
Contributor

ti-chi-bot bot commented Sep 28, 2025

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Copy link
Contributor

ti-chi-bot bot commented Sep 28, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign hi-rustin for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

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

Needs approval from an approver in each of these files:

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

@ti-chi-bot ti-chi-bot bot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 28, 2025
Copy link

Summary of Changes

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request primarily focuses on updating several Go module dependencies across the project, including a significant bump to the JWT library. Additionally, it introduces a new OAuth2 server component, which appears to be a standalone utility or example, demonstrating OAuth2 functionality with JWT token generation. These changes aim to keep the project's dependencies current and potentially introduce new capabilities or address security concerns.

Highlights

  • New OAuth2 Server Component: A new Go file, cmd/oauth2-server/main.go, has been added to implement a basic OAuth2 server, demonstrating authorization and token generation capabilities.
  • JWT Library Update: The github.com/golang-jwt/jwt/v5 dependency has been updated to v5.3.0, ensuring the use of the latest version for JSON Web Token handling.
  • Extensive Dependency Bumps: Numerous other Go module dependencies have been updated, including the AWS SDK, go-mysql-org/go-mysql, go-oauth2/oauth2/v4, and various golang.org/x libraries, to maintain up-to-date and secure project dependencies.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@ti-chi-bot ti-chi-bot bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 28, 2025
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request updates JWT dependencies and introduces a test OAuth2 server. However, it has critical issues with unresolved merge conflicts in go.mod and go.sum that must be addressed before merging. Additionally, there are a couple of improvements suggested for the newly added test server code concerning command-line flag configuration and HTTP response handling.

Comment on lines +13 to +21
<<<<<<< HEAD
github.com/aws/aws-sdk-go v1.44.259
=======
github.com/apache/pulsar-client-go v0.13.0
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2 v1.38.1
github.com/aws/aws-sdk-go-v2/config v1.27.37
github.com/aws/aws-sdk-go-v2/credentials v1.17.35
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))

Choose a reason for hiding this comment

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

critical

This file contains unresolved merge conflict markers. This is a critical issue that must be resolved before this pull request can be merged. Please clean up the go.mod file to reflect the correct dependencies and remove the conflict markers.

Comment on lines +137 to +144
<<<<<<< HEAD
github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8=
=======
github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/DiJbg=
github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw=
github.com/apache/pulsar-client-go v0.13.0 h1:XB8jbcVgBZlRkswtTFj6Xy3Hv0mtpvT8xn/ovT1c0I0=
github.com/apache/pulsar-client-go v0.13.0/go.mod h1:btNzPWaKtG9geL6naJNYwXnqJJ/codYM41awyZxZLQ4=
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))

Choose a reason for hiding this comment

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

critical

This file contains unresolved merge conflict markers, likely as a result of the conflicts in go.mod. After resolving conflicts in go.mod, please run go mod tidy to regenerate this file correctly.

"SJhX36_KapYSybBtJq35lxX_Brr4LRURSkm7QmXJGmy8pUFW9EIOcVQPsykz9-jj", "Secret to sign token")
cmd.Flags().StringVar(&serverConfig.clientID, "client-id", "1234", "Client ID of oauth2")
cmd.Flags().StringVar(&serverConfig.clientSecret, "client-secret", "e0KVlA2EiBfjoN13olyZd2kv1KL", "Client secret of oauth2")
cmd.Flags().IntVar(&serverConfig.port, "log-file", 9096, "log file path")

Choose a reason for hiding this comment

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

high

The command-line flag is misconfigured. The flag name is log-file and the description is log file path, but it configures the server port (serverConfig.port). This is misleading and should be corrected to reflect its actual purpose.

Suggested change
cmd.Flags().IntVar(&serverConfig.port, "log-file", 9096, "log file path")
cmd.Flags().IntVar(&serverConfig.port, "port", 9096, "Port for the oauth2 server")

Comment on lines +155 to +156
_, _ = w.Write([]byte(fmt.Sprintf(openIDConfiguration, serverConfig.port, serverConfig.port, serverConfig.port)))
w.WriteHeader(200)

Choose a reason for hiding this comment

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

medium

In Go's net/http package, the response header should be written before the response body. Calling w.Write() implicitly sends a 200 OK status header, making the subsequent call to w.WriteHeader(200) redundant and ineffective. It's also good practice to set the Content-Type header for JSON responses. The suggested change corrects this and uses fmt.Fprintf for cleaner code.

Suggested change
_, _ = w.Write([]byte(fmt.Sprintf(openIDConfiguration, serverConfig.port, serverConfig.port, serverConfig.port)))
w.WriteHeader(200)
w.Header().Set("Content-Type", "application/json")
fmt.Fprintf(w, openIDConfiguration, serverConfig.port, serverConfig.port, serverConfig.port)

Copy link
Contributor

ti-chi-bot bot commented Sep 28, 2025

@ti-chi-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-verify 9fb0e36 link true /test pull-verify
pull-cdc-integration-mysql-test 9fb0e36 link true /test pull-cdc-integration-mysql-test
pull-cdc-integration-kafka-test 9fb0e36 link true /test pull-cdc-integration-kafka-test
pull-dm-integration-test 9fb0e36 link true /test pull-dm-integration-test
pull-dm-compatibility-test 9fb0e36 link true /test pull-dm-compatibility-test

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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

Labels

do-not-merge/cherry-pick-not-approved do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants