deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

fixing typos

Browse Source
This commit is contained in:
Tuna 2016-08-10 10:09:27 +07:00
parent 8ddadfca88
commit 908a2563f1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/app/app.go
View File

@ -855,7 +855,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
// transform composeObject into komposeObject // transform composeObject into komposeObject
composeServiceNames := composeObject.ServiceConfigs.Keys() composeServiceNames := composeObject.ServiceConfigs.Keys()
// volume config and network config has not supported // volume config and network config are not supported
if len(composeObject.NetworkConfigs) > 0 { if len(composeObject.NetworkConfigs) > 0 {
logrus.Warningf("Unsupported network configuration of compose v2 - ignoring") logrus.Warningf("Unsupported network configuration of compose v2 - ignoring")
} }
@ -863,15 +863,15 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
logrus.Warningf("Unsupported volume configuration of compose v2 - ignoring") logrus.Warningf("Unsupported volume configuration of compose v2 - ignoring")
} }
count := 0 networksWarningFound := false
for _, name := range composeServiceNames { for _, name := range composeServiceNames {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok { if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok {
//FIXME: networks always contains one default element, even it isn't declared in compose v2. //FIXME: networks always contains one default element, even it isn't declared in compose v2.
if len(composeServiceConfig.Networks.Networks) > 0 && if len(composeServiceConfig.Networks.Networks) > 0 &&
strings.Compare(composeServiceConfig.Networks.Networks[0].Name, "default") != 0 && composeServiceConfig.Networks.Networks[0].Name != "default" &&
count == 0 { !networksWarningFound {
logrus.Warningf("Unsupported key networks - ignoring") logrus.Warningf("Unsupported key networks - ignoring")
count++ networksWarningFound = true
} }
checkUnsupportedKey(composeServiceConfig) checkUnsupportedKey(composeServiceConfig)
serviceConfig := ServiceConfig{} serviceConfig := ServiceConfig{}
@ -1182,7 +1182,7 @@ func Convert(c *cli.Context) {
func checkUnsupportedKey(service interface{}) { func checkUnsupportedKey(service interface{}) {
s := structs.New(service) s := structs.New(service)
for _, f := range s.Fields() { for _, f := range s.Fields() {
if f.IsExported() && !f.IsZero() && strings.Compare(f.Name(), "Networks") != 0 { if f.IsExported() && !f.IsZero() && f.Name() != "Networks" {
if count, ok := unsupportedKey[f.Name()]; ok && count == 0 { if count, ok := unsupportedKey[f.Name()]; ok && count == 0 {
logrus.Warningf("Unsupported key %s - ignoring", composeOptions[f.Name()]) logrus.Warningf("Unsupported key %s - ignoring", composeOptions[f.Name()])
unsupportedKey[f.Name()]++ unsupportedKey[f.Name()]++