diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 16:38:35 +0200 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-07-07 16:38:35 +0200 |
commit | 164baba2298062626c69124baea0321174c452ef (patch) | |
tree | 07846fe0704d87a6b98f6a0eb2687598c0a3d6f5 | |
parent | 51fe7f28f9de3f36198ecb72726b84f16e205893 (diff) | |
download | gitlab-shell-164baba2298062626c69124baea0321174c452ef.tar.gz |
refactor Gitaly dialOptsgitaly-124-gitaly-ssh
-rw-r--r-- | go/internal/handler/handler.go | 13 | ||||
-rw-r--r-- | go/internal/handler/receive_pack.go | 10 | ||||
-rw-r--r-- | go/internal/handler/upload_pack.go | 10 |
3 files changed, 15 insertions, 18 deletions
diff --git a/go/internal/handler/handler.go b/go/internal/handler/handler.go index 927998d..f6b3c44 100644 --- a/go/internal/handler/handler.go +++ b/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 +} 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 } diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index e2cff11..ed0b67b 100644 --- a/go/internal/handler/upload_pack.go +++ b/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 } |