test changing auth file for skopeo

Author: Strum355

src/imageAnalysis/collector.ts

@@ -24,11 +24,11 @@ export interface IImage {
  */
 export class Image implements IImage {
   public platform: string;
-  
+
   constructor(
     public name: IPositionedString,
     public line: string
-  ) {}
+  ) { }
 }
 
 /**
@@ -66,9 +66,9 @@ export class ImageMap {
         parsedImageRef = parseImageRef(image.name.value);
       }
       if (this.mapper.has(parsedImageRef.getPackageURL().toString())) {
-          this.mapper.get(parsedImageRef.getPackageURL().toString()).push(image);
+        this.mapper.get(parsedImageRef.getPackageURL().toString()).push(image);
       } else {
-          this.mapper.set(parsedImageRef.getPackageURL().toString(), [image]);
+        this.mapper.set(parsedImageRef.getPackageURL().toString(), [image]);
       }
     });
   }
@@ -80,18 +80,16 @@ export class ImageMap {
    */
   public get(key: string): IImage[] {
     const images: IImage[] = [];
-    /* istanbul ignore else */
     if (this.mapper.has(key)) {
-        images.push(...this.mapper.get(key));
+      images.push(...this.mapper.get(key));
     }
 
     // Check if the key includes ":latest"
     if (key.includes(':latest')) {
-        const keyWithoutLatest = key.replace(':latest', '');
-        /* istanbul ignore else */
-        if (this.mapper.has(keyWithoutLatest)) {
-            images.push(...this.mapper.get(keyWithoutLatest));
-        }
+      const keyWithoutLatest = key.replace(':latest', '');
+      if (this.mapper.has(keyWithoutLatest)) {
+        images.push(...this.mapper.get(keyWithoutLatest));
+      }
     }
 
     return images;
@@ -103,13 +101,13 @@ export class ImageMap {
  * @param img - The image object image position information.
  * @returns The range within the image document that represents the image.
  */
-export function getRange (img: IImage): Range {
+export function getRange(img: IImage): Range {
   const pos: IPosition = img.name.position;
   const length = img.line.length;
 
   return {
     start: {
-      line: pos.line - 1, 
+      line: pos.line - 1,
       character: pos.column
     },
     end: {

test/imageAnalysis/collector.test.ts

@@ -6,12 +6,10 @@ import { Image, ImageMap, getRange } from '../../src/imageAnalysis/collector';
 
 describe('Image Analysis Collector tests', () => {
 
-    // Mock image collection
-    let reqImages: Image[] = [
-        new Image ({ value: 'alpine', position: { line: 1, column: 0 } }, 'FROM --platform=linux/amd64 alpine as a'),
-        new Image ({ value: 'alpine:latest', position: { line: 2, column: 0 } }, 'FROM --platform=linux/amd64 alpine:latest AS a'),
+    // Mock image collection, we can't test unpinned images here as they will change over time, resulting in tests that always need updating.
+    const reqImages: Image[] = [
+        new Image ({ value: 'alpine:3.21.3', position: { line: 2, column: 0 } }, 'FROM --platform=linux/amd64 alpine:3.21.3 AS a'),
         new Image ({ value: 'alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b', position: { line: 3, column: 0 } }, 'FROM --platform=linux/amd64 alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b As a'),
-        new Image ({ value: 'alpine', position: { line: 4, column: 0 } }, 'FROM --platform=linux/amd64 alpine as a'),
     ];
     reqImages.forEach(image => image.platform = 'linux/amd64');
 
@@ -20,9 +18,8 @@ describe('Image Analysis Collector tests', () => {
         const imageMap = new ImageMap(reqImages);
 
         expect(Object.fromEntries(imageMap.mapper)).to.eql({
-            'alpine': [reqImages[0], reqImages[3]],
-            'alpine:latest': [reqImages[1]],
-            'alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b': [reqImages[2]]
+            'pkg:oci/alpine@sha256:1c4eef651f65e2f7daee7ee785882ac164b02b78fb74503052a26dc061c90474?arch=amd64&os=linux&tag=3.21.3': [reqImages[0]],
+            'pkg:oci/alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b?arch=amd64&os=linux': [reqImages[1]]
         });
     });
 
@@ -37,39 +34,25 @@ describe('Image Analysis Collector tests', () => {
 
         const imageMap = new ImageMap(reqImages);
 
-        // The image names from the response always iclude 'latest' tag if no tag nor digest is provided
-        expect(JSON.stringify(imageMap.get('alpine:latest'))).to.eq(JSON.stringify([reqImages[1], reqImages[0], reqImages[3]]));
-        expect(JSON.stringify(imageMap.get('alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b'))).to.eq(JSON.stringify([reqImages[2]]));
+        expect(JSON.stringify(imageMap.get('pkg:oci/alpine@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b?arch=amd64&os=linux'))).to.eq(JSON.stringify([reqImages[1]]));
     });
 
     it('should return image range', async () => {
-
         expect(getRange(reqImages[0])).to.eql(
-            {
-                start: { line: 0, character: 0 },
-                end: { line: 0, character: 39 }
-            }
-        );
-
-        expect(getRange(reqImages[1])).to.eql(
             {
                 start: { line: 1, character: 0 },
                 end: { line: 1, character: 46 }
             }
         );
 
-        expect(getRange(reqImages[2])).to.eql(
+        expect(getRange(reqImages[1])).to.eql(
             {
                 start: { line: 2, character: 0 },
                 end: { line: 2, character: 111 }
             }
         );
-
-        expect(getRange(reqImages[3])).to.eql(
-            {
-                start: { line: 3, character: 0 },
-                end: { line: 3, character: 39 }
-            }
-        );
     });
-})
+}).beforeAll(() => {
+    // https://github.com/containers/skopeo/issues/1654
+    process.env['EXHORT_SKOPEO_CONFIG_PATH'] = './auth.json';
+});