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

fix(sns): allow tokens to be used in UrlSubscription #2938

Merged
merged 11 commits into from
Jul 4, 2019
Merged

fix(sns): allow tokens to be used in UrlSubscription #2938

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b2f72e
Check if url is unresolved
Jun 19, 2019
e48f892
Change ID generation
Jun 21, 2019
f27a446
Fix build
Jun 21, 2019
d524d12
Build fixes, default protocol, more tests, docs
Jun 21, 2019
0cb565a
Merge branch 'master' into fix-sns-dont-check-protocol-url-subscription
Jun 25, 2019
938bee4
Fix for 0.36.0
Jun 25, 2019
7d49ae6
Merge branch 'master' into fix-sns-dont-check-protocol-url-subscription
Jun 26, 2019
20459e7
Reorder imports
Jun 26, 2019
4904d1f
Update url.ts
Jul 1, 2019
d6c396a
Merge branch 'master' into fix-sns-dont-check-protocol-url-subscription
rix0rrr Jul 1, 2019
2f7294a
Merge branch 'master' into fix-sns-dont-check-protocol-url-subscription
Jul 3, 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
14 changes: 7 additions & 7 deletions packages/@aws-cdk/aws-sns-subscriptions/lib/url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sns = require('@aws-cdk/aws-sns');
import { SubscriptionProps } from './subscription';
import { Construct, Token } from '@aws-cdk/cdk';

/**
* Options for URL subscriptions.
Expand All @@ -23,17 +23,17 @@ export interface UrlSubscriptionProps extends SubscriptionProps {
* @see https://docs.aws.amazon.com/sns/latest/dg/sns-http-https-endpoint-as-subscriber.html
*/
export class UrlSubscription implements sns.ITopicSubscription {
constructor(private readonly url: string, private readonly props: UrlSubscriptionProps = {}) {
if (!url.startsWith('http://') && !url.startsWith('https://')) {
constructor(private readonly url: string, private readonly protocol: sns.SubscriptionProtocol, private readonly props: UrlSubscriptionProps = {}) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd rather have the protocol optionally inside the props, and derive it from the literal URL (if available).

Only force passing it if the URL is unresolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rix0rrr fixed in d524d12

if (!Token.isUnresolved(url) && !url.startsWith('http://') && !url.startsWith('https://')) {
throw new Error('URL must start with either http:// or https://');
}
}

public bind(_topic: sns.ITopic): sns.TopicSubscriptionConfig {
return {
subscriberId: this.url,
public bind(scope: Construct, topic: sns.ITopic): void {
new sns.Subscription(scope, Token.isUnresolved(this.url) ? 'UnresolvedUrl' : this.url, {
topic,
endpoint: this.url,
protocol: this.url.startsWith('https:') ? sns.SubscriptionProtocol.HTTPS : sns.SubscriptionProtocol.HTTP,
protocol: this.protocol,
rawMessageDelivery: this.props.rawMessageDelivery,
filterPolicy: this.props.filterPolicy,
};
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ beforeEach(() => {
});

test('url subscription', () => {
topic.addSubscription(new subs.UrlSubscription('https://foobar.com/'));
topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', sns.SubscriptionProtocol.Https));

expect(stack).toMatchTemplate({
"Resources": {
Expand All @@ -45,7 +45,7 @@ test('url subscription', () => {
});

test('url subscription (with raw delivery)', () => {
topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', {
topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', sns.SubscriptionProtocol.Https, {
rawMessageDelivery: true
}));

Expand Down