Skip to content

Commit edc9bc9

Browse files
gsingh04gsingh04
authored
Merge pull request #30 from aws-solutions/release/v2.5.0
update to v2.5.0
2 parents d95b9b5 + 96855d7 commit edc9bc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+5803
-276
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ""
5+
labels: bug
6+
assignees: ""
7+
---
8+
9+
**Describe the bug**
10+
11+
<!--- A clear and concise description of what the bug is -->
12+
13+
**To Reproduce**
14+
15+
<!--- Steps to reproduce the behavior -->
16+
17+
**Expected behavior**
18+
19+
<!--- A clear and concise description of what you expected to happen -->
20+
21+
**Please complete the following information about the solution:**
22+
23+
- [ ] Version: [e.g. v1.0.0]
24+
25+
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)
26+
27+
- [ ] Region: [e.g. us-east-1]
28+
- [ ] Was the solution modified from the version published on this repository?
29+
- [ ] If the answer to the previous question was yes, are the changes available on GitHub?
30+
- [ ] Provide the logs by enabling the debug mode in the hub template.
31+
**Screenshots**
32+
If applicable, add screenshots to help explain your problem (please **DO NOT include sensitive information**).
33+
34+
**Additional context**
35+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/documentation-improvements.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Documentation improvements
3+
about: Suggest a documentation update
4+
title: ''
5+
labels: documentation
6+
assignees: ''
7+
8+
---
9+
10+
**What were you initially searching for in the docs?**
11+
<!--- Please help us understand how you looked for information that was either not available or unclear -->
12+
13+
**Is this related to an existing part of the documentation? Please share a link**
14+
15+
**Describe how we could make it clearer**
16+
17+
**If you have a proposed update, please share it here**

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this solution
4+
title: ''
5+
labels: feature-request, enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
12+
13+
**Describe the feature you'd like**
14+
<!--- A clear and concise description of what you want to happen -->
15+
16+
**Additional context**
17+
<!--- Add any other context or screenshots about the feature request here -->

‎.gitignore‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
**/dist
2-
**/open-source
3-
**/.zip
4-
.cache/
5-
.pytest_cache/
6-
__init__.pyc
1+
deployment/global-s3-assets/
2+
deployment/open-source/
3+
deployment/regional-s3-assets/
4+
deployment/test/
5+
76
__pycache__/
8-
**.pyc
9-
TESTING.md
7+
.pytest_cache/
8+
.cache/
109
.eggs/
11-
**.egg-info
10+
*.egg-info/
11+
.coverage
12+
.venv/
13+
.DS_Store

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
8+
## [2.5] - 2022-08
9+
### Added
10+
- Added support for AWS Organizations
11+
- Added VPC Endpoints for S3 and DynamoDB
12+
613
## [2.4.1] - 2021-10
7-
### Fixed
814
- Fixed the bug to get all the workspaces in a directory
915

1016
## [2.4] - 2021-09

‎NOTICE.txt‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
WorkSpaces Cost Optimizer
1+
Cost Optimizer for Amazon Workspaces
22

3-
Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4-
Licensed under the Apache License Version 2.0 (the "License"). You may not use this file except
5-
in compliance with the License. A copy of the License is located at http://www.apache.org/licenses/
6-
or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
7-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the
8-
specific language governing permissions and limitations under the License.
3+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
94

105
**********************
116
THIRD PARTY COMPONENTS
127
**********************
138
This software includes third party software subject to the following copyrights:
149

1510
AWS SDK under the Apache License Version 2.0
16-
Requests under the Apache License Version 2.0
17-
11+
requests under the Apache License Version 2.0
12+
wheel under the MIT license
13+
setuptools under the MIT license
14+
pip under the MIT license

‎README.md‎

Lines changed: 71 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,26 @@ Clone the repository
4242
git clone git@github.com:awslabs/workspaces-cost-optimizer.git
4343
```
4444

45-
Set the destination bucket name- this bucket should be in the region you're deploying the solution to.
45+
Create a distribution S3 bucket with the format 'MY-BUCKET-<aws_region>'. The solution's CloudFormation template will expect the
46+
source code to be located in this bucket. <aws_region> is where you are testing the customized solution.
47+
48+
Note: When you create a bucket, a randomized value unique to your environment is recommended for the bucket name.
49+
As a best practice, enable the server side encryption and also block the public access to the bucket.
4650

4751
```
48-
export TEMPLATE_BUCKET_NAME=<YOUR_TEMPLATE_BUCKET_NAME>
49-
export DIST_BUCKET_NAME=<YOUR_DIST_BUCKET_NAME>
52+
export TEMPLATE_OUTPUT_BUCKET=<YOUR_TEMPLATE_BUCKET_NAME>
53+
export DIST_OUTPUT_BUCKET=<YOUR_DIST_BUCKET_NAME>
5054
export SOLUTION_NAME="workspaces-cost-optimizer"
5155
export VERSION=<VERSION>
5256
## NOTE THAT the region is appended to the DIST_BUCKET_NAME (DIST_BUCKET_NAME-REGION) when deployed, so creating a bucket with only Bucket_Name will not work.
5357
```
5458

59+
change the working directory to the deployment folder
60+
61+
```
62+
cd deployment
63+
```
64+
5565
Run the build script.
5666

5767
```
@@ -82,60 +92,88 @@ Deploy the Workspaces Cost Optimizer solution to your account by launching a new
8292

8393
<pre>
8494
|-deployment/
85-
|-build-open-source-dist.sh
8695
|-build-s3-dist.sh
8796
|-run-unit-tests.sh
8897
|-workspaces-cost-optimizer.template
98+
|-workspaces-cost-optimizer-spoke.template
8999
|-source/
90-
|-ecs/
91-
|-utils/
92-
|-decimal_encoder.py
93-
|-solutions_metrics.py
94-
|-directory_reader.py
95-
|-metrics_helper.py
96-
|-workspaces_helper.py
97-
|-app.py
98-
|-tests/
99-
|-test_metrics_helper.py
100-
|-test_workspaces_helper.py
101-
|-docker
100+
|-account_registration_provider/
101+
|__tests__/
102+
|__init__.py
103+
|-conftest.py
104+
|-test_account_registration_provider.py
105+
|__init__.py
106+
|-account_registration_provider.py
107+
|-docker/
102108
|-docker-build.sh
103109
|-docker-clean.sh
104110
|-docker-run.sh
105-
|-lambda/
106-
|-create-task.py
107-
|-uuid-helper.py
111+
|-lib/
112+
|__tests__/
113+
|__init__.py
114+
|-conftest.py
115+
|-test_cfnresponse.py
116+
|-cfnresponse.py
117+
|-register_spoke_lambda/
118+
|__tests__/
119+
|__init__.py
120+
|-conftest.py
121+
|-test_dynamodb.py
122+
|-test_register_spoke_accounts.py
123+
|-test_request_event.py
124+
|__init__.py
125+
|-dynamo_table.py
126+
|-register_spoke_accounts.py
127+
|-request_event.py
128+
|-uuid_helper/
129+
|__tests__/
130+
|__init__.py
131+
|-conftest.py
132+
|-test_uuid_helper.py
133+
|__init__.py
134+
|-uuid_helper.py
135+
|-workspaces_app/
136+
|-workspaces_app/
137+
|__tests__/
138+
|__init__.py
139+
|-conftest.py
140+
|-test_account_registry.py
141+
|-test_directory_reader.py
142+
|-test_metrics_helper.py
143+
|-test_workspaces_helper.py
144+
|-utils/
145+
|__tests__/
146+
|__init__.py
147+
|-conftest.py
148+
|-test_s3_utils.py
149+
|-test_timer.py
150+
|__init__.py
151+
|-decimal_encoder.py
152+
|-s3_utils.py
153+
|-solutions_metrics.py
154+
|-timer.py
155+
|-directory_reader.py
156+
|-metrics_helper.py
157+
|-workspaces_helper.py
158+
|-main.py
108159
|-requirements.txt
109160
|-testing_requirements.txt
110161
|-architecture_diagram.png
111162
|-Dockerfile
112163
|-.gitignore
113-
|-.viperlightignore
114-
|-.viperlightrc
115164
|-buildspec.yml
116165
|-CHANGELOG.md
117166
|-CODE_OF_CONDUCT.md
118167
|-CONTRIBUTING.md
119168
|-LICENSE.txt
120169
|-NOTICE.txt
121170
|-README.md
171+
|-sonar-project.properties
122172
</pre>
123173

124174

125175
################################################
126176

127-
-------------
128-
## Optimization Engine
129-
130-
- source/engine/wco.py - depends on source/engine/lib/directory_reader.py
131-
- source/engine/lib/directory_reader.py depends on workspaces_helper
132-
- source/engine/lib/workspaces_helper.py depends on metrics_helper
133-
- source/engine/lib/metrics_helper.py
134-
135-
## Helpers
136-
137-
- source/helpers/create-task.py
138-
139177
<a name="collection-of-operational-metrics"></a>
140178
# Collection of operational metrics
141179

0 commit comments

Comments
 (0)