Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(sns): move subscribers to aws-sns-subscribers #2804

Merged
merged 6 commits into from
Jun 11, 2019
Merged

refactor(sns): move subscribers to aws-sns-subscribers #2804

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4178190
refactor(sns): move subscribers to `aws-sns-subscribers`
rix0rrr Jun 7, 2019
271ce73
Rename => subscriptions
rix0rrr Jun 10, 2019
86e0e5b
Cannot call the subscription ISubscription
rix0rrr Jun 10, 2019
936a79f
Update linter rule
rix0rrr Jun 10, 2019
25fd4bc
Merge remote-tracking branch 'origin/master' into huijbers/sns-subs
rix0rrr Jun 11, 2019
5a59cb6
Lock lock lock
rix0rrr Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-autoscaling-hooktargets/lib/lambda-hook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-subscribers');
import { Construct } from '@aws-cdk/cdk';
import { TopicHook } from './topic-hook';

Expand All @@ -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.subscribe(new subs.LambdaSubscriber(this.fn));
return new TopicHook(topic).bind(scope, lifecycleHook);
}
}
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-autoscaling-hooktargets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-sqs": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
Expand All @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-sqs": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-subscribers');
import cdk = require('@aws-cdk/cdk');

/**
Expand Down Expand Up @@ -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.subscribe(new subs.EmailSubscriber(notifyEmail));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename to addSubscriber

}
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-codepipeline-actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-subscribers": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
"homepage": "https://github.com/awslabs/aws-cdk",
Expand All @@ -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-subscribers": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-manual-approval.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
"PipelineApproveManualApprovalTopicResourceF5A35B20": {
"Type": "AWS::SNS::Topic"
},
"PipelineApproveManualApprovalTopicResourceSubscriptionadamruka85gmailcom76398FFA": {
"PipelineApproveManualApprovalTopicResourceadamruka85gmailcom202874CD": {
"Type": "AWS::SNS::Subscription",
"Properties": {
"Protocol": "email",
Expand All @@ -203,4 +203,4 @@
}
}
}
}
}
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-events-targets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-stepfunctions": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
Expand All @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-sqs": "^0.33.0",
"@aws-cdk/aws-stepfunctions": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-events-targets/test/codebuild/integ.project-events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-subscribers');
import sqs = require('@aws-cdk/aws-sqs');
import cdk = require('@aws-cdk/cdk');
import targets = require('../../lib');
Expand All @@ -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.subscribe(new subs.SqsSubscriber(queue));

// this will send an email with the JSON event for every state change of this
// build project.
Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-events-targets/test/sns/integ.sns-event-rule-target.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-subscribers');
import sqs = require('@aws-cdk/aws-sqs');
import cdk = require('@aws-cdk/cdk');
import targets = require('../../lib');
Expand All @@ -19,7 +20,7 @@ const event = new events.Rule(stack, 'EveryMinute', {
});

const queue = new sqs.Queue(stack, 'MyQueue');
topic.subscribeQueue(queue);
topic.subscribe(new subs.SqsSubscriber(queue));

event.addTarget(new targets.SnsTopic(topic));

Expand Down
3 changes: 2 additions & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/lib/sns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-subscribers');

/**
* Use an Amazon SNS topic as an event source for AWS Lambda.
Expand All @@ -9,6 +10,6 @@ export class SnsEventSource implements lambda.IEventSource {
}

public bind(target: lambda.IFunction) {
this.topic.subscribeLambda(target);
this.topic.subscribe(new subs.LambdaSubscriber(target));
}
}
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-lambda-event-sources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-sqs": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
Expand All @@ -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-subscribers": "^0.33.0",
"@aws-cdk/aws-sqs": "^0.33.0",
"@aws-cdk/cdk": "^0.33.0"
},
Expand Down
16 changes: 16 additions & 0 deletions packages/@aws-cdk/aws-sns-subscribers/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions packages/@aws-cdk/aws-sns-subscribers/.npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading