From 77016b8220d633c45515bc2705e9888699ac2a30 Mon Sep 17 00:00:00 2001
From: xiechengsheng <xie1995@whut.edu.cn>
Date: Mon, 26 Aug 2019 11:21:06 +0800
Subject: [PATCH] remove redundant codes

Signed-off-by: xiechengsheng <xie1995@whut.edu.cn>
---
 util/archive/archive.go            |  5 +----
 workflow/executor/common/common.go |  5 +----
 workflow/executor/pns/pns.go       |  6 +-----
 workflow/executor/resource.go      |  5 +----
 workflow/util/util.go              | 10 ++--------
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/util/archive/archive.go b/util/archive/archive.go
index 5903e549a80d..76857f0da6b9 100644
--- a/util/archive/archive.go
+++ b/util/archive/archive.go
@@ -128,8 +128,5 @@ func tarFile(sourcePath string, tw *tar.Writer) error {
 		return errors.InternalWrapError(err)
 	}
 	_, err = io.Copy(tw, f)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
diff --git a/workflow/executor/common/common.go b/workflow/executor/common/common.go
index dd218c447305..8777c5c4dd98 100644
--- a/workflow/executor/common/common.go
+++ b/workflow/executor/common/common.go
@@ -133,8 +133,5 @@ func CopyArchive(c KubernetesClientInterface, containerID, sourcePath, destPath
 		return err
 	}
 	err = w.Close()
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
diff --git a/workflow/executor/pns/pns.go b/workflow/executor/pns/pns.go
index 9ef1fca1d1a9..175322c36e70 100644
--- a/workflow/executor/pns/pns.go
+++ b/workflow/executor/pns/pns.go
@@ -139,11 +139,7 @@ func (p *PNSExecutor) CopyFile(containerID string, sourcePath string, destPath s
 	}
 
 	err = archive.TarGzToWriter(sourcePath, w)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return err
 }
 
 func (p *PNSExecutor) WaitInit() error {
diff --git a/workflow/executor/resource.go b/workflow/executor/resource.go
index cdc573b0a3a5..2ab38909af3b 100644
--- a/workflow/executor/resource.go
+++ b/workflow/executor/resource.go
@@ -295,8 +295,5 @@ func (we *WorkflowExecutor) SaveResourceParameters(resourceNamespace string, res
 		log.Infof("Saved output parameter: %s, value: %s", param.Name, output)
 	}
 	err := we.AnnotateOutputs(nil)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
diff --git a/workflow/util/util.go b/workflow/util/util.go
index 9982b4250591..71223351c0c7 100644
--- a/workflow/util/util.go
+++ b/workflow/util/util.go
@@ -308,10 +308,7 @@ func SuspendWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error
 		}
 		return true, nil
 	})
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // ResumeWorkflow resumes a workflow by setting spec.suspend to nil and any suspended nodes to Successful.
@@ -347,10 +344,7 @@ func ResumeWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error
 		}
 		return true, nil
 	})
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 const letters = "abcdefghijklmnopqrstuvwxyz0123456789"