Merge branch 'main' into firehose-developer-preview

mergify[bot] · web-flow · commit 1688a7acfec6 · 2024-10-30T23:06:13.000Z
diff --git a/packages/aws-cdk/lib/api/garbage-collection/garbage-collector.ts b/packages/aws-cdk/lib/api/garbage-collection/garbage-collector.ts
@@ -635,7 +635,7 @@ export class GarbageCollector {
 
         // No images in the repository
         if (!response.imageIds || response.imageIds.length === 0) {
-          continue;
+          break;
         }
 
         // map unique image digest to (possibly multiple) tags
diff --git a/packages/aws-cdk/test/api/garbage-collection.test.ts b/packages/aws-cdk/test/api/garbage-collection.test.ts
@@ -633,6 +633,40 @@ describe('ECR Garbage Collection', () => {
     });
   });
 
+  test('succeeds when no images are present', async () => {
+    mockTheToolkitInfo({
+      Outputs: [
+        {
+          OutputKey: 'BootstrapVersion',
+          OutputValue: '999',
+        },
+      ],
+    });
+
+    const mockListImagesNone = jest.fn().mockImplementation(() => {
+      return Promise.resolve({
+        images: [],
+      });
+    });
+
+    sdk.stubEcr({
+      batchGetImage: mockBatchGetImage,
+      describeImages: mockDescribeImages,
+      batchDeleteImage: mockBatchDeleteImage,
+      putImage: mockPutImage,
+      listImages: mockListImagesNone,
+    });
+
+    garbageCollector = garbageCollector = gc({
+      type: 'ecr',
+      rollbackBufferDays: 0,
+      action: 'full',
+    });
+
+    // succeeds without hanging
+    await garbageCollector.garbageCollect();
+  });
+
   test('tags are unique', async () => {
     mockTheToolkitInfo({
       Outputs: [

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ export class GarbageCollector {`
`635`	`635`
`636`	`636`	`// No images in the repository`
`637`	`637`	`if (!response.imageIds \|\| response.imageIds.length === 0) {`
`638`		`- continue;`
	`638`	`+ break;`
`639`	`639`	`}`
`640`	`640`
`641`	`641`	`// map unique image digest to (possibly multiple) tags`