From 35135fa917d916565d7e9921c95908b7c2db5344 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Fri, 21 Apr 2023 10:16:36 +0200 Subject: [PATCH] Improve readablility --- src/spec-configuration/containerCollectionsOCI.ts | 4 ++-- src/spec-configuration/containerFeaturesOCI.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/spec-configuration/containerCollectionsOCI.ts b/src/spec-configuration/containerCollectionsOCI.ts index bff2bbd74..39981bcf3 100644 --- a/src/spec-configuration/containerCollectionsOCI.ts +++ b/src/spec-configuration/containerCollectionsOCI.ts @@ -318,7 +318,7 @@ export async function getManifest(params: CommonParams, url: string, ref: OCIRef } if (expectedDigest && contentDigest !== expectedDigest) { - throw new Error(`Digest did not match for ${url}.`); + throw new Error(`Digest did not match for ${ref.resource}.`); } return { @@ -519,7 +519,7 @@ export async function getBlob(params: CommonParams, url: string, ociCacheDir: st const actualDigest = `sha256:${crypto.createHash('sha256').update(resBody).digest('hex')}`; if (actualDigest !== expectedDigest) { - throw new Error(`Digest did not match for ${url}.`); + throw new Error(`Digest did not match for ${ociRef.resource}.`); } await mkdirpLocal(destCachePath); diff --git a/src/spec-configuration/containerFeaturesOCI.ts b/src/spec-configuration/containerFeaturesOCI.ts index f127baa84..8fe254164 100644 --- a/src/spec-configuration/containerFeaturesOCI.ts +++ b/src/spec-configuration/containerFeaturesOCI.ts @@ -54,11 +54,11 @@ export async function fetchOCIFeature(params: CommonParams, featureSet: FeatureS const { featureRef } = featureSet.sourceInformation; - const expectedDigest = featureSet.sourceInformation.manifest?.layers[0].digest; - const blobUrl = `https://${featureSet.sourceInformation.featureRef.registry}/v2/${featureSet.sourceInformation.featureRef.path}/blobs/${expectedDigest}`; + const layerDigest = featureSet.sourceInformation.manifest?.layers[0].digest; + const blobUrl = `https://${featureSet.sourceInformation.featureRef.registry}/v2/${featureSet.sourceInformation.featureRef.path}/blobs/${layerDigest}`; output.write(`blob url: ${blobUrl}`, LogLevel.Trace); - const blobResult = await getBlob(params, blobUrl, ociCacheDir, featCachePath, featureRef, expectedDigest); + const blobResult = await getBlob(params, blobUrl, ociCacheDir, featCachePath, featureRef, layerDigest); if (!blobResult) { throw new Error(`Failed to download package for ${featureSet.sourceInformation.featureRef.resource}`);