codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: less quotes

Browse Source
This commit is contained in:
cellarspoon
2021-12-20 00:49:36 +01:00
parent 053a06ccba
commit 0a903f041f
5 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/config/app.go
View File

@ -142,7 +142,7 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
}
}
logrus.Debugf("collecting metadata from '%v' servers: '%s'", len(servers), strings.Join(servers, ", "))
logrus.Debugf("collecting metadata from %v servers: %s", len(servers), strings.Join(servers, ", "))
for _, server := range servers {
serverDir := path.Join(ABRA_SERVER_FOLDER, server)
@ -168,7 +168,7 @@ func LoadAppFiles(servers ...string) (AppFiles, error) {
func GetApp(apps AppFiles, name AppName) (App, error) {
appFile, exists := apps[name]
if !exists {
return App{}, fmt.Errorf("cannot find app with name '%s'", name)
return App{}, fmt.Errorf("cannot find app with name %s", name)
}
app, err := readAppEnvFile(appFile, name)
@ -268,7 +268,7 @@ func TemplateAppEnvSample(appType, appName, server, domain, recipe string) error
return err
}
logrus.Debugf("copied '%s' to '%s'", envSamplePath, appEnvPath)
logrus.Debugf("copied %s to %s", envSamplePath, appEnvPath)
return nil
}
@ -324,7 +324,7 @@ func GetAppStatuses(appFiles AppFiles) (map[string]map[string]string, error) {
}
}
logrus.Debugf("retrieved app statuses: '%s'", statuses)
logrus.Debugf("retrieved app statuses: %s", statuses)
return statuses, nil
}
@ -343,13 +343,13 @@ func GetAppComposeFiles(recipe string, appEnv AppEnv) ([]string, error) {
composeFileEnvVar := appEnv["COMPOSE_FILE"]
envVars := strings.Split(composeFileEnvVar, ":")
logrus.Debugf("COMPOSE_FILE detected ('%s'), loading '%s'", composeFileEnvVar, strings.Join(envVars, ", "))
logrus.Debugf("COMPOSE_FILE detected (%s), loading %s", composeFileEnvVar, strings.Join(envVars, ", "))
for _, file := range strings.Split(composeFileEnvVar, ":") {
path := fmt.Sprintf("%s/%s/%s", APPS_DIR, recipe, file)
composeFiles = append(composeFiles, path)
}
logrus.Debugf("retrieved '%s' configs for '%s'", strings.Join(composeFiles, ", "), recipe)
logrus.Debugf("retrieved %s configs for %s", strings.Join(composeFiles, ", "), recipe)
return composeFiles, nil
}
@ -363,7 +363,7 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv AppEnv) (*comp
return &composetypes.Config{}, err
}
logrus.Debugf("retrieved '%s' for '%s'", compose.Filename, recipe)
logrus.Debugf("retrieved %s for %s", compose.Filename, recipe)
return compose, nil
}