Merge pull request #43 from aws-solutions/feature/v2.6.0

updated to v2.6.0

Author: groverlalit

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,7 +22,7 @@ assignees: ""
 
 - [ ] Version: [e.g. v1.0.0]
 
-To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0009) - The AWS CloudFormation template for deployment of the aws-centralized-logging. Version v1.0.0_". You can also find the version from [releases](https://github.com/aws-solutions/aws-centralized-logging/releases)
+To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0009) - The AWS CloudFormation template for deployment of the aws-centralized-logging. Version v1.0.0_". You can also find the version from [releases](https://github.com/aws-solutions/cost-optimizer-for-amazon-workspaces/releases)
 
 - [ ] Region: [e.g. us-east-1]
 - [ ] Was the solution modified from the version published on this repository?

.gitignore

@@ -2,6 +2,7 @@ deployment/global-s3-assets/
 deployment/open-source/
 deployment/regional-s3-assets/
 deployment/test/
+deployment/ecr/
 
 __pycache__/
 .pytest_cache/
@@ -11,3 +12,8 @@ __pycache__/
 .coverage
 .venv/
 .DS_Store
+
+source/node_modules/
+source/build
+cdk.out
+coverage

CHANGELOG.md

@@ -5,6 +5,15 @@
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+ ## [2.6.0] - 2023-03
+ ### Added
+ - Updated the solution to use CDK V2 to generate CloudFormation templates and support CDK deployments.
+ - Updated the 'Terminate Workspace' feature to accept user input for number of months to check for before terminating unused workspaces.
+ - Added a retention policy of 365 days to ECS logs to optimize the costs.
+
+### Removed
+- The CFN templates from the deployment folder as we are using CDK V2 to generate templates.
+
 ## [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)

CONTRIBUTING.md

@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/awslabs/workspaces-cost-optimizer/issues), or [recently closed](https://github.com/awslabs/workspaces-cost-optimizer/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/aws-solutions/cost-optimizer-for-amazon-workspaces/issues), or [recently closed](https://github.com/aws-solutions/cost-optimizer-for-amazon-workspaces/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/awslabs/workspaces-cost-optimizer/labels/help%20wanted) issues is a great place to start. 
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-solutions/cost-optimizer-for-amazon-workspaces/labels/help%20wanted) issues is a great place to start. 
 
 
 ## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/awslabs/workspaces-cost-optimizer/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-solutions/cost-optimizer-for-amazon-workspaces/blob/main/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

NOTICE.txt

@@ -9,6 +9,51 @@ This software includes third party software subject to the following copyrights:
 
 AWS SDK under the Apache License Version 2.0
 requests under the Apache License Version 2.0
+@aws-cdk/assert under Apache-2.0
+@types/jest under MIT
+@types/node under MIT
+@types/sinon under MIT
+aws-cdk under the Apache License 2.0
+jest under MIT
+sinon under BSD-3-Clause
+ts-jest under MIT
+ts-node under MIT
+typescript under Apache-2.0
+cdk-nag under the Apache License 2.0
+@aws-cdk/aws-servicecatalogappregistry-alpha under the Apache License 2.0
+aws-cdk-lib under the Apache License 2.0
+constructs under the Apache License 2.0
+pytest under the MIT License
+pytest-mock under the MIT License
+coverage under the Apache License 2.0
+requests under the Apache License 2.0
+boto3 under the Apache License 2.0
+attrs under the MIT License
+botocore under the Apache License 2.0
+certifi under the Mozilla Public License 2.0
+idna under the BSD 3-Clause "New" or "Revised" License
+iniconfig under the MIT License
+jmespath under the MIT License
+packaging under the Apache Software License
+pluggy under the MIT License
+pyparsing under the MIT License
+python-dateutil under the Apache License 2.0
+s3transfer under the Apache License 2.0
+six under the MIT License
+tomli under the MIT License
+urllib3 under the MIT License
+freezegun under the Apache License Version 2.0
+pytest-cov under the MIT License
+pytest-env under the MIT License
+python-dateutil under the Apache License 2.0
+s3transfer under the Apache License 2.0
+six under the MIT License
+urllib3 under the MIT License
+virtualenv under the MIT License
 wheel under the MIT license
+wheel under the MIT license
+setuptools under the MIT license
 setuptools under the MIT license
+pip under the MIT license
+freezegun under the Apache License Version 2.0
 pip under the MIT license