From c441610b4fc534e62678aaab0059f3421c17c5fa Mon Sep 17 00:00:00 2001 From: Tomas Kral Date: Mon, 31 Oct 2016 19:14:08 +0100 Subject: [PATCH] fix govet errors --- cli/app/app.go | 2 +- cli/app/app_test.go | 8 ++++---- pkg/loader/bundle/bundle.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/app/app.go b/cli/app/app.go index 5c046b9b..773e527c 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -241,7 +241,7 @@ func getTransformer(opt kobject.ConvertOptions) transformer.Transformer { } else { // Create/Init new OpenShift object that is initialized with a newly // created Kubernetes object. Openshift inherits from Kubernetes - t = &openshift.OpenShift{kubernetes.Kubernetes{Opt: opt}} + t = &openshift.OpenShift{Kubernetes: kubernetes.Kubernetes{Opt: opt}} } return t } diff --git a/cli/app/app_test.go b/cli/app/app_test.go index 03518858..2308f6fb 100644 --- a/cli/app/app_test.go +++ b/cli/app/app_test.go @@ -106,16 +106,16 @@ func TestParseVolume(t *testing.T) { t.Errorf("In test case %q, returned unexpected error %v", test.test, err) } 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 { - 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 { - 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 { - 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) } } } diff --git a/pkg/loader/bundle/bundle.go b/pkg/loader/bundle/bundle.go index 80202133..2459f563 100644 --- a/pkg/loader/bundle/bundle.go +++ b/pkg/loader/bundle/bundle.go @@ -133,12 +133,12 @@ func (b *Bundle) LoadFile(file string) kobject.KomposeObject { buf, err := ioutil.ReadFile(file) 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)) bundle, err := loadFile(reader) 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 {