Merge pull request #533 from aws-solutions/release/v2.1.10

update to v2.1.10
aws-solutions · Jul 16, 2024 · 417ec26 · 417ec26
2 parents c042fed + 06e2f2d
commit 417ec26
Show file tree

Hide file tree

Showing 30 changed files with 93 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ 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.10] - 2024-7-16
+
+### Fixed
+
+- Security [vulnerability](https://github.com/advisories/GHSA-3q56-9cc2-46j4) in `fast-loops`.
+- Security [vulnerability](https://github.com/advisories/GHSA-jfmj-5v4g-7637) in `zipp`.
+- Security [vulnerability](https://github.com/advisories/GHSA-3g92-w8c5-73pq) in `undici`.
+
+### Changed
+
+- Restrict egress for Neptune lambda security group to VPC IP address range. [531](https://github.com/aws-solutions/workload-discovery-on-aws/discussions/531)
+
 ## [2.1.9] - 2024-6-24
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Workload Discovery on AWS (v2.1.9)
+# Workload Discovery on AWS (v2.1.10)
 
 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. 
@@ -46,7 +46,7 @@ To submit an idea for a feature you would like to see implemented, please [creat
 
 ## Architecture
 
-![Architecture diagram showing full set of deployment resources](docs/modules/ROOT/images/arch-diagram.png "Full architecture diagram")
+![Architecture diagram showing full set of deployment resources](arch-diagram.png "Full architecture diagram")
 
 Workload Discovery is deployed to your account using an AWS CloudFormation template consisting of six components. 
 The following is a high level overview of the components. For additional details about each component, refer to 

diff --git a/arch-diagram.png b/arch-diagram.png
diff --git a/deployment/build-open-source-dist.sh b/deployment/build-open-source-dist.sh
@@ -44,6 +44,7 @@ gitzip -d $dist_dir/$1.zip \
       -x "buildspec.yml" \
       -x ".viperlight*" \
       -x "source/infrastructure" \
+      -x "docs" \
       -x "sonar-project.properties" \
       -x "solution-manifest.yaml" \
       -x ".nightswatch/*" \

diff --git a/source/backend/discovery/package-lock.json b/source/backend/discovery/package-lock.json
diff --git a/source/backend/discovery/package.json b/source/backend/discovery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-discovery",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "This contains the code that forms the discovery process for AWS Perspective.",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/discovery/src/lib/errors.js b/source/backend/discovery/src/lib/errors.js
@@ -0,0 +1,23 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+class AggregatorNotFoundError extends Error {
+    constructor(aggregatorName) {
+        super(`Aggregator ${aggregatorName} was not found`);
+        this.name = 'AggregatorValidationError';
+        this.aggregatorName = aggregatorName;
+    }
+}
+
+class OrgAggregatorValidationError extends Error {
+    constructor(aggregator) {
+        super('Config aggregator is not an organization wide aggregator');
+        this.name = 'AggregatorValidationError';
+        this.aggregator = aggregator;
+    }
+}
+
+module.exports = {
+    AggregatorNotFoundError,
+    OrgAggregatorValidationError
+}
diff --git a/source/backend/functions/account-import-templates-api/package-lock.json b/source/backend/functions/account-import-templates-api/package-lock.json
diff --git a/source/backend/functions/account-import-templates-api/package.json b/source/backend/functions/account-import-templates-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-import-templates",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "Lambda function that serves cfn templates for account and region importing",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/functions/cost-parser/package-lock.json b/source/backend/functions/cost-parser/package-lock.json
diff --git a/source/backend/functions/cost-parser/package.json b/source/backend/functions/cost-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-cost",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/functions/cur-notification/package-lock.json b/source/backend/functions/cur-notification/package-lock.json
diff --git a/source/backend/functions/cur-notification/package.json b/source/backend/functions/cur-notification/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-cur-notification",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/functions/cur-setup/package-lock.json b/source/backend/functions/cur-setup/package-lock.json
diff --git a/source/backend/functions/cur-setup/package.json b/source/backend/functions/cur-setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-cur-setup",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/functions/graph-api/package-lock.json b/source/backend/functions/graph-api/package-lock.json
diff --git a/source/backend/functions/graph-api/package.json b/source/backend/functions/graph-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-graph-api",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "The lambda function that queries the Neptune database",
   "main": "src/index.js",
   "scripts": {

diff --git a/source/backend/functions/lambda-layers/decorators/requirements.txt b/source/backend/functions/lambda-layers/decorators/requirements.txt
@@ -1,4 +1,4 @@
 jsonschema==4.17.0
 pkgutil_resolve_name==1.3.10
 importlib_resources==6.0.0
-zipp==3.15.0
+zipp==3.19.1
diff --git a/source/backend/functions/metrics/package-lock.json b/source/backend/functions/metrics/package-lock.json
diff --git a/source/backend/functions/metrics/package.json b/source/backend/functions/metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metrics",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/source/backend/functions/opensearch-setup/package-lock.json b/source/backend/functions/opensearch-setup/package-lock.json
diff --git a/source/backend/functions/opensearch-setup/package.json b/source/backend/functions/opensearch-setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opensearch-setup",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "Custom resource that creates index in OpenSearch.",
   "main": "src/index.js",
   "scripts": {

diff --git a/source/backend/functions/search-api/package-lock.json b/source/backend/functions/search-api/package-lock.json
diff --git a/source/backend/functions/search-api/package.json b/source/backend/functions/search-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-search-api",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "The lambda function that queries the OpenSearch database",
   "main": "src/index.js",
   "scripts": {

diff --git a/source/backend/functions/settings/package-lock.json b/source/backend/functions/settings/package-lock.json
diff --git a/source/backend/functions/settings/package.json b/source/backend/functions/settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wd-settings",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "Lambda function that stores WD configuration data in DynamoDB",
   "main": "index.js",
   "scripts": {

diff --git a/source/cfn/templates/gremlin-resolvers.template b/source/cfn/templates/gremlin-resolvers.template
@@ -60,12 +60,12 @@ Resources:
     Properties:
       GroupDescription: Security group for Gremlin AppSync lambda
       VpcId: !Ref VpcId
-#      SecurityGroupEgress:
-#        - Description: Explicit egress group locking down outbound access for HTTPS
-#          CidrIp: !Ref VPCCidrBlock
-#          IpProtocol: tcp
-#          ToPort: !Ref NeptuneClusterPort
-#          FromPort: !Ref NeptuneClusterPort
+      SecurityGroupEgress:
+        - Description: Restrict egress to VPC only
+          CidrIp: !Ref VPCCidrBlock
+          IpProtocol: tcp
+          ToPort: !Ref NeptuneClusterPort
+          FromPort: !Ref NeptuneClusterPort
 
   NeptuneDbSgIngressRule:
     Type: AWS::EC2::SecurityGroupIngress

diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json
diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "workload-discovery-ui",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "private": true,
   "description": "UI code for the Workload Discovery solution",
   "author": {