Merge pull request #38 from aws-solutions/release/v2.5.1

Updated to version v2.5.1

Author: groverlalit

CHANGELOG.md

@@ -5,6 +5,10 @@
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [2.5.1] - 2023-01
+ ### Fixed
+ - Fixed vulnerabilities py [CVE-2022-42969](https://nvd.nist.gov/vuln/detail/CVE-2022-42969), pytest, requests, certifi [CVE-2022-23491](https://nvd.nist.gov/vuln/detail/CVE-2022-23491)
+
  ## [2.5] - 2022-08
  ### Added
  - Added support for AWS Organizations

README.md

@@ -1,6 +1,6 @@
 **[🚀 Solution Landing Page](https://aws.amazon.com/solutions/implementations/amazon-workspaces-cost-optimizer/)** | **[🚧 Feature request](https://github.com/awslabs/<insert-solution-repo-name>/issues/new?assignees=&labels=feature-request%2C+enhancement&template=feature_request.md&title=)** | **[🐛 Bug Report](https://github.com/awslabs/<insert-solution-repo-name>/issues/new?assignees=&labels=bug%2C+triage&template=bug_report.md&title=)**
 
-Note: If you want to use the solution without building from source, navigate to Solution Landing Page
+Note: If you want to use the solution without building from source, navigate to Solution Landing Page.
 
 ## Table of contents
 

deployment/workspaces-cost-optimizer-spoke.template

@@ -194,7 +194,7 @@ Resources:
   DefaultApplicationAttributes:
     Type: AWS::ServiceCatalogAppRegistry::AttributeGroup
     Properties:
-      Name: !Ref "AWS::StackName"
+      Name: !Sub '${AWS::Region}-${AWS::StackName}'
       Description: Metadata describing the AWS solution being run
       Attributes:       
             { "ApplicationType" : "WebService",
@@ -217,7 +217,7 @@ Resources:
             - !Ref AWS::Region
             - !Ref HubAccountId
       AttributeGroup: !GetAtt DefaultApplicationAttributes.Id
-        
+
   ApplicationInsightsConfiguration:
     Type: AWS::ApplicationInsights::Application
     Properties: 
@@ -232,7 +232,7 @@ Resources:
       Tags:
         - Key: !FindInMap [Solution, Data, "TagKey"]
           Value: !Ref "AWS::StackName"
-
+                  
 Outputs:
   SolutionID:
     Value: !FindInMap ["Solution", "Data", "ID"]

deployment/workspaces-cost-optimizer.template

@@ -1082,7 +1082,7 @@ Resources:
     Properties:
       Application: !GetAtt Application.Id
       AttributeGroup: !GetAtt DefaultApplicationAttributes.Id
-  
+
   ApplicationInsightsConfiguration:
     Type: AWS::ApplicationInsights::Application
     DependsOn:
@@ -1103,7 +1103,6 @@ Resources:
           Value: !Ref "AWS::StackName"
 
 
-
   # External Resources [end]
 
 Outputs: