From d539068dc372e46d10adee89e9b96b59156a2bb6 Mon Sep 17 00:00:00 2001 From: Lucas Charles Date: Wed, 17 Feb 2021 13:49:46 -0800 Subject: chore: Refactor env introspection to rely on command initialization Refactors introspection of execution environment to rely on per-connection state (`gitlab-shell`) or per request (`gitlab-sshd`) Relates to https://gitlab.com/gitlab-org/gitlab-shell/-/issues/496 --- internal/command/uploadpack/uploadpack.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'internal/command/uploadpack/uploadpack.go') diff --git a/internal/command/uploadpack/uploadpack.go b/internal/command/uploadpack/uploadpack.go index bf5db2c..fca3823 100644 --- a/internal/command/uploadpack/uploadpack.go +++ b/internal/command/uploadpack/uploadpack.go @@ -2,7 +2,6 @@ package uploadpack import ( "context" - "os" "gitlab.com/gitlab-org/gitlab-shell/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" @@ -39,14 +38,7 @@ func (c *Command) Execute(ctx context.Context) error { return customAction.Execute(ctx, response) } - var gitProtocolVersion string - if c.Args.RemoteAddr != nil { - gitProtocolVersion = c.Args.GitProtocolVersion - } else { - gitProtocolVersion = os.Getenv(commandargs.GitProtocolEnv) - } - - return c.performGitalyCall(response, gitProtocolVersion) + return c.performGitalyCall(response) } func (c *Command) verifyAccess(ctx context.Context, repo string) (*accessverifier.Response, error) { -- cgit v1.2.1