cosign: clear errors if manifest or bundle payload found

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

src/cosign/cosign.ts

@@ -132,25 +132,24 @@ export class Cosign {
         const m0 = obj.manifests[0];
         if (m0?.artifactType === BUNDLE_V03_MEDIA_TYPE && typeof m0.digest === 'string') {
           signatureManifestDigest = m0.digest;
+          errors = undefined; // clear errors if we have valid signature manifest
         } else if (m0?.artifactType === MEDIATYPE_EMPTY_JSON_V1 && typeof m0.digest === 'string') {
           signatureManifestFallbackDigest = m0.digest;
+          errors = undefined; // clear errors if we have valid signature manifest
         }
       }
 
       // signature payload
       if (!bundlePayload && obj && obj.mediaType === BUNDLE_V03_MEDIA_TYPE) {
         bundlePayload = obj as SerializedBundle;
+        errors = undefined; // clear errors if we have valid bundle
       }
 
       if (bundlePayload && signatureManifestDigest) {
         break;
       }
     }
 
-    if (!errors && !bundlePayload) {
-      throw new Error(`Cannot find signature bundle from cosign command output: ${logs}`);
-    }
-
     return {
       bundle: bundlePayload,
       signatureManifestDigest: signatureManifestDigest || signatureManifestFallbackDigest,

src/sigstore/sigstore.ts

@@ -106,7 +106,8 @@ export class Sigstore {
                 const errorMessages = signResult.errors.map(e => `- [${e.code}] ${e.message} : ${e.detail}`).join('\n');
                 throw new Error(`Cosign sign command failed with errors:\n${errorMessages}`);
               } else {
-                throw new Error(`Cosign sign command failed with exit code ${execRes.exitCode}`);
+                // prettier-ignore
+                throw new Error(`Cosign sign command failed with: ${execRes.stderr.trim().split(/\r?\n/).filter(line => line.length > 0).pop() ?? 'unknown error'}`);
               }
             }
             const parsedBundle = Sigstore.parseBundle(bundleFromJSON(signResult.bundle));
@@ -209,7 +210,8 @@ export class Sigstore {
             throw lastError;
           }
         } else {
-          throw new Error(`Cosign verify command failed: ${execRes.stderr}`);
+          // prettier-ignore
+          throw new Error(`Cosign verify command failed with: ${execRes.stderr.trim().split(/\r?\n/).filter(line => line.length > 0).pop() ?? 'unknown error'}`);
         }
       }
     }