From c80a7b81424d5cf943cc8b7f7c17c892470a6303 Mon Sep 17 00:00:00 2001 From: Marcin Owsiany Date: Tue, 17 Oct 2017 12:52:54 +0200 Subject: [PATCH] Fix lint warnings for useless err checks. This check was recently added to golint. Kubernetes-commit: 49553d4a7a5179f0cfabbdcb7d3551c21cbcb646 --- util/cert/io.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/util/cert/io.go b/util/cert/io.go index 487456b6..a41f8054 100644 --- a/util/cert/io.go +++ b/util/cert/io.go @@ -66,10 +66,7 @@ func WriteCert(certPath string, data []byte) error { if err := os.MkdirAll(filepath.Dir(certPath), os.FileMode(0755)); err != nil { return err } - if err := ioutil.WriteFile(certPath, data, os.FileMode(0644)); err != nil { - return err - } - return nil + return ioutil.WriteFile(certPath, data, os.FileMode(0644)) } // WriteKey writes the pem-encoded key data to keyPath. @@ -80,10 +77,7 @@ func WriteKey(keyPath string, data []byte) error { if err := os.MkdirAll(filepath.Dir(keyPath), os.FileMode(0755)); err != nil { return err } - if err := ioutil.WriteFile(keyPath, data, os.FileMode(0600)); err != nil { - return err - } - return nil + return ioutil.WriteFile(keyPath, data, os.FileMode(0600)) } // LoadOrGenerateKeyFile looks for a key in the file at the given path. If it