Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Mangaal/argo-cd
Browse files Browse the repository at this point in the history
  • Loading branch information
Mangaal committed Mar 14, 2024
2 parents 4a92ab7 + abf770b commit 2c770db
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions util/grpc/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package grpc
import (
"context"
"crypto/tls"
"fmt"
"net"
"runtime/debug"
"strings"
Expand Down Expand Up @@ -68,13 +67,13 @@ func BlockingDial(ctx context.Context, network, address string, creds credential
conn, err := proxy.Dial(ctx, network, address)
if err != nil {
writeResult(err)
return nil, fmt.Errorf("error dial proxy: %w", err)
return nil, err
}
if creds != nil {
conn, _, err = creds.ClientHandshake(ctx, address, conn)
if err != nil {
writeResult(err)
return nil, fmt.Errorf("error creating connection: %w", err)
return nil, err
}
}
return conn, nil
Expand Down

0 comments on commit 2c770db

Please sign in to comment.