Skip to content

Commit 52c03be

Browse files
authored
Merge pull request #453 from aws-solutions/v2.1.0
update to v2.1.0
2 parents 87f6dce + 39f5c1d commit 52c03be

File tree

529 files changed

+92302
-102925
lines changed

Some content is hidden

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

529 files changed

+92302
-102925
lines changed

.gitignore

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@
1313

1414
# dependencies
1515
**/node_modules
16+
17+
# testing
1618
**/coverage
19+
**/cypress-coverage
20+
**/vitest-coverage
21+
source/frontend/reports
22+
source/frontend/cypress/downloads
23+
source/frontend/cypress/screenshots
24+
source/frontend/cypress/snapshots/diff
25+
source/frontend/cypress/videos
1726

1827
# e2e
1928
**/e2e/*.js
@@ -26,6 +35,10 @@
2635
**/.vscode/settings.json
2736
**/setenv.sh
2837

38+
#IntelliJ
39+
.idea
40+
*.iml
41+
2942
# System Files
3043
**/.DS_Store
3144
*.DS_Store
@@ -42,11 +55,12 @@
4255
source/backend/functions/lambda-layers/aws_sdk/python
4356
source/backend/functions/lambda-layers/cr_helper/python
4457
source/backend/functions/lambda-layers/decorators/python/*
45-
source/backend/functions/lambda-layers/boto_utils/python/*
58+
source/backend/functions/drawio/python/*
59+
source/backend/functions/drawio/.pytest_cache
4660
source/backend/functions/cleanup-bucket/package
4761
source/backend/functions/cost-parser/src/setting-up-athena-integration.md
4862

49-
local-deploy-perspective.sh
63+
deployment/local_install.sh
5064

5165
# docs build
5266
docs/build

.viperlightignore

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,11 @@
11
^dist/
22
^node_modules/
3-
source/backend/discovery/sandbox/index.js:12
4-
source/backend/discovery/sandbox/index.js:11
5-
6-
source/backend/functions/graph-api/src/query.js:14
7-
source/backend/functions/graph-api/src/query.js:15
8-
source/backend/functions/graph-api/test/fixtures/hierarchy/gremlin-lambda-expected.json:342
9-
source/backend/functions/graph-api/test/fixtures/hierarchy/gremlin-lambda-input.json
103

114
source/backend/functions/cost-parser/test/index.js
125
source/backend/functions/settings/test
136

14-
source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:145
15-
source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:151
16-
17-
source/frontend/src/tests/Utils/Resources/CostCalculator.test.js:22
18-
19-
source/frontend/src/tests/API/Processors/data/handle-selected-node-initial.json:239
20-
source/frontend/src/tests/API/Processors/data/handle-selected-node-response.json:244
21-
source/frontend/src/tests/API/Processors/data/selected-node.json:57
22-
source/frontend/src/tests/Utils/Resources/CostCalculator.test.js:22
23-
source/frontend/src/tests/Utils/Resources/data/db-instance-node.js:10
24-
source/frontend/src/tests/components/Drawer/ResourceSelector/data/resources.json:10
25-
source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:18
26-
source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:24
27-
source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:54
28-
29-
source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:28
30-
source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:30
31-
source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:32
32-
source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:34
33-
34-
deployment/perspective-setup.yaml
357
CODE_OF_CONDUCT.md:4
368
CONTRIBUTING.md:50
37-
aws-perspective-params.json:16
38-
taskcat.yml:3
399

4010
[python-pipoutdated]
4111
aws-sam-cli=1.52.0

.viperlightrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"failOn": "medium",
2+
"failOn": "high",
33
"all": true
44
}

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,31 @@ All notable changes to this project are documented in this file.
55
Based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [2.1.0] - 2023-09-21
9+
10+
### Added
11+
12+
- AppRegistry integration to monitor application costs and usage.
13+
- Integration with Organizations. Customers can install the solution in a delegated admin account (recommended)
14+
or the management account and the solution will use an organization wide config aggregator to discover resources across
15+
their organization. [1](https://github.com/aws-solutions/workload-discovery-on-aws/issues/1)
16+
- Pipeline for local development of the solution.
17+
- Support for deploying this solution in an existing VPC. [169](https://github.com/aws-solutions/workload-discovery-on-aws/issues/169)
18+
- Support for deploying this solution with Neptune Serverless. [314](https://github.com/aws-solutions/workload-discovery-on-aws/issues/314)
19+
- UI now indicates if global resources template has been deployed in target accounts. [367](https://github.com/aws-solutions/workload-discovery-on-aws/issues/367)
20+
- Support for more resource types now totalling over 250.
21+
22+
### Changed
23+
- Migrated from the deprecated awsui frontend framework to [Cloudscape](https://cloudscape.design).
24+
25+
### Fixed
26+
- Export of diagrams to JSON [426](https://github.com/aws-solutions/workload-discovery-on-aws/issues/426)
27+
- Export of diagrams to draw.io [329](https://github.com/aws-solutions/workload-discovery-on-aws/issues/329)
28+
- Outdated OpenSSL package being used [424](https://github.com/aws-solutions/workload-discovery-on-aws/issues/424)
29+
- Response payload size exceeding maximum allowed payload size [351](https://github.com/aws-solutions/workload-discovery-on-aws/issues/351)
30+
- Publishing name instead of ARN of resources [330](https://github.com/aws-solutions/workload-discovery-on-aws/issues/330)
31+
- CSV report of the Resources does not include ARN [407](https://github.com/aws-solutions/workload-discovery-on-aws/issues/407)
32+
833
## [2.0.3] - 2023-04-18
934

1035
### Fixed

NOTICE.txt

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,38 @@ aws-amplify
2020
typescript
2121
gremlin
2222
crhelper
23+
aws-xray-sdk-core
24+
constructs
25+
amplify-graphql-docs-generator
26+
importlib-resources
27+
py-serializable
28+
@aws-amplify/ui-react
29+
@aws-sdk/client-api-gateway
30+
@aws-sdk/client-cognito-identity-provider
31+
@aws-sdk/client-config-service
32+
@aws-sdk/client-dynamodb
33+
@aws-sdk/client-dynamodb-streams
34+
@aws-sdk/client-ec2
35+
@aws-sdk/client-ecs
36+
@aws-sdk/client-eks
37+
@aws-sdk/client-elastic-load-balancing
38+
@aws-sdk/client-elastic-load-balancing-v2
39+
@aws-sdk/client-iam
40+
@aws-sdk/client-lambda
41+
@aws-sdk/client-opensearch
42+
@aws-sdk/client-organizations
43+
@aws-sdk/client-s3
44+
@aws-sdk/client-sns
45+
@aws-sdk/client-ssm
46+
@aws-sdk/client-sts
47+
@aws-sdk/credential-providers
48+
@aws-sdk/lib-dynamodb
49+
@aws-sdk/util-arn-parser
50+
@cloudscape-design/collection-hooks
51+
@cloudscape-design/components
52+
@cloudscape-design/design-tokens
53+
@cloudscape-design/global-styles
54+
@opensearch-project/opensearch
2355

2456
**********************
2557
MIT License
@@ -29,6 +61,7 @@ cfn-nag
2961
uuid
3062
material-ui
3163
browserslist
64+
crypto-js
3265
cytoscape
3366
cytoscape-cola
3467
cytoscape-context-menus
@@ -72,6 +105,64 @@ moment-timezone
72105
unzipper
73106
mime-types
74107
node-fetch
108+
async-retry
109+
p-throttle
110+
undici
111+
acorn
112+
msw
113+
aws-opensearch-connector
114+
athena-express
115+
most
116+
@tuplo/dynoexpr
117+
aws-sdk-client-mock
118+
dynamo-db-local
119+
lodash.curry
120+
tsup
121+
ts-jest
122+
ts-node
123+
source-map-support
124+
js-file-download
125+
lodash.forown
126+
lodash.isobject
127+
sass
128+
ua-parser-js
129+
valid-filename
130+
vitest
131+
vitest-canvas-mock
132+
vite
133+
vite-plugin-istanbul
134+
vite-plugin-eslint
135+
vite-plugin-svgr
136+
prettier
137+
jsdom
138+
history
139+
eslint
140+
eslint-plugin-header
141+
eslint-plugin-cypress
142+
eslint-plugin-react
143+
eslint-plugin-react-hooks
144+
esbuild
145+
cypress
146+
emotion
147+
neptune-lambda-client
148+
pino
149+
pino-lambda
150+
react-router-dom
151+
react-query
152+
react-papaparse
153+
react-error-boundary
154+
cytoscape-fcose
155+
attrs
156+
jsonschema
157+
pkgutil_resolve_name
158+
pyrsistent
159+
@supercharge/promise-pool
160+
@most/core
161+
162+
**********************
163+
BSD-2-Clause
164+
**********************
165+
currency-symbol-map
75166

76167
**********************
77168
BSD-3-Clause
@@ -88,6 +179,20 @@ randomcolor
88179
ISC
89180
**********************
90181
nyc
182+
iterare
183+
cfn-response-promise
184+
babel-plugin-transform-imports
185+
186+
**********************
187+
Unlicense
188+
**********************
189+
react-use
190+
filelock
191+
192+
**********************
193+
PSFL
194+
**********************
195+
defusedxml
91196

92197
***********************************************
93198
Other Licenses found in Dependency Tree include

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workload Discovery on AWS (v2.0.3)
1+
# Workload Discovery on AWS (v2.1.0)
22

33
Workload Discovery on AWS is a tool that quickly visualizes AWS Cloud workloads as architecture diagrams.
44
You can use the solution to build, customize, and share detailed workload visualizations based on live data from AWS.
@@ -157,7 +157,6 @@ Parameters required by the template:
157157
* **AdminUserEmailAddress** - The email address to receive login credentials at.
158158
* **AlreadyHaveConfigSetup** - Yes/No depending on whether AWS Config has is configured in the deployment Region.
159159
* **CreateOpensearchServiceRole** - Yes/No depending on whether you already have this service-role created. You can check in the IAM console to see if it is provisioned.
160-
* **OptOutOfSendingAnonymousUsageMetrics** - Yes/No depending on whether you are happy to send anonymous usage metrics back to AWS.
161160
* **CreateNeptuneReplica** - Yes/No depending on whether you want a read-replica created for Amazon Neptune. Note, that this will increase the cost of running the solution.
162161
* **NeptuneInstanceClass** - Select from a range of instance types that will be provisioned for the Amazon Neptune database. Note, the selection could increase the cost associated with running the solution.
163162
* **OpensearchInstanceType** - Select the instance type that will be provisioned for the Amazon ElasticSearch Domain.
@@ -166,9 +165,13 @@ Parameters required by the template:
166165

167166
**Note** - You will need to deploy in the same account and region as the S3 bucket that the deployment artefacts are uploaded to.
168167

169-
## Collecting Anonymous Operational Metrics
168+
## License
170169

171-
This solution collects anonymous operational metrics to help AWS improve the quality of features of the solution.
170+
See license [here](./LICENSE.txt).
171+
172+
## Anonymized data collection
173+
174+
This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution.
172175
For more information, including how to disable this capability, please see the [Implementation Guide](https://docs.aws.amazon.com/solutions/latest/workload-discovery-on-aws/collection-of-operational-metrics.html).
173176

174177
## Acknowledgements

buildspec.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

deployment/build-s3-dist.sh

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,16 @@ echo "--------------------------------------------------------------------------
6969

7070
cp "${build_dist_dir}/main.template" "${template_dist_dir}/workload-discovery-on-aws.template"
7171

72+
echo "------------------------------------------------------------------------------"
73+
echo "[Rebuild] Upload GraphQL Schema"
74+
echo "------------------------------------------------------------------------------"
75+
cp "${source_dir}/backend/graphql/schema/perspective-api.graphql" "${build_dist_dir}/perspective-api.graphql"
76+
77+
echo "------------------------------------------------------------------------------"
78+
echo "[Rebuild] Upload AppSync JS resolvers"
79+
echo "------------------------------------------------------------------------------"
80+
cp "${source_dir}/backend/graphql/resolvers/default.js" "${build_dist_dir}/default-resolver.js"
81+
7282
echo "------------------------------------------------------------------------------"
7383
echo "[Rebuild] Layers"
7484
echo "------------------------------------------------------------------------------"
@@ -120,7 +130,6 @@ echo "--------------------------------------------------------------------------
120130
echo "[Rebuild] Account Import Template API"
121131
echo "------------------------------------------------------------------------------"
122132
cd "${source_dir}/backend/functions/account-import-templates-api"
123-
124133
auditDeps
125134
npm run build
126135
cp ./dist/account-import-templates-api.zip "${build_dist_dir}/account-import-templates-api.zip"
@@ -175,9 +184,12 @@ npm run build
175184
cp ./dist/cur-setup.zip "${build_dist_dir}/cur-setup.zip"
176185

177186
echo "------------------------------------------------------------------------------"
178-
echo "[Rebuild] Upload GraphQL Schema"
187+
echo "[Rebuild] Metrics"
179188
echo "------------------------------------------------------------------------------"
180-
cp "${source_dir}/backend/graphql/schema/perspective-api.graphql" "${build_dist_dir}/perspective-api.graphql"
189+
cd "${source_dir}/backend/functions/metrics"
190+
auditDeps
191+
npm run build
192+
cp ./dist/metrics.zip "${build_dist_dir}/metrics.zip"
181193

182194
echo "------------------------------------------------------------------------------"
183195
echo "[Rebuild] Discovery"
@@ -194,4 +206,4 @@ cd "${source_dir}/frontend"
194206
auditDeps
195207
#npm run test
196208
npm run build
197-
cp ./build/ui.zip "${build_dist_dir}/ui.zip"
209+
cp ./dist/ui.zip "${build_dist_dir}/ui.zip"

0 commit comments

Comments
 (0)