aws · rix0rrr · Jun 11, 2019 · Jun 7, 2019 · Jun 10, 2019 · Jun 10, 2019
diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts b/packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts
@@ -1,6 +1,7 @@
 import autoscaling = require('@aws-cdk/aws-autoscaling');
 import lambda = require('@aws-cdk/aws-lambda');
 import sns = require('@aws-cdk/aws-sns');
+import subs = require('@aws-cdk/aws-sns-subscriptions');
 import { Construct } from '@aws-cdk/cdk';
 import { TopicHook } from './topic-hook';
 
@@ -15,7 +16,7 @@ export class FunctionHook implements autoscaling.ILifecycleHookTarget {
 
   public bind(scope: Construct, lifecycleHook: autoscaling.ILifecycleHook): autoscaling.LifecycleHookTargetConfig {
     const topic = new sns.Topic(scope, 'Topic');
-    topic.subscribeLambda(this.fn);
+    topic.addSubscription(new subs.LambdaSubscription(this.fn));
     return new TopicHook(topic).bind(scope, lifecycleHook);
   }
 }
diff --git a/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json b/packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
@@ -81,6 +81,7 @@
     "@aws-cdk/aws-iam": "^0.33.0",
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-sqs": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },
@@ -90,6 +91,7 @@
     "@aws-cdk/aws-iam": "^0.33.0",
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-sqs": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts
@@ -1,5 +1,6 @@
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import sns = require('@aws-cdk/aws-sns');
+import subs = require('@aws-cdk/aws-sns-subscriptions');
 import cdk = require('@aws-cdk/cdk');
 
 /**
@@ -62,7 +63,7 @@ export class ManualApprovalAction extends codepipeline.Action {
     if (this._notificationTopic) {
       this._notificationTopic.grantPublish(info.role);
       for (const notifyEmail of this.props.notifyEmails || []) {
-        this._notificationTopic.subscribeEmail(`Subscription-${notifyEmail}`, notifyEmail);
+        this._notificationTopic.addSubscription(new subs.EmailSubscription(notifyEmail));
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/package.json b/packages/@aws-cdk/aws-codepipeline-actions/package.json
@@ -85,6 +85,7 @@
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-s3": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },
   "homepage": "https://github.com/awslabs/aws-cdk",
@@ -103,6 +104,7 @@
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-s3": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },
   "engines": {

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json
@@ -192,7 +192,7 @@
     "PipelineApproveManualApprovalTopicResourceF5A35B20": {
       "Type": "AWS::SNS::Topic"
     },
-    "PipelineApproveManualApprovalTopicResourceSubscriptionadamruka85gmailcom76398FFA": {
+    "PipelineApproveManualApprovalTopicResourceadamruka85gmailcom202874CD": {
       "Type": "AWS::SNS::Subscription",
       "Properties": {
         "Protocol": "email",
@@ -203,4 +203,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-events-targets/package.json b/packages/@aws-cdk/aws-events-targets/package.json
@@ -89,6 +89,7 @@
     "@aws-cdk/aws-iam": "^0.33.0",
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-stepfunctions": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },
@@ -103,6 +104,7 @@
     "@aws-cdk/aws-iam": "^0.33.0",
     "@aws-cdk/aws-lambda": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-sqs": "^0.33.0",
     "@aws-cdk/aws-stepfunctions": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"

diff --git a/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts b/packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts
@@ -3,6 +3,7 @@ import codebuild = require('@aws-cdk/aws-codebuild');
 import codecommit = require('@aws-cdk/aws-codecommit');
 import events = require('@aws-cdk/aws-events');
 import sns = require('@aws-cdk/aws-sns');
+import subs = require('@aws-cdk/aws-sns-subscriptions');
 import sqs = require('@aws-cdk/aws-sqs');
 import cdk = require('@aws-cdk/cdk');
 import targets = require('../../lib');
@@ -19,7 +20,7 @@ const project = new codebuild.Project(stack, 'MyProject', {
 const queue = new sqs.Queue(stack, 'MyQueue');
 
 const topic = new sns.Topic(stack, 'MyTopic');
-topic.subscribeQueue(queue);
+topic.addSubscription(new subs.SqsSubscription(queue));
 
 // this will send an email with the JSON event for every state change of this
 // build project.

diff --git a/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts b/packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts
@@ -1,5 +1,6 @@
 import events = require('@aws-cdk/aws-events');
 import sns = require('@aws-cdk/aws-sns');
+import subs = require('@aws-cdk/aws-sns-subscriptions');
 import sqs = require('@aws-cdk/aws-sqs');
 import cdk = require('@aws-cdk/cdk');
 import targets = require('../../lib');
@@ -19,7 +20,7 @@ const event = new events.Rule(stack, 'EveryMinute', {
 });
 
 const queue = new sqs.Queue(stack, 'MyQueue');
-topic.subscribeQueue(queue);
+topic.addSubscription(new subs.SqsSubscription(queue));
 
 event.addTarget(new targets.SnsTopic(topic));
 

diff --git a/packages/@aws-cdk/aws-lambda-event-sources/lib/sns.ts b/packages/@aws-cdk/aws-lambda-event-sources/lib/sns.ts
@@ -1,5 +1,6 @@
 import lambda = require('@aws-cdk/aws-lambda');
 import sns = require('@aws-cdk/aws-sns');
+import subs = require('@aws-cdk/aws-sns-subscriptions');
 
 /**
  * Use an Amazon SNS topic as an event source for AWS Lambda.
@@ -9,6 +10,6 @@ export class SnsEventSource implements lambda.IEventSource {
   }
 
   public bind(target: lambda.IFunction) {
-    this.topic.subscribeLambda(target);
+    this.topic.addSubscription(new subs.LambdaSubscription(target));
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-lambda-event-sources/package.json b/packages/@aws-cdk/aws-lambda-event-sources/package.json
@@ -71,6 +71,7 @@
     "@aws-cdk/aws-s3": "^0.33.0",
     "@aws-cdk/aws-s3-notifications": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-sqs": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },
@@ -85,6 +86,7 @@
     "@aws-cdk/aws-s3": "^0.33.0",
     "@aws-cdk/aws-s3-notifications": "^0.33.0",
     "@aws-cdk/aws-sns": "^0.33.0",
+    "@aws-cdk/aws-sns-subscriptions": "^0.33.0",
     "@aws-cdk/aws-sqs": "^0.33.0",
     "@aws-cdk/cdk": "^0.33.0"
   },

diff --git a/packages/@aws-cdk/aws-sns-subscriptions/.gitignore b/packages/@aws-cdk/aws-sns-subscriptions/.gitignore
@@ -0,0 +1,16 @@
+*.js
+tsconfig.json
+tslint.json
+*.js.map
+*.d.ts
+*.generated.ts
+dist
+lib/generated/resources.ts
+.jsii
+
+.LAST_BUILD
+.nyc_output
+coverage
+.nycrc
+.LAST_PACKAGE
+*.snk
diff --git a/packages/@aws-cdk/aws-sns-subscriptions/.npmignore b/packages/@aws-cdk/aws-sns-subscriptions/.npmignore
@@ -0,0 +1,18 @@
+# Don't include original .ts files when doing `npm pack`
+*.ts
+!*.d.ts
+coverage
+.nyc_output
+*.tgz
+
+dist
+.LAST_PACKAGE
+.LAST_BUILD
+!*.js
+
+# Include .jsii
+!.jsii
+
+*.snk
+
+*.tsbuildinfo