Skip to content

Improve readablility #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrmarti merged 1 commit into from
Apr 21, 2023
Merged

Improve readablility #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/spec-configuration/containerCollectionsOCI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/spec-configuration/containerFeaturesOCI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down