Fix linter warnings and update swagger

argoproj · Oct 11, 2018 · 3b52b26 · 3b52b26
1 parent 7d0e77b
commit 3b52b26
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "Argo",
-    "version": "v2.2.0"
+    "version": "v2.2.1"
   },
   "paths": {},
   "definitions": {

diff --git a/util/util.go b/util/util.go
@@ -0,0 +1,11 @@
+package util
+
+type Closer interface {
+	Close() error
+}
+
+// Close is a convenience function to close a object that has a Close() method, ignoring any errors
+// Used to satisfy errcheck lint
+func Close(c Closer) {
+	_ = c.Close()
+}
diff --git a/workflow/controller/exec_control.go b/workflow/controller/exec_control.go
@@ -80,7 +80,7 @@ func (woc *wfOperationCtx) killDeamonedChildren(nodeID string) error {
 		}
 		err := woc.updateExecutionControl(childNode.ID, execCtl)
 		if err != nil {
-			woc.log.Errorf("Failed to update execution control of %s: %+v", childNode, err)
+			woc.log.Errorf("Failed to update execution control of node %s: %+v", childNode.ID, err)
 			if firstErr == nil {
 				firstErr = err
 			}

diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go
@@ -77,7 +77,7 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmpl *wfv1.Template, bo
 		}
 
 		if !sgNode.Successful() {
-			failMessage := fmt.Sprintf("step group %s was unsuccessful: %s", sgNode, sgNode.Message)
+			failMessage := fmt.Sprintf("step group %s was unsuccessful: %s", sgNode.ID, sgNode.Message)
 			woc.log.Info(failMessage)
 			woc.updateOutboundNodes(nodeName, tmpl)
 			return woc.markNodePhase(nodeName, wfv1.NodeFailed, sgNode.Message)
@@ -194,7 +194,7 @@ func (woc *wfOperationCtx) executeStepGroup(stepGroup []wfv1.WorkflowStep, sgNod
 				return node
 			case ErrParallelismReached:
 			default:
-				errMsg := fmt.Sprintf("child '%s' errored", childNode)
+				errMsg := fmt.Sprintf("child '%s' errored", childNode.ID)
 				woc.log.Infof("Step group node %s deemed errored due to child %s error: %s", node, childNodeName, err.Error())
 				woc.addChildNode(sgNodeName, childNodeName)
 				return woc.markNodePhase(node.Name, wfv1.NodeError, errMsg)

diff --git a/workflow/executor/docker/docker.go b/workflow/executor/docker/docker.go
@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/argoproj/argo/util"
+
 	"github.com/argoproj/argo/errors"
 	"github.com/argoproj/argo/workflow/common"
 	log "github.com/sirupsen/logrus"
@@ -74,7 +76,7 @@ func (d *DockerExecutor) Logs(containerID string, path string) error {
 	if err != nil {
 		return errors.InternalWrapError(err)
 	}
-	defer outfile.Close()
+	defer util.Close(outfile)
 	cmd.Stdout = outfile
 	err = cmd.Start()
 	if err != nil {

diff --git a/workflow/executor/kubelet/client.go b/workflow/executor/kubelet/client.go
@@ -16,6 +16,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/argoproj/argo/util"
+
 	"github.com/argoproj/argo/errors"
 	"github.com/argoproj/argo/workflow/common"
 	"github.com/gorilla/websocket"
@@ -171,7 +173,7 @@ func (k *kubeletClient) saveLogsToFile(namespace, podName, containerName, path s
 	if err != nil {
 		return errors.InternalWrapError(err)
 	}
-	defer outFile.Close()
+	defer util.Close(outFile)
 	_, err = io.Copy(outFile, resp.Body)
 	return err
 }