Remove gitserver host from default config and add liveness check

Author: faza

cmd/git-gitopia/lfs/init.go

@@ -60,7 +60,7 @@ func InitCommand() *cobra.Command {
 				}
 			}
 			gitServerHost, _ := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
-			if gitServerHost == "" {
+			if gitServerHost == "" || !api.CheckGitServerHostLiveness(gitServerHost) {
 				gitServerHost = api.GetBestGitServerHost(grpcHost)
 				if gitServerHost != "" {
 					if err := api.SetConfiguredGitServerHost(gitServerHost); err != nil {
@@ -90,10 +90,6 @@ func InitCommand() *cobra.Command {
 			}
 
 			remoteRepository := *res.Repository
-			gitServerHost, _ = config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
-			if gitServerHost == "" {
-				gitServerHost = config.GitServerHost
-			}
 			lfsURL := fmt.Sprintf("%v/%v.git", gitServerHost, remoteRepository.Id)
 
 			c = core.GitCommand("git", "config",

cmd/git-remote-gitopia/gitopia.go

@@ -69,7 +69,7 @@ func (h *GitopiaHandler) Initialize(remote *core.Remote) error {
 	}
 
 	gitServerHost, _ := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
-	if gitServerHost == "" {
+	if gitServerHost == "" || !api.CheckGitServerHostLiveness(gitServerHost) {
 		gitServerHost = api.GetBestGitServerHost(grpcHost)
 		if gitServerHost != "" {
 			if err := api.SetConfiguredGitServerHost(gitServerHost); err != nil {
@@ -148,9 +148,9 @@ func (h *GitopiaHandler) List(remote *core.Remote, forPush bool) ([]string, erro
 }
 
 func (h *GitopiaHandler) Fetch(remote *core.Remote, refsToFetch []core.RefToFetch) error {
-	gitServerHost, _ := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
-	if gitServerHost == "" {
-		gitServerHost = config.GitServerHost
+	gitServerHost, err := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
+	if err != nil {
+		return err
 	}
 	remoteURL := fmt.Sprintf("%v/%v.git", gitServerHost, h.remoteRepository.Id)
 
@@ -228,9 +228,9 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 		return nil, fmt.Errorf("fatal: you don't have write permissions to this repository")
 	}
 
-	gitServerHost, _ := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
-	if gitServerHost == "" {
-		gitServerHost = config.GitServerHost
+	gitServerHost, err := config.GitConfigGet(config.GitopiaConfigGitServerHostOption)
+	if err != nil {
+		return nil, err
 	}
 	remoteURL := fmt.Sprintf("%v/%v.git", gitServerHost, h.remoteRepository.Id)
 

config/config.go

@@ -36,9 +36,6 @@ func LoadGitConfig() error {
 	if res, err := GitConfigGet(GitopiaConfigChainIdOption); err == nil {
 		ChainId = res
 	}
-	if res, err := GitConfigGet(GitopiaConfigGitServerHostOption); err == nil {
-		GitServerHost = res
-	}
 	if res, err := GitConfigGet(GitopiaConfigGasPricesOption); err == nil {
 		GasPrices = res
 	}

config/config_dev.go

@@ -4,7 +4,6 @@ package config
 
 var (
 	ChainId        = "gitopia"
-	GitServerHost  = "https://server.devnet.gitopia.com"
 	GasPrices      = "0.001ulore"
 	FeeGranterAddr = ""
 	Denom          = "ulore"

config/config_prod.go

@@ -4,7 +4,6 @@ package config
 
 var (
 	ChainId        = "gitopia"
-	GitServerHost  = "https://server.gitopia.com"
 	GasPrices      = "0.001ulore"
 	FeeGranterAddr = "gitopia13ashgc6j5xle4m47kqyn5psavq0u3klmscfxql"
 	Denom          = "ulore"

config/config_testing.go

@@ -4,7 +4,6 @@ package config
 
 var (
 	ChainId        = "localgitopia"
-	GitServerHost  = "http://localhost:5001"
 	GasPrices      = "0.001ulore"
 	FeeGranterAddr = "gitopia12sjhqc3rqgvu3zpg8ekmwl005rp4ys58ekqg89"
 	Denom          = "ulore"

core/api/gitserver.go

@@ -7,6 +7,16 @@ import (
 	"github.com/gitopia/git-remote-gitopia/core"
 )
 
+func CheckGitServerHostLiveness(host string) bool {
+	res, err := http.Get(host + "/healthz")
+	if err != nil {
+		return false
+	}
+	defer res.Body.Close()
+
+	return res.StatusCode == http.StatusOK
+}
+
 func checkHttpHostLatency(host string) time.Duration {
 	start := time.Now()
 	_, err := http.Get(host)