fixes

Author: dphang

packages/serverless-components/aws-lambda/__mocks__/aws-sdk.mock.js

@@ -50,6 +50,13 @@ const mockGetCallerIdentityMappingPromise = promisifyMock(
   mockGetCallerIdentityMapping
 );
 
+const mockListTags = jest.fn();
+const mockListTagsPromise = promisifyMock(mockListTags);
+const mockTagResource = jest.fn();
+const mockTagResourcePromise = promisifyMock(mockTagResource);
+const mockUntagResource = jest.fn();
+const mockUntagResourcePromise = promisifyMock(mockUntagResource);
+
 module.exports = {
   mockCreateQueuePromise,
   mockGetQueueAttributesPromise,
@@ -80,6 +87,12 @@ module.exports = {
   mockUpdateFunctionCodePromise,
   mockUpdateFunctionConfiguration,
   mockUpdateFunctionConfigurationPromise,
+  mockListTags,
+  mockListTagsPromise,
+  mockTagResource,
+  mockTagResourcePromise,
+  mockUntagResource,
+  mockUntagResourcePromise,
 
   Lambda: jest.fn(() => ({
     listEventSourceMappings: mockListEventSourceMappings,
@@ -88,6 +101,9 @@ module.exports = {
     publishVersion: mockPublishVersion,
     getFunctionConfiguration: mockGetFunctionConfiguration,
     updateFunctionCode: mockUpdateFunctionCode,
-    updateFunctionConfiguration: mockUpdateFunctionConfiguration
+    updateFunctionConfiguration: mockUpdateFunctionConfiguration,
+    listTags: mockListTags,
+    tagResource: mockTagResource,
+    untagResource: mockUntagResource
   }))
 };

packages/serverless-components/aws-lambda/__tests__/publishVersion.test.js

@@ -1,12 +1,17 @@
 const { createComponent, createTmpDir } = require("../test-utils");
 
 const {
+  mockCreateFunction,
   mockCreateFunctionPromise,
   mockPublishVersion,
   mockPublishVersionPromise,
   mockGetFunctionConfigurationPromise,
   mockUpdateFunctionCodePromise,
-  mockUpdateFunctionConfigurationPromise
+  mockUpdateFunctionConfigurationPromise,
+  mockListTags,
+  mockListTagsPromise,
+  mockTagResource,
+  mockUntagResource
 } = require("aws-sdk");
 
 jest.mock("aws-sdk", () => require("../__mocks__/aws-sdk.mock"));
@@ -47,7 +52,8 @@ describe("publishVersion", () => {
     const tmpFolder = await createTmpDir();
 
     await component.default({
-      code: tmpFolder
+      code: tmpFolder,
+      tags: { new: "tag" }
     });
 
     const versionResult = await component.publishVersion();
@@ -60,6 +66,12 @@ describe("publishVersion", () => {
     expect(versionResult).toEqual({
       version: "v2"
     });
+
+    expect(mockCreateFunction).toBeCalledWith(
+      expect.objectContaining({
+        Tags: { new: "tag" }
+      })
+    );
   });
 
   it("publishes new version of lambda that was updated", async () => {
@@ -79,7 +91,11 @@ describe("publishVersion", () => {
       CodeSha256: "LQT0VA="
     });
     mockUpdateFunctionConfigurationPromise.mockResolvedValueOnce({
-      CodeSha256: "XYZ0VA="
+      CodeSha256: "XYZ0VA=",
+      FunctionArn: "arn:aws:lambda:us-east-1:123456789012:function:my-func"
+    });
+    mockListTagsPromise.mockResolvedValueOnce({
+      Tags: { foo: "bar" }
     });
 
     const tmpFolder = await createTmpDir();
@@ -89,7 +105,8 @@ describe("publishVersion", () => {
     });
 
     await component.default({
-      code: tmpFolder
+      code: tmpFolder,
+      tags: { new: "tag" }
     });
 
     const versionResult = await component.publishVersion();
@@ -99,6 +116,20 @@ describe("publishVersion", () => {
       CodeSha256: "XYZ0VA=" // compare against the hash received from the function update, *not* create
     });
 
+    expect(mockListTags).toBeCalledWith({
+      Resource: "arn:aws:lambda:us-east-1:123456789012:function:my-func"
+    });
+
+    expect(mockUntagResource).toBeCalledWith({
+      Resource: "arn:aws:lambda:us-east-1:123456789012:function:my-func",
+      Tags: ["foo"]
+    });
+
+    expect(mockTagResource).toBeCalledWith({
+      Resource: "arn:aws:lambda:us-east-1:123456789012:function:my-func",
+      Tags: { new: "tag" }
+    });
+
     expect(versionResult).toEqual({
       version: "v2"
     });

packages/serverless-components/aws-lambda/package.json

@@ -24,6 +24,7 @@
     "archiver": "^5.3.0",
     "fs-extra": "^9.1.0",
     "globby": "^11.0.1",
+    "lodash": "^4.17.21",
     "ramda": "^0.27.0"
   },
   "peerDependencies": {

packages/serverless-components/aws-lambda/serverless.js

@@ -26,7 +26,8 @@ const outputsList = [
   "env",
   "role",
   "arn",
-  "region"
+  "region",
+  "tags"
 ];
 
 const defaults = {
@@ -50,6 +51,7 @@ class AwsLambda extends Component {
     const config = mergeDeepRight(defaults, inputs);
 
     config.name = inputs.name || this.state.name || this.context.resourceId();
+    config.tags = inputs.tags || this.state.tags;
 
     this.context.debug(
       `Starting deployment of lambda ${config.name} to the ${config.region} region.`

packages/serverless-components/aws-lambda/utils.js

@@ -5,6 +5,7 @@ const globby = require("globby");
 const { contains, isNil, last, split, equals, not, pick } = require("ramda");
 const { readFile, createReadStream, createWriteStream } = require("fs-extra");
 const { utils } = require("@serverless/core");
+const _ = require("lodash");
 
 const VALID_FORMATS = ["zip", "tar"];
 const isValidFormat = (format) => contains(format, VALID_FORMATS);
@@ -146,8 +147,7 @@ const updateLambdaConfig = async ({
     Timeout: timeout,
     Environment: {
       Variables: env
-    },
-    Tags: tags
+    }
   };
 
   if (layer && layer.arn) {
@@ -158,6 +158,30 @@ const updateLambdaConfig = async ({
     .updateFunctionConfiguration(functionConfigParams)
     .promise();
 
+  // Get and update Lambda tags
+  const listTagsResponse = await lambda
+    .listTags({ Resource: res.FunctionArn })
+    .promise();
+  const currentTags = listTagsResponse.Tags;
+
+  // If tags are not the same then update them
+  if (!_.isEqual(currentTags, tags)) {
+    await lambda
+      .untagResource({
+        Resource: res.FunctionArn,
+        Tags: Object.keys(currentTags)
+      })
+      .promise();
+
+    if (tags && Object.keys(tags).length > 0)
+      await lambda
+        .tagResource({
+          Resource: res.FunctionArn,
+          Tags: tags
+        })
+        .promise();
+  }
+
   return { arn: res.FunctionArn, hash: res.CodeSha256 };
 };
 

packages/serverless-components/aws-lambda/yarn.lock

@@ -1097,7 +1097,7 @@ lodash.union@^4.6.0:
   resolved "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
   integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
 
-lodash@^4.17.14:
+lodash@^4.17.14, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==