Build fixes, default protocol, more tests, docs

aws · Jun 21, 2019 · d524d12 · d524d12
1 parent f27a446
commit d524d12
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 5 deletions.
diff --git a/packages/@aws-cdk/aws-sns-subscriptions/lib/url.ts b/packages/@aws-cdk/aws-sns-subscriptions/lib/url.ts
@@ -14,6 +14,13 @@ export interface UrlSubscriptionProps extends SubscriptionProps {
    * @default false
    */
   readonly rawMessageDelivery?: boolean;
+
+  /**
+   * The subscription's protocol.
+   *
+   * @default Protocol is derived from url
+   */
+  readonly protocol?: sns.SubscriptionProtocol;
 }
 
 /**
@@ -24,15 +31,29 @@ 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 protocol: sns.SubscriptionProtocol, private readonly props: UrlSubscriptionProps = {}) {
-    if (!Token.isUnresolved(url) && !url.startsWith('http://') && !url.startsWith('https://')) {
+  private readonly protocol: sns.SubscriptionProtocol;
+  private readonly unresolvedUrl: boolean;
+
+  constructor(private readonly url: string, private readonly props: UrlSubscriptionProps = {}) {
+    this.unresolvedUrl = Token.isUnresolved(url);
+    if (!this.unresolvedUrl && !url.startsWith('http://') && !url.startsWith('https://')) {
       throw new Error('URL must start with either http:// or https://');
     }
+
+    if (this.unresolvedUrl && props.protocol === undefined) {
+      throw new Error('Must provide protocol if url is unresolved');
+    }
+
+    if (this.unresolvedUrl) {
+      this.protocol = props.protocol!;
+    } else {
+      this.protocol = this.url.startsWith('https:') ? sns.SubscriptionProtocol.HTTPS : sns.SubscriptionProtocol.HTTP;
+    }
   }
 
   public bind(_topic: sns.ITopic): sns.TopicSubscriptionConfig {
     return {
-      subscriberId: this.url,
+      subscriberId: this.unresolvedUrl ? 'UnresolvedUrl' : this.url,
       endpoint: this.url,
       protocol: this.protocol,
       rawMessageDelivery: this.props.rawMessageDelivery,

diff --git a/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts b/packages/@aws-cdk/aws-sns-subscriptions/test/subs.test.ts
@@ -2,6 +2,7 @@ import '@aws-cdk/assert/jest';
 import lambda = require('@aws-cdk/aws-lambda');
 import sns = require('@aws-cdk/aws-sns');
 import sqs = require('@aws-cdk/aws-sqs');
+import cdk = require('@aws-cdk/cdk');
 import { PhysicalName, Stack } from '@aws-cdk/cdk';
 import subs = require('../lib');
 
@@ -19,7 +20,7 @@ beforeEach(() => {
 });
 
 test('url subscription', () => {
-  topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', sns.SubscriptionProtocol.HTTPS));
+  topic.addSubscription(new subs.UrlSubscription('https://foobar.com/'));
 
   expect(stack).toMatchTemplate({
     "Resources": {
@@ -45,7 +46,7 @@ test('url subscription', () => {
 });
 
 test('url subscription (with raw delivery)', () => {
-  topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', sns.SubscriptionProtocol.HTTPS, {
+  topic.addSubscription(new subs.UrlSubscription('https://foobar.com/', {
     rawMessageDelivery: true
   }));
 
@@ -71,6 +72,44 @@ test('url subscription (with raw delivery)', () => {
   });
 });
 
+test('url subscription (unresolved url with protocol)', () => {
+  const secret = cdk.SecretValue.secretsManager('my-secret');
+  const url = secret.toString();
+  topic.addSubscription(new subs.UrlSubscription(url, {protocol: sns.SubscriptionProtocol.HTTPS}));
+
+  expect(stack).toMatchTemplate({
+    "Resources": {
+      "MyTopic86869434": {
+        "Type": "AWS::SNS::Topic",
+        "Properties": {
+          "DisplayName": "displayName",
+          "TopicName": "topicName"
+        }
+      },
+      "MyTopicUnresolvedUrlBA127FB3": {
+        "Type": "AWS::SNS::Subscription",
+        "Properties": {
+          "Endpoint": "{{resolve:secretsmanager:my-secret:SecretString:::}}",
+          "Protocol": "https",
+          "TopicArn": { "Ref": "MyTopic86869434" },
+        }
+      }
+    }
+  });
+});
+
+test('url subscription (unknown protocol)', () => {
+  expect(() => topic.addSubscription(new subs.UrlSubscription('some-protocol://foobar.com/')))
+   .toThrowError(/URL must start with either http:\/\/ or https:\/\//);
+});
+
+test('url subscription (unresolved url without protocol)', () => {
+  const secret = cdk.SecretValue.secretsManager('my-secret');
+  const url = secret.toString();
+  expect(() => topic.addSubscription(new subs.UrlSubscription(url)))
+   .toThrowError(/Must provide protocol if url is unresolved/);
+});
+
 test('queue subscription', () => {
   const queue = new sqs.Queue(stack, 'MyQueue');