refactor Gitaly dialOpts

Author: bkcsoft

go/internal/handler/handler.go

@@ -5,6 +5,10 @@ import (
 "os/exec"
 "syscall"
 
+"google.golang.org/grpc"
+
+"gitlab.com/gitlab-org/gitaly/auth"
+"gitlab.com/gitlab-org/gitaly/client"
 "gitlab.com/gitlab-org/gitlab-shell/go/internal/config"
 "gitlab.com/gitlab-org/gitlab-shell/go/internal/logger"
 )
@@ -36,3 +40,12 @@ func execCommand(command string, args ...string) error {
 args = append([]string{binPath}, args...)
 return syscall.Exec(binPath, args, os.Environ())
 }
+
+func dialOpts(token string) []grpc.DialOption {
+connOpts := client.DefaultDialOpts
+if token := os.Getenv("GITALY_TOKEN"); token != "" {
+connOpts = append(client.DefaultDialOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentials(token)))
+}
+
+return connOpts
+}

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
 }

go/internal/handler/upload_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 UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (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
 }