Merge pull request #453 from aws-solutions/v2.1.0

update to v2.1.0

.gitignore

@@ -13,7 +13,16 @@
 
 # dependencies
 **/node_modules
+
+# testing
 **/coverage
+**/cypress-coverage
+**/vitest-coverage
+source/frontend/reports
+source/frontend/cypress/downloads
+source/frontend/cypress/screenshots
+source/frontend/cypress/snapshots/diff
+source/frontend/cypress/videos
 
 # e2e
 **/e2e/*.js
@@ -26,6 +35,10 @@
 **/.vscode/settings.json
 **/setenv.sh
 
+#IntelliJ
+.idea
+*.iml
+
 # System Files
 **/.DS_Store
 *.DS_Store
@@ -42,11 +55,12 @@
 source/backend/functions/lambda-layers/aws_sdk/python
 source/backend/functions/lambda-layers/cr_helper/python
 source/backend/functions/lambda-layers/decorators/python/*
-source/backend/functions/lambda-layers/boto_utils/python/*
+source/backend/functions/drawio/python/*
+source/backend/functions/drawio/.pytest_cache
 source/backend/functions/cleanup-bucket/package
 source/backend/functions/cost-parser/src/setting-up-athena-integration.md
 
-local-deploy-perspective.sh
+deployment/local_install.sh
 
 # docs build
 docs/build

.viperlightignore

@@ -1,41 +1,11 @@
 ^dist/
 ^node_modules/
-source/backend/discovery/sandbox/index.js:12
-source/backend/discovery/sandbox/index.js:11
-
-source/backend/functions/graph-api/src/query.js:14
-source/backend/functions/graph-api/src/query.js:15
-source/backend/functions/graph-api/test/fixtures/hierarchy/gremlin-lambda-expected.json:342
-source/backend/functions/graph-api/test/fixtures/hierarchy/gremlin-lambda-input.json
 
 source/backend/functions/cost-parser/test/index.js
 source/backend/functions/settings/test
 
-source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:145
-source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:151
-
-source/frontend/src/tests/Utils/Resources/CostCalculator.test.js:22
-
-source/frontend/src/tests/API/Processors/data/handle-selected-node-initial.json:239
-source/frontend/src/tests/API/Processors/data/handle-selected-node-response.json:244
-source/frontend/src/tests/API/Processors/data/selected-node.json:57
-source/frontend/src/tests/Utils/Resources/CostCalculator.test.js:22
-source/frontend/src/tests/Utils/Resources/data/db-instance-node.js:10
-source/frontend/src/tests/components/Drawer/ResourceSelector/data/resources.json:10
-source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:18
-source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:24
-source/frontend/src/components/Drawer/Feedback/TreeMenuFeedbackLinksMenu.js:54
-
-source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:28
-source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:30
-source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:32
-source/frontend/src/components/Drawer/Settings/AccountManagement/Account/ExampleCSV.js:34
-
-deployment/perspective-setup.yaml
 CODE_OF_CONDUCT.md:4
 CONTRIBUTING.md:50
-aws-perspective-params.json:16
-taskcat.yml:3
 
 [python-pipoutdated]
 aws-sam-cli=1.52.0

.viperlightrc

@@ -1,4 +1,4 @@
 {
-  "failOn": "medium",
+  "failOn": "high",
   "all": true
 }

CHANGELOG.md

@@ -5,6 +5,31 @@ All notable changes to this project are documented in this file.
 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).
 
+## [2.1.0] - 2023-09-21
+
+### Added
+
+- AppRegistry integration to monitor application costs and usage.
+- Integration with Organizations. Customers can install the solution in a delegated admin account (recommended)
+or the management account and the solution will use an organization wide config aggregator to discover resources across 
+their organization. [1](https://github.com/aws-solutions/workload-discovery-on-aws/issues/1)
+- Pipeline for local development of the solution.
+- Support for deploying this solution in an existing VPC. [169](https://github.com/aws-solutions/workload-discovery-on-aws/issues/169)
+- Support for deploying this solution with Neptune Serverless. [314](https://github.com/aws-solutions/workload-discovery-on-aws/issues/314)
+- 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)
+- Support for more resource types now totalling over 250.
+
+### Changed
+- Migrated from the deprecated awsui frontend framework to [Cloudscape](https://cloudscape.design). 
+
+### Fixed
+- Export of diagrams to JSON [426](https://github.com/aws-solutions/workload-discovery-on-aws/issues/426)
+- Export of diagrams to draw.io [329](https://github.com/aws-solutions/workload-discovery-on-aws/issues/329)
+- Outdated OpenSSL package being used [424](https://github.com/aws-solutions/workload-discovery-on-aws/issues/424)
+- Response payload size exceeding maximum allowed payload size [351](https://github.com/aws-solutions/workload-discovery-on-aws/issues/351)
+- Publishing name instead of ARN of resources [330](https://github.com/aws-solutions/workload-discovery-on-aws/issues/330)
+- CSV report of the Resources does not include ARN [407](https://github.com/aws-solutions/workload-discovery-on-aws/issues/407)
+
 ## [2.0.3] - 2023-04-18
 
 ### Fixed

NOTICE.txt

@@ -20,6 +20,38 @@ aws-amplify
 typescript
 gremlin
 crhelper
+aws-xray-sdk-core
+constructs
+amplify-graphql-docs-generator
+importlib-resources
+py-serializable
+@aws-amplify/ui-react
+@aws-sdk/client-api-gateway
+@aws-sdk/client-cognito-identity-provider
+@aws-sdk/client-config-service
+@aws-sdk/client-dynamodb
+@aws-sdk/client-dynamodb-streams
+@aws-sdk/client-ec2
+@aws-sdk/client-ecs
+@aws-sdk/client-eks
+@aws-sdk/client-elastic-load-balancing
+@aws-sdk/client-elastic-load-balancing-v2
+@aws-sdk/client-iam
+@aws-sdk/client-lambda
+@aws-sdk/client-opensearch
+@aws-sdk/client-organizations
+@aws-sdk/client-s3
+@aws-sdk/client-sns
+@aws-sdk/client-ssm
+@aws-sdk/client-sts
+@aws-sdk/credential-providers
+@aws-sdk/lib-dynamodb
+@aws-sdk/util-arn-parser
+@cloudscape-design/collection-hooks
+@cloudscape-design/components
+@cloudscape-design/design-tokens
+@cloudscape-design/global-styles
+@opensearch-project/opensearch
 
 **********************
 MIT License
@@ -29,6 +61,7 @@ cfn-nag
 uuid 
 material-ui 
 browserslist
+crypto-js
 cytoscape
 cytoscape-cola
 cytoscape-context-menus
@@ -72,6 +105,64 @@ moment-timezone
 unzipper
 mime-types
 node-fetch
+async-retry
+p-throttle
+undici
+acorn
+msw
+aws-opensearch-connector
+athena-express
+most
+@tuplo/dynoexpr
+aws-sdk-client-mock
+dynamo-db-local
+lodash.curry
+tsup
+ts-jest
+ts-node
+source-map-support
+js-file-download
+lodash.forown
+lodash.isobject
+sass
+ua-parser-js
+valid-filename
+vitest
+vitest-canvas-mock
+vite
+vite-plugin-istanbul
+vite-plugin-eslint
+vite-plugin-svgr
+prettier
+jsdom
+history
+eslint
+eslint-plugin-header
+eslint-plugin-cypress
+eslint-plugin-react
+eslint-plugin-react-hooks
+esbuild
+cypress
+emotion
+neptune-lambda-client
+pino
+pino-lambda
+react-router-dom
+react-query
+react-papaparse
+react-error-boundary
+cytoscape-fcose
+attrs
+jsonschema
+pkgutil_resolve_name
+pyrsistent
+@supercharge/promise-pool
+@most/core
+
+**********************
+BSD-2-Clause
+**********************
+currency-symbol-map
 
 **********************
 BSD-3-Clause
@@ -88,6 +179,20 @@ randomcolor
 ISC
 **********************
 nyc
+iterare
+cfn-response-promise
+babel-plugin-transform-imports
+
+**********************
+Unlicense
+**********************
+react-use
+filelock
+
+**********************
+PSFL
+**********************
+defusedxml
 
 ***********************************************
 Other Licenses found in Dependency Tree include

README.md

@@ -1,4 +1,4 @@
-# Workload Discovery on AWS (v2.0.3)
+# Workload Discovery on AWS (v2.1.0)
 
 Workload Discovery on AWS is a tool that quickly visualizes AWS Cloud workloads as architecture diagrams. 
 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:
 * **AdminUserEmailAddress** - The email address to receive login credentials at.
 * **AlreadyHaveConfigSetup** - Yes/No depending on whether AWS Config has is configured in the deployment Region.
 * **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.
-* **OptOutOfSendingAnonymousUsageMetrics** - Yes/No depending on whether you are happy to send anonymous usage metrics back to AWS.
 * **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.
 * **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.
 * **OpensearchInstanceType** - Select the instance type that will be provisioned for the Amazon ElasticSearch Domain.
@@ -166,9 +165,13 @@ Parameters required by the template:
 
 **Note** - You will need to deploy in the same account and region as the S3 bucket that the deployment artefacts are uploaded to.
 
-## Collecting Anonymous Operational Metrics
+## License
 
-This solution collects anonymous operational metrics to help AWS improve the quality of features of the solution. 
+See license [here](./LICENSE.txt).
+
+## Anonymized data collection
+
+This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. 
 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).
 
 ## Acknowledgements

deployment/build-s3-dist.sh

@@ -69,6 +69,16 @@ echo "--------------------------------------------------------------------------
 
 cp "${build_dist_dir}/main.template" "${template_dist_dir}/workload-discovery-on-aws.template"
 
+echo "------------------------------------------------------------------------------"
+echo "[Rebuild] Upload GraphQL Schema"
+echo "------------------------------------------------------------------------------"
+cp "${source_dir}/backend/graphql/schema/perspective-api.graphql" "${build_dist_dir}/perspective-api.graphql"
+
+echo "------------------------------------------------------------------------------"
+echo "[Rebuild] Upload AppSync JS resolvers"
+echo "------------------------------------------------------------------------------"
+cp "${source_dir}/backend/graphql/resolvers/default.js" "${build_dist_dir}/default-resolver.js"
+
 echo "------------------------------------------------------------------------------"
 echo "[Rebuild] Layers"
 echo "------------------------------------------------------------------------------"
@@ -120,7 +130,6 @@ echo "--------------------------------------------------------------------------
 echo "[Rebuild] Account Import Template API"
 echo "------------------------------------------------------------------------------"
 cd "${source_dir}/backend/functions/account-import-templates-api"
-
 auditDeps
 npm run build
 cp ./dist/account-import-templates-api.zip "${build_dist_dir}/account-import-templates-api.zip"
@@ -175,9 +184,12 @@ npm run build
 cp ./dist/cur-setup.zip "${build_dist_dir}/cur-setup.zip"
 
 echo "------------------------------------------------------------------------------"
-echo "[Rebuild] Upload GraphQL Schema"
+echo "[Rebuild] Metrics"
 echo "------------------------------------------------------------------------------"
-cp "${source_dir}/backend/graphql/schema/perspective-api.graphql" "${build_dist_dir}/perspective-api.graphql"
+cd "${source_dir}/backend/functions/metrics"
+auditDeps
+npm run build
+cp ./dist/metrics.zip "${build_dist_dir}/metrics.zip"
 
 echo "------------------------------------------------------------------------------"
 echo "[Rebuild] Discovery"
@@ -194,4 +206,4 @@ cd "${source_dir}/frontend"
 auditDeps
 #npm run test
 npm run build
-cp ./build/ui.zip "${build_dist_dir}/ui.zip"
+cp ./dist/ui.zip "${build_dist_dir}/ui.zip"