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

fix govet errors

Browse Source
This commit is contained in:
Tomas Kral 2016-10-31 19:14:08 +01:00
parent 8bb89876cf
commit c441610b4f
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/app.go
View File

@ -241,7 +241,7 @@ func getTransformer(opt kobject.ConvertOptions) transformer.Transformer {
} else { } else {
// Create/Init new OpenShift object that is initialized with a newly // Create/Init new OpenShift object that is initialized with a newly
// created Kubernetes object. Openshift inherits from Kubernetes // created Kubernetes object. Openshift inherits from Kubernetes
t = &openshift.OpenShift{kubernetes.Kubernetes{Opt: opt}} t = &openshift.OpenShift{Kubernetes: kubernetes.Kubernetes{Opt: opt}}
} }
return t return t
} }

8
cli/app/app_test.go
View File

@ -106,16 +106,16 @@ func TestParseVolume(t *testing.T) {
t.Errorf("In test case %q, returned unexpected error %v", test.test, err) t.Errorf("In test case %q, returned unexpected error %v", test.test, err)
} }
if name != test.name { if name != test.name {
t.Errorf("In test case %q, returned volume name %s, expected %s", name, test.name) t.Errorf("In test case %q, returned volume name %s, expected %s", test.test, name, test.name)
} }
if host != test.host { if host != test.host {
t.Errorf("In test case %q, returned host path %s, expected %s", host, test.host) t.Errorf("In test case %q, returned host path %s, expected %s", test.test, host, test.host)
} }
if container != test.container { if container != test.container {
t.Errorf("In test case %q, returned container path %s, expected %s", container, test.container) t.Errorf("In test case %q, returned container path %s, expected %s", test.test, container, test.container)
} }
if mode != test.mode { if mode != test.mode {
t.Errorf("In test case %q, returned access mode %s, expected %s", mode, test.mode) t.Errorf("In test case %q, returned access mode %s, expected %s", test.test, mode, test.mode)
} }
} }
} }

4
pkg/loader/bundle/bundle.go
View File

@ -133,12 +133,12 @@ func (b *Bundle) LoadFile(file string) kobject.KomposeObject {
buf, err := ioutil.ReadFile(file) buf, err := ioutil.ReadFile(file)
if err != nil { if err != nil {
logrus.Fatalf("Failed to read bundles file: ", err) logrus.Fatalf("Failed to read bundles file: %s ", err)
} }
reader := strings.NewReader(string(buf)) reader := strings.NewReader(string(buf))
bundle, err := loadFile(reader) bundle, err := loadFile(reader)
if err != nil { if err != nil {
logrus.Fatalf("Failed to parse bundles file: ", err) logrus.Fatalf("Failed to parse bundles file: %s", err)
} }
for name, service := range bundle.Services { for name, service := range bundle.Services {