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

clean code

Browse Source
This commit is contained in:
Tuna
2016-08-25 00:34:54 +07:00
parent 3f94d778d7
commit 82ae7fab78
7 changed files with 84 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/loader/bundle/bundle.go
+8 -8
View File
@@ -30,7 +30,7 @@ import (
type Bundle struct {
}
// load Image from bundles file
// load image from dab file
func loadImage(service bundlefile.Service) (string, string) {
character := "@"
if strings.Contains(service.Image, character) {
@@ -39,8 +39,8 @@ func loadImage(service bundlefile.Service) (string, string) {
return "", "Invalid image format"
}
// load Environment Variable from bundles file
func loadEnvVarsfromBundle(service bundlefile.Service) ([]kobject.EnvVar, string) {
// load environment variables from dab file
func loadEnvVars(service bundlefile.Service) ([]kobject.EnvVar, string) {
envs := []kobject.EnvVar{}
for _, env := range service.Env {
character := "="
@@ -76,8 +76,8 @@ func loadEnvVarsfromBundle(service bundlefile.Service) ([]kobject.EnvVar, string
return envs, ""
}
// load Ports from bundles file
func loadPortsfromBundle(service bundlefile.Service) ([]kobject.Ports, string) {
// load ports from dab file
func loadPorts(service bundlefile.Service) ([]kobject.Ports, string) {
ports := []kobject.Ports{}
for _, port := range service.Ports {
var p api.Protocol
@@ -98,7 +98,7 @@ func loadPortsfromBundle(service bundlefile.Service) ([]kobject.Ports, string) {
return ports, ""
}
// load Bundlefile into KomposeObject
// load dab file into KomposeObject
func (b *Bundle) LoadFile(file string) kobject.KomposeObject {
komposeObject := kobject.KomposeObject{
ServiceConfigs: make(map[string]kobject.ServiceConfig),
@@ -129,13 +129,13 @@ func (b *Bundle) LoadFile(file string) kobject.KomposeObject {
}
serviceConfig.Image = image
envs, err := loadEnvVarsfromBundle(service)
envs, err := loadEnvVars(service)
if err != "" {
logrus.Fatalf("Failed to load envvar from bundles file: " + err)
}
serviceConfig.Environment = envs
ports, err := loadPortsfromBundle(service)
ports, err := loadPorts(service)
if err != "" {
logrus.Fatalf("Failed to load ports from bundles file: " + err)
}
pkg/loader/compose/compose.go
+7 -7
View File
@@ -36,8 +36,8 @@ import (
type Compose struct {
}
// load Environment Variable from compose file
func loadEnvVarsfromCompose(e map[string]string) []kobject.EnvVar {
// load environment variables from compose file
func loadEnvVars(e map[string]string) []kobject.EnvVar {
envs := []kobject.EnvVar{}
for k, v := range e {
envs = append(envs, kobject.EnvVar{
@@ -48,8 +48,8 @@ func loadEnvVarsfromCompose(e map[string]string) []kobject.EnvVar {
return envs
}
// Load Ports from compose file
func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, error) {
// Load ports from compose file
func loadPorts(composePorts []string) ([]kobject.Ports, error) {
ports := []kobject.Ports{}
character := ":"
for _, port := range composePorts {
@@ -87,7 +87,7 @@ func loadPortsFromCompose(composePorts []string) ([]kobject.Ports, error) {
return ports, nil
}
// load Docker Compose file into KomposeObject
// load compose file into KomposeObject
func (c *Compose) LoadFile(file string) kobject.KomposeObject {
komposeObject := kobject.KomposeObject{
ServiceConfigs: make(map[string]kobject.ServiceConfig),
@@ -152,11 +152,11 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
serviceConfig.ContainerName = composeServiceConfig.ContainerName
// load environment variables
envs := loadEnvVarsfromCompose(composeServiceConfig.Environment.ToMap())
envs := loadEnvVars(composeServiceConfig.Environment.ToMap())
serviceConfig.Environment = envs
// load ports
ports, err := loadPortsFromCompose(composeServiceConfig.Ports)
ports, err := loadPorts(composeServiceConfig.Ports)
if err != nil {
logrus.Fatalf("%q failed to load ports from compose file: %v", name, err)
}