Merge pull request #2358 from serverless-heaven/fix/image-ecr

Fix `image.name` not bundled when ECR image is provided

Author: j0k3r

lib/utils.js

@@ -121,13 +121,16 @@ function isNodeRuntime(runtime) {
 
 function getAllNodeFunctions() {
   const functions = this.serverless.service.getAllFunctions();
+  const ecrImages = Object.keys(this.serverless.service.provider?.ecr?.images || []);
 
   return _.filter(functions, funcName => {
     const func = this.serverless.service.getFunction(funcName);
+    const imageName = _.get(func, 'image.name');
+    const isEcrImage = imageName && ecrImages.includes(imageName);
 
     // if `uri` or `name` is provided or simple remote image path, it means the
     // image isn't built by Serverless so we shouldn't take care of it
-    if ((func.image && (func.image.uri || func.image.name)) || (func.image && typeof func.image === 'string')) {
+    if (func.image?.uri || (func.image && typeof func.image === 'string') || (func.image && imageName && !isEcrImage)) {
       return false;
     }
 

tests/utils.test.js

@@ -182,6 +182,33 @@ describe('Utils', () => {
 
       expect(Utils.getAllNodeFunctions.call({ serverless: mockServerless })).toEqual(['foo']);
     });
+
+    it('should not ignore handlers with image.name property if defined as ecr image', () => {
+      const mockServerless = {
+        service: {
+          getAllFunctions: jest.fn(() => ['foo', 'bar']),
+          getFunction: jest.fn(name => {
+            if (name === 'foo') {
+              return { runtime: 'nodejs20.x' };
+            }
+            if (name === 'bar') {
+              return { runtime: 'nodejs22.x', image: { name: 'fake-image-name' } };
+            }
+          }),
+          provider: {
+            ecr: {
+              images: {
+                'fake-image-name': {
+                  path: './'
+                }
+              }
+            }
+          }
+        }
+      };
+
+      expect(Utils.getAllNodeFunctions.call({ serverless: mockServerless })).toEqual(['foo', 'bar']);
+    });
   });
 
   describe('isProviderGoogle', () => {