Merge pull request #227 from aws-solutions/release/v3.2.2

Add AppRegistry integration
aws-solutions · Dec 5, 2022 · d411a9e · d411a9e
2 parents a7d940f + 850eb29
commit d411a9e
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.2] - 2022-12-05
+### Added
+- Added AppRegistry integration
 ## [3.2.1] - 2022-08-30
 ### Added
 - Added support for configuring oversize handling for requests components

diff --git a/deployment/aws-waf-security-automations.template b/deployment/aws-waf-security-automations.template
@@ -364,6 +364,9 @@ Mappings:
             QueryScheduledRunTime: 5   # by default athena query runs every 5 minutes, update it if needed
         UserAgent:
             UserAgentExtra: 'AwsSolution/SO0006/%VERSION%'
+        AppRegistry:
+             AppRegistryApplicationName: 'waf-security-automations'
+             SolutionName: 'WAF Security Automations'
 
 
 Resources:
@@ -2222,6 +2225,68 @@ Resources:
       FunctionName: !GetAtt RemoveExpiredIP.Arn
       StartingPosition: LATEST
 
+  # AppRegistry Application
+  Application:
+    Type: AWS::ServiceCatalogAppRegistry::Application
+    Properties:
+      Description: Service Catalog application to track and manage all your resources for the solution WAF Security Automations. The SolutionID is SO0006 and SolutionVersion is %VERSION%.
+      Name: 
+        !Join
+          - "-"
+          - - !FindInMap [Solution, AppRegistry, "AppRegistryApplicationName"]
+            - !Ref AWS::Region
+            - !Ref AWS::AccountId
+            - !Ref AWS::StackName
+      Tags: {
+      'Solutions:SolutionID': !FindInMap [Solution, Data, "SolutionID"],
+      'Solutions:SolutionVersion': "%VERSION%",
+      'Solutions:SolutionName': !FindInMap [Solution, AppRegistry, "SolutionName"],
+      'Solutions:ApplicationType': 'AWS-Solutions', 
+      }
+
+  AppRegistryApplicationStackAssociation:
+    Type: AWS::ServiceCatalogAppRegistry::ResourceAssociation
+    Properties:
+      Application: !GetAtt Application.Id
+      Resource:
+        !Ref AWS::StackId
+      ResourceType: CFN_STACK
+
+  AppRegistryApplicationStackAssociationNestedStackWebACL:
+    Type: AWS::ServiceCatalogAppRegistry::ResourceAssociation
+    Properties:
+      Application: !GetAtt Application.Id
+      Resource: 
+        !Ref WebACLStack
+      ResourceType: CFN_STACK
+
+  AppRegistryApplicationStackAssociationNestedStackFirehoseAthena:
+    Type: AWS::ServiceCatalogAppRegistry::ResourceAssociation
+    Condition: CreateFirehoseAthenaStack
+    Properties:
+      Application: !GetAtt Application.Id
+      Resource: 
+        !Ref FirehoseAthenaStack
+      ResourceType: CFN_STACK
+
+  DefaultApplicationAttributes:
+    Type: AWS::ServiceCatalogAppRegistry::AttributeGroup
+    Properties:
+      Name: !Ref AWS::StackName
+      Description: Attribute group for solution information.
+      Attributes:       
+        { "ApplicationType" : 'AWS-Solutions',
+          "Version": "%VERSION%",
+          "SolutionID": !FindInMap [Solution, Data, "SolutionID"],
+          "SolutionName": !FindInMap [Solution, AppRegistry, "SolutionName"]
+        }
+
+  AppRegistryApplicationAttributeAssociation:
+    Type: AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation
+    Properties:
+      Application: !GetAtt Application.Id
+      AttributeGroup: !GetAtt DefaultApplicationAttributes.Id
+
 Outputs:
   BadBotHoneypotEndpoint:
     Description: Bad Bot Honeypot Endpoint