Version v2.0.1 (#45)

aws-solutions · Oct 30, 2024 · 9821eb3 · 9821eb3
1 parent 52ac92d
commit 9821eb3
Show file tree

Hide file tree

Showing 22 changed files with 3,714 additions and 10,063 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is 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.0.1] - 2024-10-30
+
+### Fixed
+
+- Update http-proxy-middleware to fix CVE.
+
 ## [2.0.0] - 2024-10-23
 
 ### Added

diff --git a/makefiles/common_config.mk b/makefiles/common_config.mk
@@ -15,7 +15,7 @@ export AWS_REGION ?= ${DEFAULTS.AWS_REGION}
 # ========================================================
 export SOLUTION_NAME ?= connected-mobility-solution-on-aws
 export SOLUTION_DESCRIPTION ?= Accelerate development and deployment of connected vehicle assets with purpose-built, deployment-ready accelerators, and an Automotive Cloud Developer Portal
-export SOLUTION_VERSION ?= v2.0.0
+export SOLUTION_VERSION ?= v2.0.1
 export SOLUTION_AUTHOR = AWS Industrial Solutions Team
 export SOLUTION_ID = SO0241
 # Path is relative to this file's location, moving this file requires updating this path.

diff --git a/source/lib/setup.py b/source/lib/setup.py
@@ -52,7 +52,7 @@ def finalize_options(self) -> None:
         "toml>=0.10.2",
     ],
     name="cms_common",
-    version="2.0.0",
+    version="2.0.1",
     description="Common library used in CMS modules",
     packages=find_packages(
         exclude=[

diff --git a/...source/tests/infrastructure/__snapshots__/test_snapshot/test_acdp_backstage_snapshot.json b/...source/tests/infrastructure/__snapshots__/test_snapshot/test_acdp_backstage_snapshot.json
@@ -1176,7 +1176,7 @@
               },
               {
                 "Name": "SOLUTION_VERSION",
-                "Value": "v2.0.0"
+                "Value": "v2.0.1"
               },
               {
                 "Name": "WEB_HOSTNAME",

diff --git a/source/modules/backstage/package.json b/source/modules/backstage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acdp-backstage",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "license": "Apache-2.0",
   "description": "Backstage implementation preconfigured to work with CMS",
@@ -50,6 +50,7 @@
     "formidable": "^3.2.4",
     "ws": "^8.17.1",
     "axios": "^1.7.4",
-    "jsonpath-plus": "^10.0.7"
+    "jsonpath-plus": "^10.0.7",
+    "http-proxy-middleware": "^2.0.7"
   }
 }
diff --git a/source/modules/backstage/packages/app/package.json b/source/modules/backstage/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "bundled": true,
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/packages/backend/package.json b/source/modules/backstage/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,

diff --git a/source/modules/backstage/plugins/acdp-backend/package.json b/source/modules/backstage/plugins/acdp-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backstage-plugin-acdp-backend",
   "description": "ACDP Backend plugin for Backstage",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/plugins/acdp-common/package.json b/source/modules/backstage/plugins/acdp-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backstage-plugin-acdp-common",
   "description": "Common interfaces for ACDP plugins",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/plugins/acdp-partner-offering-backend/package.json b/source/modules/backstage/plugins/acdp-partner-offering-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backstage-plugin-acdp-partner-offering-backend",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/plugins/acdp-partner-offering/package.json b/source/modules/backstage/plugins/acdp-partner-offering/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backstage-plugin-acdp-partner-offering",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/plugins/acdp/package.json b/source/modules/backstage/plugins/acdp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backstage-plugin-acdp",
   "description": "ACDP plugin for Backstage",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/plugins/techdocs-custom-build-strategy-module/package.json b/source/modules/backstage/plugins/techdocs-custom-build-strategy-module/package.json
@@ -1,7 +1,7 @@
 {
   "name": "techdocs-custom-build-strategy-module",
   "description": "The custom-build-strategy backend module for the techdocs plugin.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/source/modules/backstage/yarn.lock b/source/modules/backstage/yarn.lock
@@ -16659,10 +16659,10 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-http-proxy-middleware@^2.0.0, http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+http-proxy-middleware@^2.0.0, http-proxy-middleware@^2.0.3, http-proxy-middleware@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -24477,16 +24477,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -24580,7 +24571,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -24594,13 +24585,6 @@ [email protected]:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -26509,7 +26493,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -26527,15 +26511,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

diff --git a/source/modules/cms_predictive_maintenance/pyproject.toml b/source/modules/cms_predictive_maintenance/pyproject.toml
@@ -64,7 +64,8 @@ min-public-methods=0
 # C0114, C0115, C0116 are for docstrings which we don't use
 # W0511 alarms on leaving TODO, FIXME, etc
 # W0613 alarms on unused arguments
-disable = "C0114, C0115, C0116, W0613, W0511"
+# R0917 too many positional arguments
+disable = "C0114, C0115, C0116, W0613, W0511, R0917"
 
 [tool.pylint.'FORMAT']
 max-line-length=200

diff --git a/source/modules/cms_predictive_maintenance/source/.cdk-nag-suppression-list.json b/source/modules/cms_predictive_maintenance/source/.cdk-nag-suppression-list.json
@@ -165,7 +165,7 @@
                     "Resource::arn:<AWS::Partition>:sagemaker:<AWS::Region>:<AWS::AccountId>:transform-job/*"
                 ]
             }
-        ] 
+        ]
     },
     "/cms-predictive-maintenance/cms-predictive-maintenance/predict-api-construct/lambda-role/Resource": {
         "rules_to_suppress": [

diff --git a/source/modules/cms_predictive_maintenance/source/handlers/custom_resource/function/main.py b/source/modules/cms_predictive_maintenance/source/handlers/custom_resource/function/main.py
@@ -245,7 +245,7 @@ def delete_security_groups(security_group_ids: List[str]) -> None:
             if security_group["IpPermissions"]:
                 get_ec2_client().revoke_security_group_ingress(
                     GroupId=security_group_id,
-                    IpPermissions=security_group["IpPermissions"],
+                    IpPermissions=security_group["IpPermissions"],  # type: ignore[arg-type]
                 )
             logger.info(f"Ingress rule revoked for security group {security_group_id}.")
         except Exception as e:  # pylint: disable=broad-exception-caught
@@ -257,7 +257,7 @@ def delete_security_groups(security_group_ids: List[str]) -> None:
             if security_group["IpPermissionsEgress"]:
                 get_ec2_client().revoke_security_group_egress(
                     GroupId=security_group_id,
-                    IpPermissions=security_group["IpPermissionsEgress"],
+                    IpPermissions=security_group["IpPermissionsEgress"],  # type: ignore[arg-type]
                 )
             logger.info(f"Engress rule revoked for security group {security_group_id}.")
         except Exception as e:  # pylint: disable=broad-exception-caught

diff --git a/source/modules/cms_predictive_maintenance/test_scripts/chatbot_query_knowledge_base.py b/source/modules/cms_predictive_maintenance/test_scripts/chatbot_query_knowledge_base.py
@@ -24,7 +24,7 @@
     bedrock_agents_runtime_client = boto3.client("bedrock-agent-runtime")
 
     MODEL_ID = "anthropic.claude-v2"
-    model_arn = f"arn:aws:bedrock:us-east-1::foundation-model/{MODEL_ID}"
+    MODEL_ARN = f"arn:aws:bedrock:us-east-1::foundation-model/{MODEL_ID}"
 
     knowledge_base_id = ssm_client.get_parameter(
         Name=f"/solution/{args.app_unique_id}/predictive-maintenance/chatbot/knowledge-base-id"
@@ -36,7 +36,7 @@
             "type": "KNOWLEDGE_BASE",
             "knowledgeBaseConfiguration": {
                 "knowledgeBaseId": knowledge_base_id,
-                "modelArn": model_arn,
+                "modelArn": MODEL_ARN,
             },
         },
     )

diff --git a/source/modules/cms_predictive_maintenance/test_scripts/create_sagemaker_pipeline.py b/source/modules/cms_predictive_maintenance/test_scripts/create_sagemaker_pipeline.py
@@ -41,7 +41,7 @@
         pipeline_assets_bucket_name=pipeline_assets_bucket_name,
         deploy_model_function_arn=pipeline_deploy_model_lambda_function_arn,
         endpoint_name=pipeline_deploy_model_endpoint_name,
-        resource_name_prefix=args.pipeline_name,
+        resource_name_suffix=args.pipeline_name,
     )
 
     sagemaker.create_pipeline(
-Original file line number
+Diff line change
@@ Expand Up / @@ -165,7 +165,7 @@ @@
                         "Resource::arn:<AWS::Partition>:sagemaker:<AWS::Region>:<AWS::AccountId>:transform-job/*"
                     ]
                 }
-            ]
+            ]
         },
         "/cms-predictive-maintenance/cms-predictive-maintenance/predict-api-construct/lambda-role/Resource": {
             "rules_to_suppress": [
@@ Expand Down @@