Change tag name check to accomodate more cases in LogUnsupportedServiceConfigFields

allisaurus · allisaurus · commit 33687eeb5ffc · 2018-06-04T10:55:48.000-07:00
diff --git a/ecs-cli/modules/cli/compose/logger/logger.go b/ecs-cli/modules/cli/compose/logger/logger.go
@@ -78,10 +78,10 @@ func LogUnsupportedServiceConfigFields(serviceName string, serviceConfig *config
 		fieldType := configType.Field(i)
 		// get the tag name (if any), defaults to fieldName
 		tagName := fieldType.Name
-		yamlTag := fieldType.Tag.Get("yaml") // Expected format `yaml:"tagName,omitempty"` // TODO, handle omitempty
+		yamlTag := fieldType.Tag.Get("yaml") // Expected format `yaml:"tagName,omitempty"`
 		if yamlTag != "" {
 			tags := strings.Split(yamlTag, ",")
-			if len(tags) > 0 {
+			if tags[0] != "" {
 				tagName = tags[0]
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ func LogUnsupportedServiceConfigFields(serviceName string, serviceConfig *config`
`78`	`78`	`fieldType := configType.Field(i)`
`79`	`79`	`// get the tag name (if any), defaults to fieldName`
`80`	`80`	`tagName := fieldType.Name`
`81`		- yamlTag := fieldType.Tag.Get("yaml") // Expected format `yaml:"tagName,omitempty"` // TODO, handle omitempty
	`81`	+ yamlTag := fieldType.Tag.Get("yaml") // Expected format `yaml:"tagName,omitempty"`
`82`	`82`	`if yamlTag != "" {`
`83`	`83`	`tags := strings.Split(yamlTag, ",")`
`84`		`- if len(tags) > 0 {`
	`84`	`+ if tags[0] != "" {`
`85`	`85`	`tagName = tags[0]`
`86`	`86`	`}`
`87`	`87`	`}`