Merge pull request #22 from aws-solutions/release/v1.0.3

Version 1.0.3 release.
aws-solutions · Feb 23, 2024 · 9b4a234 · 9b4a234
2 parents 8b93407 + eca47a8
commit 9b4a234
Show file tree

Hide file tree

Showing 80 changed files with 7,582 additions and 8,039 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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).
 
+
+## [1.0.3] - 2024-02-23
+
+### Fixed
+
+- Added resolution for the ECDSA package to mitigate vulnerability
+- Added resolution for the cyrptography package to mitigate vulnerability
+- Added resolution for node-ip package to mitigate vulnerability
+
+
 ## [1.0.2] - 2024-01-10
 
 ### Fixed

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -275,3 +275,7 @@ pathspec under the Mozilla Public License 2.0 (MPL 2.0)
 typing_extensions under the PSF license
 
 uuid under Unknown license
+
+aws-encryption-sdk under Apache Software License (Apache License 2.0)
+
+jsonpath-ng under Apache Software License (Apache 2.0)
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -56,8 +56,8 @@ if [ -z "$dist_bucket_name" ] || [ -z "$template_bucket_name" ] || [ -z "$soluti
   template_bucket_name=${template_bucket_name:-"connected-mobility-solution-on-aws"}
   read -p "Solution Name [connected-mobility-solution-on-aws]: " solution_name
   solution_name=${solution_name:-"connected-mobility-solution-on-aws"}
-  read -p "Solution Version [v1.0.2]: " solution_version
-  solution_version=${solution_version:-"v1.0.2"}
+  read -p "Solution Version [v1.0.3]: " solution_version
+  solution_version=${solution_version:-"v1.0.3"}
 fi
 
 dashed_version="${solution_version//./$'_'}"

diff --git a/deployment/cdk-solution-helper/README.md b/deployment/cdk-solution-helper/README.md
@@ -79,7 +79,7 @@ After build script run:
       "Properties": {
         "Code": {
           "S3Bucket": "solutions",
-          "S3Key": "trademarked-solution-name/v1.0.2/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
+          "S3Key": "trademarked-solution-name/v1.0.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
         }, ...
         "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler"
 ```
@@ -91,7 +91,7 @@ After CloudFormation deployment:
       "Properties": {
         "Code": {
           "S3Bucket": "solutions-us-east-1",
-          "S3Key": "trademarked-solution-name/v1.0.2/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
+          "S3Key": "trademarked-solution-name/v1.0.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
         }, ...
         "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler"
 ```

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setuptools.setup(
     name="connected-mobility-solution-on-aws",
-    version="1.0.2",
+    version="1.0.3",
     description="The administrative module to deploy all CMS modules and assets",
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",

diff --git a/source/backstage/backstage.json b/source/backstage/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.19.0"
+  "version": "1.19.5"
 }
diff --git a/source/backstage/cdk/Pipfile.lock b/source/backstage/cdk/Pipfile.lock
diff --git a/source/backstage/cdk/source/config/constants.py b/source/backstage/cdk/source/config/constants.py
@@ -21,9 +21,11 @@ class BackstageConstantsClass:
     SOLUTION_NAME: str = "Connected Mobility Solution on AWS"
     APPLICATION_TYPE: str = "AWS-Solutions"
     SOLUTION_ID: str = "SO0241"
-    SOLUTION_VERSION: str = "v1.0.2"
+    SOLUTION_VERSION: str = "v1.0.3"
     CAPABILITY_ID = "CMS.6"
-    USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}"
+    USER_AGENT_STRING: str = (
+        f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}"
+    )
 
 
 BackstageConstants = BackstageConstantsClass()
diff --git a/source/backstage/package.json b/source/backstage/package.json
@@ -31,7 +31,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.23.0",
+    "@backstage/cli": "^0.23.1",
     "@spotify/prettier-config": "^15.0.0",
     "@types/supertest": "^2.0.14",
     "concurrently": "^8.0.1",
@@ -49,7 +49,9 @@
     "@octokit/webhooks": "^10.9.2",
     "octokit": "^3.1.2",
     "follow-redirects": "^1.15.4",
-    "swagger-ui-react": "5.10.5"
+    "swagger-ui-react": "5.10.5",
+    "ip": "2.0.1",
+    "@backstage/backend-app-api": "^0.5.11"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {

diff --git a/source/backstage/packages/app/package.json b/source/backstage/packages/app/package.json
@@ -24,7 +24,7 @@
     "@aws/aws-proton-plugin-for-backstage": "0.2.2",
     "@backstage/app-defaults": "^1.4.4",
     "@backstage/catalog-model": "^1.4.3",
-    "@backstage/cli": "^0.23.0",
+    "@backstage/cli": "^0.23.1",
     "@backstage/core-app-api": "^1.11.0",
     "@backstage/core-components": "^0.13.6",
     "@backstage/core-plugin-api": "^1.7.0",

diff --git a/source/backstage/packages/backend/package.json b/source/backstage/packages/backend/package.json
@@ -33,7 +33,7 @@
     "@backstage/catalog-model": "^1.4.3",
     "@backstage/config": "^1.1.1",
     "@backstage/plugin-app-backend": "^0.3.54",
-    "@backstage/plugin-auth-backend": "^0.19.3",
+    "@backstage/plugin-auth-backend": "^0.19.4",
     "@backstage/plugin-auth-node": "^0.4.0",
     "@backstage/plugin-catalog-backend": "^1.14.0",
     "@backstage/plugin-catalog-backend-module-aws": "^0.3.0",
@@ -43,8 +43,8 @@
     "@backstage/plugin-events-backend-module-gitlab": "^0.1.16",
     "@backstage/plugin-permission-common": "^0.7.9",
     "@backstage/plugin-permission-node": "^0.7.17",
-    "@backstage/plugin-proxy-backend": "^0.4.3",
-    "@backstage/plugin-scaffolder-backend": "^1.18.0",
+    "@backstage/plugin-proxy-backend": "^0.4.4",
+    "@backstage/plugin-scaffolder-backend": "^1.18.1",
     "@backstage/plugin-scaffolder-backend-module-gitlab": "^0.2.9",
     "@backstage/plugin-search-backend": "^1.4.6",
     "@backstage/plugin-search-backend-module-pg": "^0.5.15",
@@ -55,7 +55,7 @@
     "prettier": "^3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.23.0",
+    "@backstage/cli": "^0.23.1",
     "@types/cookie-parser": "1.4.3",
     "@types/dockerode": "3.3.17",
     "@types/luxon": "3.3.0",
@@ -64,7 +64,8 @@
     "supertest": "^6.3.3"
   },
   "resolutions": {
-    "follow-redirects": "^1.15.4"
+    "follow-redirects": "^1.15.4",
+    "@backstage/backend-app-api": "^0.5.11"
   },
   "files": [
     "dist"

diff --git a/source/infrastructure/handlers/metrics/app/tests/__init__.py b/source/infrastructure/handlers/metrics/app/tests/__init__.py
@@ -19,7 +19,7 @@ def setUp(self) -> None:
 
 def set_common_env_variables() -> None:
     os.environ["SOLUTION_ID"] = "SO0241"
-    os.environ["SOLUTION_VERSION"] = "v1.0.2"
+    os.environ["SOLUTION_VERSION"] = "v1.0.3"
     os.environ["AWS_ACCOUNT_ID"] = "0123456789123"
     os.environ["AWS_REGION"] = "us-east-1"
     os.environ["DEPLOYMENT_UUID"] = "DUMMY"
@@ -37,7 +37,7 @@ def get_solution_resource_tags(
             "Value": module_name,
         },
         {"Key": "Solutions:DeploymentUUID", "Value": deployment_uuid},
-        {"Key": "Solutions:SolutionVersion", "Value": "v1.0.2"},
+        {"Key": "Solutions:SolutionVersion", "Value": "v1.0.3"},
         {"Key": "Solutions:ApplicationType", "Value": "AWS-Solutions"},
         {
             "Key": "Solutions:SolutionName",

diff --git a/source/infrastructure/stacks/__init__.py b/source/infrastructure/stacks/__init__.py
@@ -20,7 +20,7 @@ class CmsConstantsClass:
     MODULE_NAME: str = f"Connected-mobility-solution-on-aws-{STAGE}"
     SOLUTION_NAME: str = "Connected Mobility Solution on AWS"
     SOLUTION_ID: str = "SO0241"
-    SOLUTION_VERSION: str = "v1.0.2"
+    SOLUTION_VERSION: str = "v1.0.3"
     APPLICATION_TYPE: str = "AWS-Solutions"
     USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION}"
 

diff --git a/templates/environments/cms_environment/v1/infrastructure/deployment/build-s3-dist.sh b/templates/environments/cms_environment/v1/infrastructure/deployment/build-s3-dist.sh
@@ -46,8 +46,8 @@ if [ -z "$dist_bucket_name" ] || [ -z "$template_bucket_name" ] || [ -z "$soluti
   template_bucket_name=${template_bucket_name:-"connected-mobility-solution-on-aws"}
   read -p "Solution Name [connected-mobility-solution-on-aws]: " solution_name
   solution_name=${solution_name:-"connected-mobility-solution-on-aws"}
-  read -p "Solution Version [v1.0.2]: " solution_version
-  solution_version=${solution_version:-"v1.0.2"}
+  read -p "Solution Version [v1.0.3]: " solution_version
+  solution_version=${solution_version:-"v1.0.3"}
 fi
 
 dashed_version="${solution_version//./$'_'}"

diff --git a/...ents/cms_environment/v1/infrastructure/deployment/cdk-solution-helper/README.md b/...ents/cms_environment/v1/infrastructure/deployment/cdk-solution-helper/README.md
@@ -79,7 +79,7 @@ After build script run:
       "Properties": {
         "Code": {
           "S3Bucket": "solutions",
-          "S3Key": "trademarked-solution-name/v1.0.2/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
+          "S3Key": "trademarked-solution-name/v1.0.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
         }, ...
         "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler"
 ```
@@ -91,7 +91,7 @@ After CloudFormation deployment:
       "Properties": {
         "Code": {
           "S3Bucket": "solutions-us-east-1",
-          "S3Key": "trademarked-solution-name/v1.0.2/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
+          "S3Key": "trademarked-solution-name/v1.0.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip"
         }, ...
         "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler"
 ```

diff --git a/templates/environments/cms_environment/v1/infrastructure/source/config/constants.py b/templates/environments/cms_environment/v1/infrastructure/source/config/constants.py
@@ -15,10 +15,12 @@ class EnvironmentConstantsClass:
     MODULE_NAME: str = "cms-environment-on-aws"
     SOLUTION_NAME: str = "Connected Mobility Solution on AWS"
     SOLUTION_ID: str = "SO0241"
-    SOLUTION_VERSION: str = "v1.0.2"
+    SOLUTION_VERSION: str = "v1.0.3"
     APPLICATION_TYPE: str = "AWS-Solutions"
     CAPABILITY_ID = "CMS.6"
-    USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}"
+    USER_AGENT_STRING: str = (
+        f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}"
+    )
 
 
 EnvironmentConstants = EnvironmentConstantsClass()