Merge pull request #1166 from wking/ValidateDirectory-context

OCPBUGS-52258: pkg/cvo/updatepayload: Context around ValidateDirectory calls

Author: openshift-merge-bot[bot]

pkg/cvo/updatepayload.go

@@ -173,15 +173,15 @@ func (r *payloadRetriever) targetUpdatePayloadDir(ctx context.Context, update co
 	if err := payload.ValidateDirectory(tdir); os.IsNotExist(err) {
 		// the dirs don't exist, try fetching the payload to tdir.
 		if err := r.fetchUpdatePayloadToDir(ctx, tdir, update); err != nil {
-			return "", err
+			return "", fmt.Errorf("fetching update payload: %s", err)
 		}
 	} else if err != nil {
-		return "", err
+		return "", fmt.Errorf("checking to see if %q already holds release-image content: %w", tdir, err)
 	}
 
 	// now that payload has been loaded check validation.
 	if err := payload.ValidateDirectory(tdir); err != nil {
-		return "", err
+		return "", fmt.Errorf("confirming the presence of release-image content in %q: %w", tdir, err)
 	}
 	return tdir, nil
 }

pkg/payload/image.go

@@ -3,22 +3,20 @@ package payload
 import (
 	"fmt"
 	"path/filepath"
-
-	"github.com/pkg/errors"
 )
 
 // ImageForShortName returns the image using the updatepayload embedded in
 // the Operator.
 func ImageForShortName(name string) (string, error) {
 	if err := ValidateDirectory(DefaultPayloadDir); err != nil {
-		return "", err
+		return "", fmt.Errorf("error validating %q as a release-image directory: %w", DefaultPayloadDir, err)
 	}
 
 	releaseDir := filepath.Join(DefaultPayloadDir, ReleaseManifestDir)
 
 	imageRef, err := loadImageReferences(releaseDir)
 	if err != nil {
-		return "", errors.Wrapf(err, "error loading image references from %q", releaseDir)
+		return "", fmt.Errorf("error loading image references from %q: %w", releaseDir, err)
 	}
 
 	for _, tag := range imageRef.Spec.Tags {