Merge branch 'awslabs:main' into aws-alb-lambda-latest

awslabs · Jun 26, 2021 · 7091c6d · 7091c6d
2 parents f412ec3 + 6f7bea9
commit 7091c6d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.108.1](https://github.com/awslabs/aws-solutions-constructs/compare/v1.108.0...v1.108.1) (2021-06-26)
+
+### Changed
+
+* Upgraded all patterns to CDK v1.108.1
+
+## [1.108.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.107.0...v1.108.0) (2021-06-26)
+
+### Changed
+
+* Upgraded all patterns to CDK v1.108.0
+
+### ⚠ BREAKING CHANGES
+
+* [291](https://github.com/awslabs/aws-solutions-constructs/issues/219) Changed the attribute name in for EventsRuleToSnsProps from topicsProps to topicProps to match other constructs and documentation. Clients using EventsRuleToSns will need to change this attribute name where it appears in their code.
+
 ## [1.107.0](https://github.com/awslabs/aws-solutions-constructs/compare/v1.106.1...v1.107.0) (2021-06-15)
 
 ### Changed

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "1.107.0"
+  "version": "1.108.1"
 }
diff --git a/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts b/source/patterns/@aws-solutions-constructs/aws-events-rule-sns/lib/index.ts
@@ -25,7 +25,7 @@ export interface EventsRuleToSnsProps {
      *
      * @default - Default props are used
      */
-    readonly topicsProps?: sns.TopicProps
+    readonly topicProps?: sns.TopicProps
     /**
      * User provided eventRuleProps to override the defaults
      *
@@ -85,7 +85,7 @@ export class EventsRuleToSns extends Construct {
       // Setup the sns topic.
       [this.snsTopic, this.encryptionKey] = defaults.buildTopic(this, {
         existingTopicObj: props.existingTopicObj,
-        topicProps: props.topicsProps,
+        topicProps: props.topicProps,
         enableEncryptionWithCustomerManagedKey: enableEncryptionParam,
         encryptionKey: props.encryptionKey,
         encryptionKeyProps: props.encryptionKeyProps

diff --git a/source/patterns/@aws-solutions-constructs/core/lib/input-validation.ts b/source/patterns/@aws-solutions-constructs/core/lib/input-validation.ts
@@ -45,10 +45,7 @@ export interface VerifiedProps {
   readonly existingBucketObj?: s3.Bucket,
   readonly bucketProps?: s3.BucketProps,
 
-  // topicsProps is an incorrect attribute used in event-rule-sns that
-  // we need to support
   readonly topicProps?: sns.TopicProps,
-  readonly topicsProps?: sns.TopicProps,
   readonly existingTopicObj?: sns.Topic,
 
   readonly glueJobProps?: glue.CfnJobProps,
@@ -108,7 +105,7 @@ export function CheckProps(propsObject: VerifiedProps | any) {
     errorFound = true;
   }
 
-  if ((propsObject.topicProps || propsObject.topicsProps) && propsObject.existingTopicObj) {
+  if ((propsObject.topicProps) && propsObject.existingTopicObj) {
     errorMessages += 'Error - Either provide topicProps or existingTopicObj, but not both.\n';
     errorFound = true;
   }

diff --git a/source/patterns/@aws-solutions-constructs/core/test/input-validation.test.ts b/source/patterns/@aws-solutions-constructs/core/test/input-validation.test.ts
@@ -197,7 +197,7 @@ test('Test fail SNS topic check with bad topic attribute name', () => {
   const stack = new Stack();
 
   const props: defaults.VerifiedProps = {
-    topicsProps: {},
+    topicProps: {},
     existingTopicObj: new sns.Topic(stack, 'placeholder', {})
   };
 

diff --git a/...e_cases/aws-restaurant-management-demo/lib/lambda/service-staff/create-order/package.json b/...e_cases/aws-restaurant-management-demo/lib/lambda/service-staff/create-order/package.json
@@ -10,4 +10,4 @@
   "dependencies": {
     "uuid": "^8.3.2"
   }
-}
+}
diff --git a/source/use_cases/aws-restaurant-management-demo/package.json b/source/use_cases/aws-restaurant-management-demo/package.json
@@ -59,4 +59,4 @@
     "source-map-support": "^0.5.16",
     "typescript": "^4.2.4"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
       "dependencies": {
         "uuid": "^8.3.2"
       }
-    }
+    }