basebuilder/abra
0
0
Fork 0
forked from toolshed/abra
Code Pull Requests Activity

fix: retain backwards compat with TYPE/RECIPE change

Browse Source
This commit is contained in:
decentral1se
2022-03-11 19:37:50 +01:00
parent e9cfb076c6
commit d3e127e5c8
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/config/app.go
View File

@ -124,7 +124,10 @@ func newApp(env AppEnv, name string, appFile AppFile) (App, error) {
recipe, exists := env["RECIPE"] recipe, exists := env["RECIPE"]
if !exists { if !exists {
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name) recipe, exists = env["TYPE"]
if !exists {
return App{}, fmt.Errorf("%s is missing the RECIPE env var", name)
}
} }
return App{ return App{

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

@ -35,16 +35,21 @@ func LoadComposefile(opts Deploy, appEnv map[string]string) (*composetypes.Confi
return nil, err return nil, err
} }
recipeName, exists := appEnv["RECIPE"]
if !exists {
recipeName, _ = appEnv["TYPE"]
}
unsupportedProperties := loader.GetUnsupportedProperties(dicts...) unsupportedProperties := loader.GetUnsupportedProperties(dicts...)
if len(unsupportedProperties) > 0 { if len(unsupportedProperties) > 0 {
logrus.Warnf("%s: ignoring unsupported options: %s", logrus.Warnf("%s: ignoring unsupported options: %s",
appEnv["RECIPE"], strings.Join(unsupportedProperties, ", ")) recipeName, strings.Join(unsupportedProperties, ", "))
} }
deprecatedProperties := loader.GetDeprecatedProperties(dicts...) deprecatedProperties := loader.GetDeprecatedProperties(dicts...)
if len(deprecatedProperties) > 0 { if len(deprecatedProperties) > 0 {
logrus.Warnf("%s: ignoring deprecated options: %s", logrus.Warnf("%s: ignoring deprecated options: %s",
appEnv["RECIPE"], propertyWarnings(deprecatedProperties)) recipeName, propertyWarnings(deprecatedProperties))
} }
return config, nil return config, nil
} }