refactor Gitaly dialOptsgitaly-124-gitaly-ssh

1 files changed, 1 insertions, 9 deletions

diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go
index 691af64..3116bd1 100644
--- a/go/internal/handler/receive_pack.go
+++ b/go/internal/handler/receive_pack.go
@@ -5,10 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"google.golang.org/grpc"
-
 	pb "gitlab.com/gitlab-org/gitaly-proto/go"
-	"gitlab.com/gitlab-org/gitaly/auth"
 	"gitlab.com/gitlab-org/gitaly/client"
 )
 
@@ -17,12 +14,7 @@ func ReceivePack(gitalyAddress string, request *pb.SSHReceivePackRequest) (int32
 		return 0, fmt.Errorf("no gitaly_address given")
 	}
 
-	connOpts := client.DefaultDialOpts
-	if token := os.Getenv("GITALY_TOKEN"); token != "" {
-		connOpts = append(client.DefaultDialOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentials(token)))
-	}
-
-	conn, err := client.Dial(gitalyAddress, connOpts)
+	conn, err := client.Dial(gitalyAddress, dialOpts(os.Getenv("GITALY_TOKEN")))
 	if err != nil {
 		return 0, err
 	}