coop-cloud/abra
coop-cloud
/
abra
5
2
Fork 15
Code Issues Pull Requests 5 Packages Releases 36 Activity

refactor: fix log style and add recipe context

This commit is contained in:
decentral1se 2021-12-19 23:08:03 +01:00
parent fdc9e8b5fd
commit f5caf5587a
Signed by: decentral1se
GPG Key ID: 03789458B3D0C410
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/upstream/stack/loader.go
View File

@ -29,7 +29,7 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
config, err := loader.Load(configDetails, DontSkipValidation) config, err := loader.Load(configDetails, DontSkipValidation)
if err != nil { if err != nil {
if fpe, ok := err.(*loader.ForbiddenPropertiesError); ok { if fpe, ok := err.(*loader.ForbiddenPropertiesError); ok {
return nil, fmt.Errorf("compose file contains unsupported options:\n\n%s", return nil, fmt.Errorf("compose file contains unsupported options: %s",
propertyWarnings(fpe.Properties)) propertyWarnings(fpe.Properties))
} }
return nil, err return nil, err
@ -37,14 +37,14 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
unsupportedProperties := loader.GetUnsupportedProperties(dicts...) unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
if len(unsupportedProperties) > 0 { if len(unsupportedProperties) > 0 {
logrus.Warnf("Ignoring unsupported options: %s\n\n", logrus.Warnf("%s: ignoring unsupported options: %s",
strings.Join(unsupportedProperties, ", ")) appEnv["TYPE"], strings.Join(unsupportedProperties, ", "))
} }
deprecatedProperties := loader.GetDeprecatedProperties(dicts...) deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
if len(deprecatedProperties) > 0 { if len(deprecatedProperties) > 0 {
logrus.Warnf("Ignoring deprecated options:\n\n%s\n\n", logrus.Warnf("%s: ignoring deprecated options: %s",
propertyWarnings(deprecatedProperties)) appEnv["TYPE"], propertyWarnings(deprecatedProperties))
} }
return config, nil return config, nil
} }