diff --git a/src/scanner/images/index.ts b/src/scanner/images/index.ts index f0785d223..467d59062 100644 --- a/src/scanner/images/index.ts +++ b/src/scanner/images/index.ts @@ -123,6 +123,7 @@ export async function scanImages( const pluginResponse = await scan({ path: archivePath, imageNameAndTag: imageName, + imageNameAndDigest: imageWithDigest, }); if ( diff --git a/src/scanner/index.ts b/src/scanner/index.ts index 8501788ab..a3b5eacdc 100644 --- a/src/scanner/index.ts +++ b/src/scanner/index.ts @@ -103,7 +103,7 @@ export function getUniqueImages(workloadMetadata: IWorkload[]): IScanImage[] { accum[meta.imageName] = { imageWithDigest: digest && `${imageName}@${digest}`, - imageName: meta.imageName, // Image name with tag + imageName: meta.imageName, // Image name with tag or digest, according to metadata image field declaration skopeoRepoType: SkopeoRepositoryType.DockerArchive, }; diff --git a/test/system/kind.spec.ts b/test/system/kind.spec.ts index e15e48820..177b99850 100644 --- a/test/system/kind.spec.ts +++ b/test/system/kind.spec.ts @@ -247,6 +247,13 @@ test('Kubernetes-Monitor with KinD', async () => { { type: 'imageLayers', data: expect.any(Array) }, { type: 'rootFs', data: expect.any(Array) }, { type: 'imageOsReleasePrettyName', data: expect.any(String) }, + { + type: 'imageNames', + data: [ + 'docker.io/library/openjdk:latest', + expect.stringContaining('docker.io/library/openjdk@sha256:'), + ], + }, ]), target: { image: 'docker-image|docker.io/library/openjdk' }, identity: { type: 'rpm', args: { platform: 'linux/amd64' } }, diff --git a/test/unit/scanner/images.spec.ts b/test/unit/scanner/images.spec.ts index 5bcda5af7..3c9db04fa 100644 --- a/test/unit/scanner/images.spec.ts +++ b/test/unit/scanner/images.spec.ts @@ -133,7 +133,7 @@ describe('getImageParts()', () => { .imageName, ).toEqual('kind-registry:5000/python-27'); }); - it('removed repository/image:tag contining dashes', () => { + it('removed repository/image:tag continuing dashes', () => { expect( scannerImages.getImageParts( 'kind-registry:5000/test/python-27:rc-buster',