Merge pull request #60 from gitopia/fix-git-hook

faza · web-flow · commit d204d8dd0ef1 · 2023-09-22T17:14:04.000+05:30
Configure grpc host during build time for git hooks
diff --git a/Makefile b/Makefile
@@ -1,3 +1,6 @@
+GITOPIA_ENV ?= prod
+BUILD_FLAGS := -tags "$(GITOPIA_ENV)"
+
 all: install
 
 .PHONY: build
@@ -11,7 +14,7 @@ build:
 install: go.sum
 		@echo "--> Installing gitopia services"
 		@go install -mod=readonly .
-		@go install ./hooks/gitopia-pre-receive 
+		@go install $(BUILD_FLAGS) ./hooks/gitopia-pre-receive 
 		@go install ./hooks/gitopia-post-receive 
 		
 go.sum: go.mod
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [v2.2.0] - 2023-09-22
+- Configure grpc host during build
+
 ## [v2.1.0] - 2023-07-27
 
 - fix pr diff api to return git triple dot diff
diff --git a/hooks/gitopia-post-receive/main.go b/hooks/gitopia-post-receive/main.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/gitopia/git-server/hooks/utils"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 )
 
 func receive(reader io.Reader) error {
@@ -23,7 +22,7 @@ func receive(reader io.Reader) error {
 	}
 
 	// create dangling ref
-	if force || input.Action == utils.DeleteAction{
+	if force || input.Action == utils.DeleteAction {
 		cmd := exec.Command("git", "update-ref", "refs/dangling/"+input.OldRev, input.OldRev)
 		errPipe, err := cmd.StderrPipe()
 		if err != nil {
@@ -51,7 +50,6 @@ func receive(reader io.Reader) error {
 }
 
 func main() {
-	viper.AutomaticEnv()
 	// Git hook data is provided via STDIN
 	if err := receive(os.Stdin); err != nil {
 		log.Println(err)
diff --git a/hooks/gitopia-post-receive/readme.md b/hooks/gitopia-post-receive/readme.md
@@ -1,10 +1,3 @@
-# gitopia pre-receive events
+# gitopia post-receive events
 
 gitopia post receive hook for git server
-
-
-## configuration
-set below environment variables
-```
-export GITOPIA_ADDR="localhost:9090"
-```
diff --git a/hooks/gitopia-pre-receive/config/config_prod.go b/hooks/gitopia-pre-receive/config/config_prod.go
@@ -0,0 +1,7 @@
+//go:build prod
+
+package config
+
+const (
+	GRPCHost = "grpc.gitopia.com:9090"
+)
diff --git a/hooks/gitopia-pre-receive/config/config_testing.go b/hooks/gitopia-pre-receive/config/config_testing.go
@@ -0,0 +1,7 @@
+//go:build testing
+
+package config
+
+const (
+	GRPCHost = "localhost:9090"
+)
diff --git a/hooks/gitopia-pre-receive/gitopia.go b/hooks/gitopia-pre-receive/gitopia.go
@@ -4,13 +4,13 @@ import (
 	"context"
 
 	"cosmossdk.io/errors"
+	"github.com/gitopia/git-server/hooks/gitopia-pre-receive/config"
 	"github.com/gitopia/gitopia-go"
 	"github.com/gitopia/gitopia/v2/x/gitopia/types"
-	"github.com/spf13/viper"
 )
 
 func IsForcePushAllowedForBranch(repo uint64, branch string) (bool, error) {
-	qc, err := gitopia.GetQueryClient(viper.GetString("GITOPIA_ADDR"))
+	qc, err := gitopia.GetQueryClient(config.GRPCHost)
 	if err != nil {
 		return false, errors.Wrap(err, "error connecting to gitopia")
 	}
@@ -31,4 +31,4 @@ func IsForcePushAllowedForBranch(repo uint64, branch string) (bool, error) {
 		return false, errors.Wrap(err, "error querying repo branch")
 	}
 	return branchRes.Branch.AllowForcePush, nil
-}
+}
diff --git a/hooks/gitopia-pre-receive/main.go b/hooks/gitopia-pre-receive/main.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/gitopia/git-server/hooks/utils"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 )
 
 var NonFFErr = errors.New("non fast-forward pushes are not allowed")
@@ -47,7 +46,6 @@ func receive(reader io.Reader) error {
 }
 
 func main() {
-	viper.AutomaticEnv()
 	// Git hook data is provided via STDIN
 	if err := receive(os.Stdin); err != nil {
 		log.Println(err)
diff --git a/hooks/gitopia-pre-receive/readme.md b/hooks/gitopia-pre-receive/readme.md
@@ -1,10 +1,4 @@
 # gitopia pre-receive events
 
 gitopia pre receive hook for git server
-
-
-## configuration
-set below environment variables
-```
-export GITOPIA_ADDR="localhost:9090"
 ```

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/gitopia/git-server/hooks/utils"`
`10`	`10`	`"github.com/pkg/errors"`
`11`		`- "github.com/spf13/viper"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`func receive(reader io.Reader) error {`
`@@ -23,7 +22,7 @@ func receive(reader io.Reader) error {`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`// create dangling ref`
`26`		`- if force \|\| input.Action == utils.DeleteAction{`
	`25`	`+ if force \|\| input.Action == utils.DeleteAction {`
`27`	`26`	`cmd := exec.Command("git", "update-ref", "refs/dangling/"+input.OldRev, input.OldRev)`
`28`	`27`	`errPipe, err := cmd.StderrPipe()`
`29`	`28`	`if err != nil {`
`@@ -51,7 +50,6 @@ func receive(reader io.Reader) error {`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`func main() {`
`54`		`- viper.AutomaticEnv()`
`55`	`53`	`// Git hook data is provided via STDIN`
`56`	`54`	`if err := receive(os.Stdin); err != nil {`
`57`	`55`	`log.Println(err)`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"cosmossdk.io/errors"`
	`7`	`+ "github.com/gitopia/git-server/hooks/gitopia-pre-receive/config"`
`7`	`8`	`"github.com/gitopia/gitopia-go"`
`8`	`9`	`"github.com/gitopia/gitopia/v2/x/gitopia/types"`
`9`		`- "github.com/spf13/viper"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func IsForcePushAllowedForBranch(repo uint64, branch string) (bool, error) {`
`13`		`- qc, err := gitopia.GetQueryClient(viper.GetString("GITOPIA_ADDR"))`
	`13`	`+ qc, err := gitopia.GetQueryClient(config.GRPCHost)`
`14`	`14`	`if err != nil {`
`15`	`15`	`return false, errors.Wrap(err, "error connecting to gitopia")`
`16`	`16`	`}`
`@@ -31,4 +31,4 @@ func IsForcePushAllowedForBranch(repo uint64, branch string) (bool, error) {`
`31`	`31`	`return false, errors.Wrap(err, "error querying repo branch")`
`32`	`32`	`}`
`33`	`33`	`return branchRes.Branch.AllowForcePush, nil`
`34`		`-}`
	`34`	`+}`