From 7716328e40d57599776a703c7113788990aba708 Mon Sep 17 00:00:00 2001
From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Tue, 12 Nov 2019 14:41:05 -0300
Subject: [PATCH] 15642: Fixes legacy config loading for arv-git-httpd.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---
 lib/config/deprecated.go | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index f1714fa0b9..95116ec2e5 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -460,11 +460,11 @@ const defaultGitHttpdConfigPath = "/etc/arvados/git-httpd/git-httpd.yml"
 
 type oldGitHttpdConfig struct {
 	Client          *arvados.Client
-	Listen          string
-	GitCommand      string
-	GitoliteHome    string
-	RepoRoot        string
-	ManagementToken string
+	Listen          *string
+	GitCommand      *string
+	GitoliteHome    *string
+	RepoRoot        *string
+	ManagementToken *string
 }
 
 func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
@@ -486,12 +486,21 @@ func (ldr *Loader) loadOldGitHttpdConfig(cfg *arvados.Config) error {
 
 	loadOldClientConfig(cluster, oc.Client)
 
-	cluster.Services.GitHTTP.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{}
-	cluster.TLS.Insecure = oc.Client.Insecure
-	cluster.ManagementToken = oc.ManagementToken
-	cluster.Git.GitCommand = oc.GitCommand
-	cluster.Git.GitoliteHome = oc.GitoliteHome
-	cluster.Git.Repositories = oc.RepoRoot
+	if oc.Listen != nil {
+		cluster.Services.GitHTTP.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
+	}
+	if oc.ManagementToken != nil {
+		cluster.ManagementToken = *oc.ManagementToken
+	}
+	if oc.GitCommand != nil {
+		cluster.Git.GitCommand = *oc.GitCommand
+	}
+	if oc.GitoliteHome != nil {
+		cluster.Git.GitoliteHome = *oc.GitoliteHome
+	}
+	if oc.RepoRoot != nil {
+		cluster.Git.Repositories = *oc.RepoRoot
+	}
 
 	cfg.Clusters[cluster.ClusterID] = *cluster
 	return nil
-- 
2.30.2