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

Improve error message for invalid port

Browse Source
This commit is contained in:
Janet Kuo 2016-08-22 13:47:11 -07:00
parent 223b4f37fa
commit 332c5b2c35
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/loader/compose/compose.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package compose package compose
import ( import (
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -48,7 +49,7 @@ func loadEnvVarsfromCompose(e map[string]string) []kobject.EnvVar {
} }
// Load Ports from compose file // Load Ports from compose file
func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, string) { func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, error) {
ports := []kobject.Ports{} ports := []kobject.Ports{}
character := ":" character := ":"
for _, port := range composePorts { for _, port := range composePorts {
@ -58,13 +59,13 @@ func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, string) {
hostPort = strings.TrimSpace(hostPort) hostPort = strings.TrimSpace(hostPort)
hostPortInt, err := strconv.Atoi(hostPort) hostPortInt, err := strconv.Atoi(hostPort)
if err != nil { if err != nil {
return nil, "Invalid host port of " + port return nil, fmt.Errorf("invalid host port %q", port)
} }
containerPort := port[strings.Index(port, character)+1:] containerPort := port[strings.Index(port, character)+1:]
containerPort = strings.TrimSpace(containerPort) containerPort = strings.TrimSpace(containerPort)
containerPortInt, err := strconv.Atoi(containerPort) containerPortInt, err := strconv.Atoi(containerPort)
if err != nil { if err != nil {
return nil, "Invalid container port of " + port return nil, fmt.Errorf("invalid container port %q", port)
} }
ports = append(ports, kobject.Ports{ ports = append(ports, kobject.Ports{
HostPort: int32(hostPortInt), HostPort: int32(hostPortInt),
@ -74,7 +75,7 @@ func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, string) {
} else { } else {
containerPortInt, err := strconv.Atoi(port) containerPortInt, err := strconv.Atoi(port)
if err != nil { if err != nil {
return nil, "Invalid container port of " + port return nil, fmt.Errorf("invalid container port %q", port)
} }
ports = append(ports, kobject.Ports{ ports = append(ports, kobject.Ports{
ContainerPort: int32(containerPortInt), ContainerPort: int32(containerPortInt),
@ -83,7 +84,7 @@ func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, string) {
} }
} }
return ports, "" return ports, nil
} }
// load Docker Compose file into KomposeObject // load Docker Compose file into KomposeObject
@ -120,7 +121,7 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
composeObject := project.NewProject(&context.Context, nil, nil) composeObject := project.NewProject(&context.Context, nil, nil)
err := composeObject.Parse() err := composeObject.Parse()
if err != nil { if err != nil {
logrus.Fatalf("Failed to load compose file", err) logrus.Fatalf("Failed to load compose file: %v", err)
} }
// transform composeObject into komposeObject // transform composeObject into komposeObject
@ -156,8 +157,8 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
// load ports // load ports
ports, err := loadPortsFromCompose(composeServiceConfig.Ports) ports, err := loadPortsFromCompose(composeServiceConfig.Ports)
if err != "" { if err != nil {
logrus.Fatalf("Failed to load ports from compose file: " + err) logrus.Fatalf("%q failed to load ports from compose file: %v", name, err)
} }
serviceConfig.Port = ports serviceConfig.Port = ports