fix(cli): various fixes about errors (#5935)

Signed-off-by: francois  samin <[email protected]>

Author: fsamin

cli/cdsctl/workflow_artifact.go

@@ -269,15 +269,15 @@ func workflowArtifactDownloadRun(v cli.Values) error {
 			fmt.Printf("Downloading %s...\n", artifactData.Name)
 			f, err := os.OpenFile(artifactData.Name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.FileMode(artifactData.Perm))
 			if err != nil {
-				return sdk.NewError(sdk.ErrUnknownError, fmt.Errorf("cannot create file (OpenFile) %s: %s", artifactData.Name, err))
+				return cli.NewError("unable to open file %s: %v", artifactData.Name, err)
 			}
 			if err := client.CDNItemDownload(context.Background(), cdnURL, artifactData.CDNRefHash, sdk.CDNTypeItemRunResult, artifactData.MD5, f); err != nil {
 				_ = f.Close()
 				return err
 			}
 			fmt.Printf("File %s created, checksum OK\n", f.Name())
 			if err := f.Close(); err != nil {
-				return sdk.NewErrorFrom(sdk.ErrUnknownError, "unable to close file %s: %v", artifactData.Name, err)
+				return cli.NewError("unable to close file %s: %v", artifactData.Name, err)
 			}
 		}
 		ok = true

cli/cdsctl/workflow_log.go

@@ -282,7 +282,7 @@ func workflowLogDownloadRun(v cli.Values) error {
 	if v.GetString("pattern") != "" {
 		reg, err = regexp.Compile(v.GetString("pattern"))
 		if err != nil {
-			return sdk.NewErrorFrom(err, "invalid pattern %s", v.GetString("pattern"))
+			return cli.NewError("invalid pattern %q", v.GetString("pattern"))
 		}
 	}
 

cli/cdsctl/workflow_run_result.go

@@ -128,15 +128,15 @@ func workflowRunResultGet(v cli.Values) error {
 			var err error
 			f, err = os.OpenFile(fileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, os.FileMode(perm))
 			if err != nil {
-				return sdk.NewError(sdk.ErrUnknownError, fmt.Errorf("cannot create file (OpenFile) %s: %s", fileName, err))
+				return cli.NewError("unable to open file %s: %s", fileName, err)
 			}
 			fmt.Printf("Downloading %s...\n", fileName)
 			if err := client.CDNItemDownload(context.Background(), confCDN.HTTPURL, cdnHash, sdk.CDNTypeItemRunResult, md5, f); err != nil {
 				_ = f.Close()
 				return err
 			}
 			if err := f.Close(); err != nil {
-				return sdk.NewErrorFrom(sdk.ErrUnknownError, "unable to close file %s: %v", fileName, err)
+				return cli.NewError("unable to close file %s: %v", fileName, err)
 			}
 		}
 		if toDownload {

sdk/cdsclient/client.go

@@ -227,7 +227,7 @@ func (e *Error) Error() string {
 	if e.sdkError != nil {
 		return e.sdkError.Error()
 	}
-	panic("unknow error")
+	panic("unknown error")
 }
 
 type stackTracer interface {

sdk/cdsclient/http.go

@@ -151,7 +151,7 @@ func (c *client) Request(ctx context.Context, method string, path string, body i
 
 	if code >= 400 {
 		if err := sdk.DecodeError(bodyBtes); err != nil {
-			return bodyBtes, nil, code, err
+			return bodyBtes, nil, code, newAPIError(err)
 		}
 		return bodyBtes, nil, code, newAPIError(fmt.Errorf("HTTP %d", code))
 	}
@@ -167,7 +167,7 @@ func extractBodyErrorFromResponse(r *http.Response) error {
 	body, _ := ioutil.ReadAll(r.Body)
 	r.Body.Close() // nolint
 	if err := sdk.DecodeError(body); err != nil {
-		return err
+		return newAPIError(err)
 	}
 	return newAPIError(fmt.Errorf("HTTP %d", r.StatusCode))
 }
@@ -323,18 +323,19 @@ func (c *client) Stream(ctx context.Context, httpClient HTTPClient, method strin
 	var savedCodeError int
 	for i := 0; i <= c.config.Retry; i++ {
 		var req *http.Request
-		var requestError error
 		if rs, ok := body.(io.ReadSeeker); ok {
 			if _, err := rs.Seek(0, 0); err != nil {
 				return nil, nil, 0, newError(fmt.Errorf("request failed after %d retries: %v. Original error: %v", i, err, savederror))
 			}
-			req, requestError = http.NewRequest(method, url, body)
+			req, err = http.NewRequest(method, url, body)
+			if err != nil {
+				return nil, nil, 0, newError(err)
+			}
 		} else {
-			req, requestError = http.NewRequest(method, url, bytes.NewBuffer(bodyBytes))
-		}
-		if requestError != nil {
-			savederror = newError(requestError)
-			continue
+			req, err = http.NewRequest(method, url, bytes.NewBuffer(bodyBytes))
+			if err != nil {
+				return nil, nil, 0, newError(err)
+			}
 		}
 
 		req = req.WithContext(ctx)
@@ -382,7 +383,7 @@ func (c *client) Stream(ctx context.Context, httpClient HTTPClient, method strin
 
 		resp, err := httpClient.Do(req)
 		if err != nil {
-			savederror = newError(err)
+			savederror = newTransportError(err)
 			continue
 		}