fix(Console): Keep currently attached layers with function deploy

Author: medikoo

lib/plugins/aws/deploy-function.js

@@ -259,17 +259,17 @@ class AwsDeployFunction {
       delete params.Timeout;
     }
 
-    if (functionObj.layers && !functionObj.layers.some(_.isObject)) {
-      params.Layers = functionObj.layers;
-    }
-
     const isConsoleEnabled =
       this.console.isEnabled && this.console.isFunctionSupported(functionObj);
-    if (isConsoleEnabled) {
-      if (!params.Layers) params.Layers = [];
-      params.Layers.push(await this.console.ensureLayerVersion());
-    }
 
+    if (functionObj.layers && !functionObj.layers.some(_.isObject)) {
+      params.Layers = functionObj.layers;
+    } else if (isConsoleEnabled) {
+      params.Layers = (remoteFunctionConfiguration.Layers || [])
+        .map((layer) => layer.Arn)
+        .filter((layerArn) => !layerArn.includes('layer:sls-console-otel-extension-'));
+    }
+    if (isConsoleEnabled) params.Layers.push(await this.console.ensureLayerVersion());
     if (
       params.Layers &&
       remoteFunctionConfiguration.Layers &&

test/unit/lib/classes/console.test.js

@@ -405,7 +405,26 @@ describe('test/unit/lib/classes/console.test.js', () => {
         awsRequestStubMap: {
           ...awsRequestStubMap,
           Lambda: {
-            getFunction: { Configuration: { State: 'Active', LastUpdateStatus: 'Successful' } },
+            getFunction: {
+              Configuration: {
+                State: 'Active',
+                LastUpdateStatus: 'Successful',
+                Layers: [
+                  {
+                    Arn: 'arn:aws:lambda:us-east-1:999999999999:layer:sls-console-otel-extension-0-3-6:1',
+                    CodeSize: 186038,
+                    SigningProfileVersionArn: null,
+                    SigningJobArn: null,
+                  },
+                  {
+                    Arn: 'other-layer',
+                    CodeSize: 186038,
+                    SigningProfileVersionArn: null,
+                    SigningJobArn: null,
+                  },
+                ],
+              },
+            },
             listLayerVersions() {
               if (isFirstLayerVersionsQuery) {
                 isFirstLayerVersionsQuery = false;
@@ -433,6 +452,11 @@ describe('test/unit/lib/classes/console.test.js', () => {
         .be.true;
     });
 
+    it('should keep already attached lambda layers', async () => {
+      const layers = updateFunctionStub.args[0][0].Layers;
+      expect(layers.sort()).to.deep.equal(['other-layer', 'extension-arn'].sort());
+    });
+
     it('should activate otel ingestion token', () => {
       otelIngenstionRequests.includes('activate-token');
     });