Merge pull request #41 from nulab/issue-40/add-env-var-field-to-ctx

add environment variable field to context (#40)
nulab · Sep 22, 2018 · 7563f67 · 7563f67
2 parents 3f35dbe + d968a05
commit 7563f67
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/addon/handler/archive/archive.go b/addon/handler/archive/archive.go
@@ -47,6 +47,7 @@ func (ghx *gitHTTPXfer) Archive(ctx githttpxfer.Context) {
 
 	args := []string{"archive", "--format=" + format, "--prefix=" + repoName + "-" + tree + "/", tree}
 	cmd := ghx.Git.GitCommand(repoPath, args...)
+	cmd.Env = ctx.Env()
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {

diff --git a/githttpxfer/context.go b/githttpxfer/context.go
@@ -13,13 +13,16 @@ type (
 		SetRepoPath(repoPath string)
 		FilePath() string
 		SetFilePath(filePath string)
+		Env() []string
+		SetEnv(env []string)
 	}
 
 	context struct {
 		response *Response
 		request  *http.Request
 		repoPath string
 		filePath string
+		env      []string
 	}
 )
 
@@ -59,3 +62,11 @@ func (c *context) FilePath() string {
 func (c *context) SetFilePath(filePath string) {
 	c.filePath = filePath
 }
+
+func (c *context) Env() []string {
+	return c.env
+}
+
+func (c *context) SetEnv(env []string) {
+	c.env = env
+}
diff --git a/githttpxfer/git.go b/githttpxfer/git.go
@@ -46,16 +46,6 @@ func (g *git) Exists(repoPath string) bool {
 	return true
 }
 
-func (g *git) GetInfoRefs(repoPath, serviceName string) ([]byte, error) {
-	args := []string{serviceName, "--stateless-rpc", "--advertise-refs", "."}
-	return g.GitCommand(repoPath, args...).Output()
-}
-
-func (g *git) UpdateServerInfo(repoPath string) ([]byte, error) {
-	args := []string{"update-server-info"}
-	return g.GitCommand(repoPath, args...).Output()
-}
-
 func (g *git) GitCommand(repoPath string, args ...string) *exec.Cmd {
 	command := exec.Command(g.binPath, args...)
 	command.Dir = g.GetAbsolutePath(repoPath)

diff --git a/githttpxfer/githttpxfer.go b/githttpxfer/githttpxfer.go
@@ -265,6 +265,7 @@ func (ghx *GitHTTPXfer) serviceRPC(ctx Context, rpc string) {
 
 	args := []string{rpc, "--stateless-rpc", "."}
 	cmd := ghx.Git.GitCommand(repoPath, args...)
+	cmd.Env = ctx.Env()
 
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
@@ -325,15 +326,21 @@ func (ghx *GitHTTPXfer) getInfoRefs(ctx Context) {
 
 	serviceName := getServiceType(req)
 	if !ghx.Git.HasAccess(req, serviceName, false) {
-		ghx.Git.UpdateServerInfo(repoPath)
+		args := []string{"update-server-info"}
+		cmd := ghx.Git.GitCommand(repoPath, args...)
+		cmd.Env = ctx.Env()
+		cmd.Output()
 		res.HdrNocache()
 		if err := ghx.sendFile("text/plain; charset=utf-8", ctx); err != nil {
 			RenderNotFound(res.Writer)
 			return
 		}
 	}
 
-	refs, err := ghx.Git.GetInfoRefs(repoPath, serviceName)
+	args := []string{serviceName, "--stateless-rpc", "--advertise-refs", "."}
+	cmd := ghx.Git.GitCommand(repoPath, args...)
+	cmd.Env = ctx.Env()
+	refs, err := cmd.Output()
 	if err != nil {
 		RenderNotFound(ctx.Response().Writer)
 		return