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.

Sign up for GitHub

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

client: remove the deprecate function grpc.WithInsecure() #5447

Closed
wants to merge 4 commits into from
Closed

client: remove the deprecate function grpc.WithInsecure() #5447

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee5fad
remove the deprecate function grpc.WithInsecure()
bufferflies Aug 22, 2022
8220d10
Merge branch 'master' into grpcutil/remove_grpc.WithInsecure
bufferflies Aug 22, 2022
0e5ebe5
Merge branch 'master' into grpcutil/remove_grpc.WithInsecure
bufferflies Aug 22, 2022
fb4147d
Merge branch 'master' into grpcutil/remove_grpc.WithInsecure
bufferflies Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions client/grpcutil/grpcutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/tikv/pd/client/errs"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/metadata"
)

Expand All @@ -42,11 +43,11 @@ const ForwardMetadataKey = "pd-forwarded-host"
// ctx will be noop. Users should call ClientConn.Close to terminate all the
// pending operations after this function returns.
func GetClientConn(ctx context.Context, addr string, tlsCfg *tls.Config, do ...grpc.DialOption) (*grpc.ClientConn, error) {
opt := grpc.WithInsecure() //nolint
creds := insecure.NewCredentials()
Copy link
Member

Choose a reason for hiding this comment

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

Should we replace all WithInsecure with insecure.NewCredentials()?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, some grpc version is not same, the etcd can not upgrade to 1.43.

if tlsCfg != nil {
creds := credentials.NewTLS(tlsCfg)
opt = grpc.WithTransportCredentials(creds)
creds = credentials.NewTLS(tlsCfg)
}
opt := grpc.WithTransportCredentials(creds)
u, err := url.Parse(addr)
if err != nil {
return nil, errs.ErrURLParse.Wrap(err).GenWithStackByCause()
Expand Down