@@ -18,13 +18,14 @@ import (
1818)
1919
2020const (
21+ frogbotConfigDir = ".frogbot"
2122 FrogbotConfigFile = "frogbot-config.yml"
2223)
2324
2425var errFrogbotConfigNotFound = fmt .Errorf ("%s wasn't found in the Frogbot directory and its subdirectories. Assuming all the configuration is stored as environment variables" , FrogbotConfigFile )
2526
2627// Possible Config file path's to Frogbot Management repository
27- var frogbotConfigPath = filepath .Join (".frogbot" , FrogbotConfigFile )
28+ var osFrogbotConfigPath = filepath .Join (frogbotConfigDir , FrogbotConfigFile )
2829
2930type FrogbotConfigAggregator []FrogbotRepoConfig
3031
@@ -142,7 +143,7 @@ func getFrogbotConfig(client vcsclient.VcsClient) (configData *FrogbotConfigAggr
142143 }
143144 // Read the config from the current working dir, if reading from the target branch failed
144145 if targetConfigContent == nil && err == nil {
145- configData , err = ReadConfigFromFileSystem (frogbotConfigPath )
146+ configData , err = ReadConfigFromFileSystem (osFrogbotConfigPath )
146147 }
147148
148149 return configData , err
@@ -294,7 +295,7 @@ func extractEnvParams() (*coreconfig.ServerDetails, Git, error) {
294295// ReadConfigFromFileSystem looks for .frogbot/frogbot-config.yml from the given path. The path is relatively from the root.
295296// If the config file is not found in the relative path, it will search in parent dirs.
296297func ReadConfigFromFileSystem (configRelativePath string ) (config * FrogbotConfigAggregator , err error ) {
297- log .Debug ("Reading config from file system. Looking for" , frogbotConfigPath )
298+ log .Debug ("Reading config from file system. Looking for" , osFrogbotConfigPath )
298299 fullConfigDirPath , err := filepath .Abs (configRelativePath )
299300 if err != nil {
300301 return nil , err
@@ -398,24 +399,23 @@ func generateConfigAggregatorFromEnv(gitParams *Git, server *coreconfig.ServerDe
398399}
399400
400401// downloadConfigFromTarget downloads the .frogbot/frogbot-config.yml from the target repository
401- func downloadConfigFromTarget (client vcsclient.VcsClient ) ([]byte , error ) {
402+ func downloadConfigFromTarget (client vcsclient.VcsClient ) (configContent []byte , err error ) {
402403 var branch string
403404 _ = readParamFromEnv (GitBaseBranchEnv , & branch )
404405 var repo string
405406 _ = readParamFromEnv (GitRepoEnv , & repo )
406407 var owner string
407408 _ = readParamFromEnv (GitRepoOwnerEnv , & owner )
408- var configContent []byte
409- var err error
410409 var statusCode int
411410 if repo != "" && owner != "" {
412411 if branch == "" {
413412 log .Debug (GitBaseBranchEnv , "is missing. Assuming that the" , FrogbotConfigFile , "file exists on default branch" )
414413 }
415414 log .Debug ("Downloading" , FrogbotConfigFile , "from target" , owner , "/" , repo , "/" , branch )
416- configContent , statusCode , err = client .DownloadFileFromRepo (context .Background (), owner , repo , branch , frogbotConfigPath )
415+ gitFrogbotConfigPath := fmt .Sprintf ("%s/%s" , frogbotConfigDir , FrogbotConfigFile )
416+ configContent , statusCode , err = client .DownloadFileFromRepo (context .Background (), owner , repo , branch , gitFrogbotConfigPath )
417417 if statusCode == http .StatusNotFound {
418- log .Debug (frogbotConfigPath , "wasn't found on" , owner , "/" , repo )
418+ log .Debug (gitFrogbotConfigPath , "wasn't found on" , owner , "/" , repo )
419419 // If .frogbot/frogbot-config.yml isn't found, we'll try to run Frogbot using environment variables
420420 return nil , & ErrMissingConfig {errFrogbotConfigNotFound .Error ()}
421421 }
0 commit comments