From 50d3909dd5ac02256e33b5643c5a2df85b178dfa Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Tue, 25 Apr 2017 10:47:50 +0800 Subject: [PATCH] secret.go: add initial symbol and format err --- pkg/kubectl/secret.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kubectl/secret.go b/pkg/kubectl/secret.go index 8b9afffac4..6f5f01b833 100644 --- a/pkg/kubectl/secret.go +++ b/pkg/kubectl/secret.go @@ -154,8 +154,7 @@ func handleFromLiteralSources(secret *api.Secret, literalSources []string) error if err != nil { return err } - err = addKeyFromLiteralToSecret(secret, keyName, []byte(value)) - if err != nil { + if err = addKeyFromLiteralToSecret(secret, keyName, []byte(value)); err != nil { return err } } @@ -190,15 +189,13 @@ func handleFromFileSources(secret *api.Secret, fileSources []string) error { itemPath := path.Join(filePath, item.Name()) if item.Mode().IsRegular() { keyName = item.Name() - err = addKeyFromFileToSecret(secret, keyName, itemPath) - if err != nil { + if err = addKeyFromFileToSecret(secret, keyName, itemPath); err != nil { return err } } } } else { - err = addKeyFromFileToSecret(secret, keyName, filePath) - if err != nil { + if err := addKeyFromFileToSecret(secret, keyName, filePath); err != nil { return err } }