fix(vcs): remove UI URL from config, get it by API call (#5936)

Signed-off-by: francois  samin <[email protected]>

Author: fsamin

engine/vcs/types.go

@@ -16,18 +16,18 @@ type Service struct {
 	Cfg    Configuration
 	Router *api.Router
 	Cache  cache.Store
+	UI     struct {
+		HTTP struct {
+			URL string
+		}
+	}
 }
 
 // Configuration is the vcs configuration structure
 type Configuration struct {
-	Name string                          `toml:"name" comment:"Name of this CDS VCS Service\n Enter a name to enable this service" json:"name"`
-	HTTP service.HTTPRouterConfiguration `toml:"http" comment:"######################\n CDS VCS HTTP Configuration \n######################" json:"http"`
-	URL  string                          `default:"http://localhost:8084" json:"url"`
-	UI   struct {
-		HTTP struct {
-			URL string `toml:"url" default:"http://localhost:8080" json:"url"`
-		} `toml:"http" json:"http"`
-	} `toml:"ui" json:"ui"`
+	Name  string                          `toml:"name" comment:"Name of this CDS VCS Service\n Enter a name to enable this service" json:"name"`
+	HTTP  service.HTTPRouterConfiguration `toml:"http" comment:"######################\n CDS VCS HTTP Configuration \n######################" json:"http"`
+	URL   string                          `default:"http://localhost:8084" json:"url"`
 	API   service.APIServiceConfiguration `toml:"api" comment:"######################\n CDS API Settings \n######################" json:"api"`
 	Cache struct {
 		TTL   int `toml:"ttl" default:"60" json:"ttl"`

engine/vcs/vcs.go

@@ -93,7 +93,7 @@ func (s *Service) getConsumer(name string) (sdk.VCSServer, error) {
 			serverCfg.URL,
 			serverCfg.Github.APIURL,
 			s.Cfg.API.HTTP.URL,
-			s.Cfg.UI.HTTP.URL,
+			s.UI.HTTP.URL,
 			serverCfg.Github.ProxyWebhook,
 			serverCfg.Github.Username,
 			serverCfg.Github.Token,
@@ -107,7 +107,7 @@ func (s *Service) getConsumer(name string) (sdk.VCSServer, error) {
 			[]byte(serverCfg.Bitbucket.PrivateKey),
 			serverCfg.URL,
 			s.Cfg.API.HTTP.URL,
-			s.Cfg.UI.HTTP.URL,
+			s.UI.HTTP.URL,
 			serverCfg.Bitbucket.ProxyWebhook,
 			serverCfg.Bitbucket.Username,
 			serverCfg.Bitbucket.Token,
@@ -119,7 +119,7 @@ func (s *Service) getConsumer(name string) (sdk.VCSServer, error) {
 		return bitbucketcloud.New(serverCfg.BitbucketCloud.ClientID,
 			serverCfg.BitbucketCloud.ClientSecret,
 			serverCfg.URL,
-			s.Cfg.UI.HTTP.URL,
+			s.UI.HTTP.URL,
 			serverCfg.BitbucketCloud.ProxyWebhook,
 			s.Cache,
 			serverCfg.BitbucketCloud.Status.Disable,
@@ -131,7 +131,7 @@ func (s *Service) getConsumer(name string) (sdk.VCSServer, error) {
 			serverCfg.Gitlab.Secret,
 			serverCfg.URL,
 			serverCfg.Gitlab.CallbackURL,
-			s.Cfg.UI.HTTP.URL,
+			s.UI.HTTP.URL,
 			serverCfg.Gitlab.ProxyWebhook,
 			s.Cache,
 			serverCfg.Gitlab.Status.Disable,
@@ -156,6 +156,13 @@ func (s *Service) Serve(c context.Context) error {
 	log.Info(c, "VCS> Starting service %s %s...", s.Cfg.Name, sdk.VERSION)
 	s.StartupTime = time.Now()
 
+	// Retrieve UI URL from API
+	cfgUser, err := s.Client.ConfigUser()
+	if err != nil {
+		return err
+	}
+	s.UI.HTTP.URL = cfgUser.URLUI
+
 	//Init the cache
 	var errCache error
 	s.Cache, errCache = cache.New(s.Cfg.Cache.Redis.Host, s.Cfg.Cache.Redis.Password, s.Cfg.Cache.TTL)