Merge pull request #27 from aws-solutions/release/v1.1.1

Version 1.1.1 release.
aws-solutions · Apr 18, 2024 · 35a7f60 · 35a7f60
2 parents 4010ef5 + d0336bf
commit 35a7f60
Show file tree

Hide file tree

Showing 62 changed files with 67,481 additions and 5,418 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ 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.1.1] - 2024-04-18
+
+### Fixed
+
+- Upgrade mysql2 to resolve CVE
+- Upgrade requests library with idna peer dependency to resolve pip-audit
+- Upgrade @backstage/cli to resolve Jest errors
+- Pin moto version in Alerts module to avoid moto Athena bug introduced in moto 5.0.3
+
 ## [1.1.0] - 2024-04-11
 
 ### Added
@@ -38,7 +47,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgrade backstage to 1.23.3 to mitigate vulnerability.
 - Fix a bug that could occur if the s3 version of the backstage source was prefixed with a special character.
 
-
 ## [1.0.3] - 2024-02-23
 
 ### Fixed
@@ -47,7 +55,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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/Pipfile b/Pipfile
@@ -14,11 +14,11 @@ mypy = "*"
 pre-commit = "*"
 pycln = "*"
 pylint = "*"
-requests = ">=2.28.1"
+requests = ">=2.31.0"
 types-boto3 = ">=1.0.2"
 types-pyyaml = "*"
 types-python-dateutil = "*"
-types-requests = ">=2.28.1"
+types-requests = ">=2.31.0"
 types-setuptools = "*"
 wheel = "*"
 

diff --git a/Pipfile.lock b/Pipfile.lock
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 ?= v1.1.0
+export SOLUTION_VERSION ?= v1.1.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/Pipfile b/source/lib/Pipfile
@@ -26,7 +26,7 @@ syrupy = "*"
 toml = "*"
 types-boto3 = "*"
 types-pyyaml = "*"
-types-requests = ">=2.28.1"
+types-requests = ">=2.31.0"
 types-setuptools = "*"
 types-urllib3 = "*"
 types-toml = "*"

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

diff --git a/source/modules/acdp/Pipfile b/source/modules/acdp/Pipfile
@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 aws_lambda_powertools = {extras=["tracer", "validation"], version=">=2.4.0"}
-requests = ">=2.28.1"
+requests = ">=2.31.0"
 
 [dev-packages]
 cms_common = {path = "./../../lib", editable = true}
@@ -28,7 +28,7 @@ toml = "*"
 types-boto3 = ">=1.0.2"
 types-python-dateutil = "*"
 types-pyyaml = "*"
-types-requests = ">=2.28.1"
+types-requests = ">=2.31.0"
 types-setuptools = "*"
 types-urllib3 = "*"
 types-toml = "*"

diff --git a/source/modules/acdp/Pipfile.lock b/source/modules/acdp/Pipfile.lock
diff --git a/source/modules/acdp/backstage/cdk/Makefile b/source/modules/acdp/backstage/cdk/Makefile
@@ -17,7 +17,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 ?= v1.1.0
+export SOLUTION_VERSION ?= v1.1.1
 export SOLUTION_AUTHOR = AWS Industrial Solutions Team
 export SOLUTION_ID = SO0241
 export APPLICATION_TYPE = AWS-Solutions

diff --git a/source/modules/acdp/backstage/cdk/deployment/cdk-solution-helper/package-lock.json b/source/modules/acdp/backstage/cdk/deployment/cdk-solution-helper/package-lock.json
diff --git a/source/modules/acdp/backstage/package.json b/source/modules/acdp/backstage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "acdp-backstage",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "license": "Apache-2.0",
   "description": "Backstage implementation preconfigured to work with CMS",
@@ -31,7 +31,7 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.2",
     "@types/supertest": "^2.0.14",
     "concurrently": "^8.0.1",
     "lerna": "^7.1.5",
@@ -43,7 +43,8 @@
   },
   "resolutions": {
     "@types/react": "^18",
-    "@types/react-dom": "^18"
+    "@types/react-dom": "^18",
+    "mysql2": "^3.9.4"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,mjs,cjs}": [

diff --git a/source/modules/acdp/backstage/packages/app/package.json b/source/modules/acdp/backstage/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "bundled": true,
   "license": "Apache-2.0",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@backstage/app-defaults": "^1.5.0",
     "@backstage/catalog-model": "^1.4.4",
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.2",
     "@backstage/core-app-api": "^1.12.0",
     "@backstage/core-components": "^0.14.0",
     "@backstage/core-plugin-api": "^1.9.0",

diff --git a/source/modules/acdp/backstage/packages/backend/package.json b/source/modules/acdp/backstage/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -44,7 +44,7 @@
     "prettier": "^3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.2",
     "@types/cookie-parser": "1.4.3",
     "@types/dockerode": "3.3.17",
     "@types/lodash": "^4.17.0",

diff --git a/source/modules/acdp/backstage/plugins/acdp-backend/package.json b/source/modules/acdp/backstage/plugins/acdp-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backstage-plugin-acdp-backend",
   "description": "ACDP Backend plugin for Backstage",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -50,7 +50,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.2",
     "@types/supertest": "^2.0.12",
     "@types/recursive-readdir": "*",
     "aws-sdk-client-mock": "^3.0.0",

diff --git a/source/modules/acdp/backstage/plugins/acdp-backend/src/api/acdp-build-api.test.ts b/source/modules/acdp/backstage/plugins/acdp-backend/src/api/acdp-build-api.test.ts
@@ -55,7 +55,7 @@ function setupCommonBuildMocks() {
           {
             name: "CFN_TEMPLATE_URL",
             value:
-              "https://acdp-assets.s3.us-west-2.amazonaws.com/connected-mobility-solution-on-aws/v1.1.0/cms-sample/cms-sample.template",
+              "https://acdp-assets.s3.us-west-2.amazonaws.com/connected-mobility-solution-on-aws/v1.1.1/cms-sample/cms-sample.template",
           },
           { name: "APP_UNIQUE_ID", value: "cms" },
         ]),

diff --git a/source/modules/acdp/backstage/plugins/acdp-backend/src/service/acdp-build-service.test.ts b/source/modules/acdp/backstage/plugins/acdp-backend/src/service/acdp-build-service.test.ts
@@ -61,7 +61,7 @@ function setupCommonBuildMocks() {
           {
             name: "CFN_TEMPLATE_URL",
             value:
-              "https://acdp-assets.s3.us-west-2.amazonaws.com/connected-mobility-solution-on-aws/v1.1.0/cms-sample/cms-sample.template",
+              "https://acdp-assets.s3.us-west-2.amazonaws.com/connected-mobility-solution-on-aws/v1.1.1/cms-sample/cms-sample.template",
           },
           { name: "APP_UNIQUE_ID", value: "cms" },
         ]),

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

diff --git a/source/modules/acdp/backstage/plugins/acdp/package.json b/source/modules/acdp/backstage/plugins/acdp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backstage-plugin-acdp",
   "description": "ACDP plugin for Backstage",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -41,7 +41,7 @@
     "backstage-plugin-acdp-common": "*"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.25.2",
+    "@backstage/cli": "^0.26.2",
     "@backstage/core-app-api": "^1.12.0",
     "@backstage/dev-utils": "^1.0.27",
     "@backstage/test-utils": "^1.5.0",