fix: pass correct error obj for azure blob failures (#9276)

In certain cases, if there is a failure reading from azure blob storage, an empty error was used in the return error format string rather than the correct original error. Signed-off-by: Brian Loss <[email protected]>
argoproj · Aug 3, 2022 · 083f3a2 · 083f3a2
1 parent e2c2ad3
commit 083f3a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/workflow/artifacts/azure/azure.go b/workflow/artifacts/azure/azure.go
@@ -119,7 +119,7 @@ func (azblobDriver *ArtifactDriver) Load(artifact *wfv1.Artifact, path string) e
 		}
 		isEmptyFile = true
 	} else if !IsAzureError(origErr, azblob.StorageErrorCodeBlobNotFound) {
-		return fmt.Errorf("unable to download blob %s: %s", artifact.Azure.Blob, err)
+		return fmt.Errorf("unable to download blob %s: %s", artifact.Azure.Blob, origErr)
 	}
 
 	isDir, err := azblobDriver.IsDirectory(artifact)
@@ -227,7 +227,7 @@ func (azblobDriver *ArtifactDriver) OpenStream(artifact *wfv1.Artifact) (io.Read
 			return response.Body(nil), nil
 		}
 	} else if !IsAzureError(origErr, azblob.StorageErrorCodeBlobNotFound) {
-		return nil, fmt.Errorf("unable to open stream for blob %s: %s", artifact.Azure.Blob, err)
+		return nil, fmt.Errorf("unable to open stream for blob %s: %s", artifact.Azure.Blob, origErr)
 	}
 
 	isDir, err := azblobDriver.IsDirectory(artifact)