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 /go/internal/handler/handler.go | |
parent | 51fe7f28f9de3f36198ecb72726b84f16e205893 (diff) | |
download | gitlab-shell-164baba2298062626c69124baea0321174c452ef.tar.gz |
refactor Gitaly dialOptsgitaly-124-gitaly-ssh
Diffstat (limited to 'go/internal/handler/handler.go')
-rw-r--r-- | go/internal/handler/handler.go | 13 |
1 files changed, 13 insertions, 0 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 +} |