fix(aws-s3) Fix tag support for custom resource lambdas (#1724)

Add tag support to the inline Lambda by extending `cdk.Resource` and
adding tags. Implemented `renderProperties` to properly format tags.

Fixes #1497

packages/@aws-cdk/aws-s3/lib/notifications-resource/notifications-resource-handler.ts

@@ -65,8 +65,19 @@ export class NotificationsResourceHandler extends cdk.Construct {
       .addAction('s3:PutBucketNotification')
       .addAllResources());
 
-    const resource = new cdk.Resource(this, 'Resource', {
-      type: 'AWS::Lambda::Function',
+    const resourceType = 'AWS::Lambda::Function';
+    class InLineLambda extends cdk.Resource {
+      public readonly tags: cdk.TagManager = new cdk.TagManager(cdk.TagType.Standard, resourceType);
+
+      protected renderProperties(properties: any): { [key: string]: any } {
+        properties.Tags = cdk.listMapper(
+          cdk.cfnTagToCloudFormation)(this.tags.renderTags());
+        delete properties.tags;
+        return properties;
+      }
+    }
+    const resource = new InLineLambda(this, 'Resource', {
+      type: resourceType,
       properties: {
         Description: 'AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)',
         Code: { ZipFile: `exports.handler = ${handler.toString()};` },

packages/@aws-cdk/aws-s3/test/test.notifications.ts

@@ -42,6 +42,24 @@ export = {
 
     test.done();
   },
+  'when notification are added, you can tag the lambda'(test: Test) {
+    const stack = new cdk.Stack();
+    stack.apply(new cdk.Tag('Lambda', 'AreTagged'));
+
+    const bucket = new s3.Bucket(stack, 'MyBucket');
+
+    const topic = new Topic(stack, 'MyTopic');
+
+    bucket.onEvent(s3.EventType.ObjectCreated, topic);
+
+    expect(stack).to(haveResource('AWS::S3::Bucket'));
+    expect(stack).to(haveResource('AWS::Lambda::Function', {
+      Tags: [{Key: 'Lambda', Value: 'AreTagged'}],
+      Description: 'AWS CloudFormation handler for "Custom::S3BucketNotifications" resources (@aws-cdk/aws-s3)' }));
+    expect(stack).to(haveResource('Custom::S3BucketNotifications'));
+
+    test.done();
+  },
 
   'bucketNotificationTarget is not called during synthesis'(test: Test) {
     const stack = new cdk.Stack();