adds tagging on new and updated functions (#508)

* adds tagging on new and updated functions

* fixes return value and associated test when no tags are given

* adds tagging on new and updated functions

* fixes return value and associated test when no tags are given

Author: tnolet

README.md

@@ -98,6 +98,7 @@ DOCKER_IMAGE               // (default: '')
 DEPLOY_ZIPFILE             // (default: '')
 DEPLOY_USE_S3              // (default: false)
 AWS_DLQ_TARGET_ARN         // (default: not set)
+AWS_TAGS                   // (default: '')
 ```
 
 #### run
@@ -196,6 +197,7 @@ Options:
   -z, --deployZipfile []              Deploy zipfile
   -B, --deployUseS3 []                Use S3 to deploy.
   -y, --proxy []                      Proxy server
+  -A, --tags []                      'Tags as key value pairs (e.g. "tagname1=tagvalue1,tagname2=tagvalue2") (default: "")
 ```
 
 If you are deploying to a custom endpoint you may also need to pass in an access key/secret. For localstack these can be anything, but cannot be blank:

bin/node-lambda

@@ -59,6 +59,7 @@ const PROXY = process.env.PROXY || process.env.http_proxy || ''
 const ENABLE_RUN_MULTIPLE_EVENTS = true
 const KEEP_NODE_MODULES = process.env.KEEP_NODE_MODULES || false
 const DOCKER_VOLUMES = process.env.DOCKER_VOLUMES || ''
+const AWS_TAGS = process.env.AWS_TAGS || ''
 
 program
   .command('deploy')
@@ -105,6 +106,7 @@ program
   .option('-z, --deployZipfile [DEPLOY_ZIPFILE]', 'Deploy zipfile', DEPLOY_ZIPFILE)
   .option('-B, --deployUseS3 [DEPLOY_USE_S3]', 'Use S3 to deploy.', DEPLOY_USE_S3)
   .option('-y, --proxy [PROXY]', 'Proxy server', PROXY)
+  .option('-A, --tags [AWS_TAGS]', 'Tags as key value pairs (e.g. "tagname1=tagvalue1,tagname2=tagvalue2)"', AWS_TAGS)
   .action((prg) => lambda.deploy(prg))
 
 program

lib/main.js

@@ -215,7 +215,8 @@ so you can easily test run multiple events.
       TracingConfig: {
         Mode: null
       },
-      Layers: []
+      Layers: [],
+      Tags: {}
     }
 
     if (this._isUseS3(program)) {
@@ -255,6 +256,15 @@ so you can easily test run multiple events.
     if (program.layers) {
       params.Layers = program.layers.split(',')
     }
+    if (program.tags) {
+      const tags = program.tags.split(',')
+      for (const tag of tags) {
+        const kvPair = tag.split('=')
+        if (kvPair && kvPair.length === 2) {
+          params.Tags[kvPair[0].toString()] = kvPair[1].toString()
+        }
+      }
+    }
 
     return params
   }
@@ -752,6 +762,23 @@ they may not work as expected in the Lambda environment.
     }))
   }
 
+  _updateTags (lambda, functionArn, tags) {
+    if (!tags || Object.keys(tags).length <= 0) {
+      return Promise.resolve([])
+    } else {
+      return lambda.listTags({ Resource: functionArn }).promise()
+        .then(data => {
+          const keys = Object.keys(data.Tags)
+          return keys && keys.length > 0
+            ? lambda.untagResource({ Resource: functionArn, TagKeys: keys }).promise()
+            : Promise.resolve()
+        })
+        .then(() => {
+          return lambda.tagResource({ Resource: functionArn, Tags: tags }).promise()
+        })
+    }
+  }
+
   _updateScheduleEvents (scheduleEvents, functionArn, scheduleList) {
     if (scheduleList == null) {
       return Promise.resolve([])
@@ -889,7 +916,11 @@ they may not work as expected in the Lambda environment.
                   s3Events,
                   results.FunctionArn,
                   eventSourceList.S3Events
-                )
+                ),
+                this._updateTags(
+                  lambda,
+                  results.FunctionArn,
+                  params.Tags)
               ])
             }),
             this._updateEventSources(

test/main.js

@@ -83,8 +83,14 @@ const lambdaMockSettings = {
   deleteEventSourceMapping: {
     EventSourceArn: 'Lambda.deleteEventSourceMapping.mock.EventSourceArn',
     FunctionName: 'Lambda.deleteEventSourceMapping.mock.EventSourceArn'
-  }
+  },
+  listTags: {
+    Tags: { tag1: 'key1' }
+  },
+  untagResource: {},
+  tagResource: {}
 }
+
 const _mockSetting = () => {
   awsMock.mock('CloudWatchEvents', 'putRule', (params, callback) => {
     callback(null, {})
@@ -1317,7 +1323,7 @@ describe('lib/main', function () {
         assert.deepEqual(
           result,
           [
-            [[], []],
+            [[], [], []],
             [],
             { retentionInDays: 30 }
           ]
@@ -1334,4 +1340,17 @@ describe('lib/main', function () {
       })
     })
   })
+
+  describe('Lambda.prototype._updateTags()', () => {
+    it('simple test with mock', () => {
+      return lambda._updateTags(
+        awsLambda,
+        'arn:aws:lambda:eu-central-1:1234567:function:test',
+        { tagKey: 'tagValue' }).then((result) => {
+        assert.deepEqual(
+          result, {}
+        )
+      })
+    })
+  })
 })