From b7822d78bacd3763ffefc6ebf9e7b5801e26eae8 Mon Sep 17 00:00:00 2001 From: aws-gurusen Date: Tue, 16 Jul 2024 09:22:58 -0700 Subject: [PATCH] Version 1.1.7 --- CHANGELOG.md | 6 +++++ makefiles/common_config.mk | 2 +- source/lib/setup.py | 2 +- source/modules/acdp/backstage/cdk/Makefile | 2 +- source/modules/acdp/backstage/package.json | 5 +++-- .../acdp/backstage/packages/app/package.json | 2 +- .../backstage/packages/backend/package.json | 2 +- .../plugins/acdp-backend/package.json | 2 +- .../plugins/acdp-common/package.json | 2 +- .../acdp/backstage/plugins/acdp/package.json | 2 +- source/modules/acdp/backstage/yarn.lock | 16 +++++--------- .../assets/graphql/schemas/vss_schema.graphql | 22 +++++++++---------- source/modules/vpc/source/template.yaml | 2 +- 13 files changed, 34 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 326af7ce..1ead8ec8 100644 --- 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). +## [1.1.7] - 2024-07-16 + +### Fixed + +- Upgrade inline-style-prefixer to resolve CVE + ## [1.1.6] - 2024-06-24 ### Fixed diff --git a/makefiles/common_config.mk b/makefiles/common_config.mk index 85d645cb..c41af89e 100644 --- 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.6 +export SOLUTION_VERSION ?= v1.1.7 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 index f8a2f965..c9e0b484 100644 --- 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.1.6", + version="1.1.7", description="Common library used in CMS modules", packages=find_packages( exclude=[ diff --git a/source/modules/acdp/backstage/cdk/Makefile b/source/modules/acdp/backstage/cdk/Makefile index dc04d664..4b16e883 100644 --- 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.6 +export SOLUTION_VERSION ?= v1.1.7 export SOLUTION_AUTHOR = AWS Industrial Solutions Team export SOLUTION_ID = SO0241 export APPLICATION_TYPE = AWS-Solutions diff --git a/source/modules/acdp/backstage/package.json b/source/modules/acdp/backstage/package.json index 3c5fec48..b904ea3c 100644 --- a/source/modules/acdp/backstage/package.json +++ b/source/modules/acdp/backstage/package.json @@ -1,6 +1,6 @@ { "name": "acdp-backstage", - "version": "1.1.6", + "version": "1.1.7", "private": true, "license": "Apache-2.0", "description": "Backstage implementation preconfigured to work with CMS", @@ -47,7 +47,8 @@ "mysql2": "^3.9.8", "formidable": "^3.2.4", "braces": "^3.0.3", - "ws": "^8.17.1" + "ws": "^8.17.1", + "inline-style-prefixer": "^7.0.1" }, "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 index 7cdee21b..aebeafe0 100644 --- 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.6", + "version": "1.1.7", "private": true, "bundled": true, "license": "Apache-2.0", diff --git a/source/modules/acdp/backstage/packages/backend/package.json b/source/modules/acdp/backstage/packages/backend/package.json index 701b7aa4..99668e86 100644 --- 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.6", + "version": "1.1.7", "main": "dist/index.cjs.js", "types": "src/index.ts", "private": true, diff --git a/source/modules/acdp/backstage/plugins/acdp-backend/package.json b/source/modules/acdp/backstage/plugins/acdp-backend/package.json index 825bb9d7..45e1f273 100644 --- 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.6", + "version": "1.1.7", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", diff --git a/source/modules/acdp/backstage/plugins/acdp-common/package.json b/source/modules/acdp/backstage/plugins/acdp-common/package.json index 5b6399d9..4e59fde8 100644 --- 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.6", + "version": "1.1.7", "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 index 17a87e0e..79ddcba5 100644 --- 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.6", + "version": "1.1.7", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", diff --git a/source/modules/acdp/backstage/yarn.lock b/source/modules/acdp/backstage/yarn.lock index e8c37a76..a2188bb6 100644 --- a/source/modules/acdp/backstage/yarn.lock +++ b/source/modules/acdp/backstage/yarn.lock @@ -11211,7 +11211,7 @@ anymatch@^3.0.3, anymatch@~3.1.2: picomatch "^2.0.4" "app@file:packages/app": - version "1.1.5" + version "1.1.6" dependencies: "@backstage/app-defaults" "^1.5.0" "@backstage/catalog-model" "^1.4.4" @@ -15368,11 +15368,6 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-loops@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75" - integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g== - fast-memoize@^2.5.2: version "2.5.2" resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" @@ -17028,13 +17023,12 @@ inline-style-parser@0.1.1: resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== -inline-style-prefixer@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz#991d550735d42069f528ac1bcdacd378d1305442" - integrity sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ== +inline-style-prefixer@^7.0.0, inline-style-prefixer@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.1.tgz#9310f3cfa2c6f3901d1480f373981c02691781e8" + integrity sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw== dependencies: css-in-js-utils "^3.1.0" - fast-loops "^1.1.3" inquirer@8.2.6, inquirer@^8.2.0, inquirer@^8.2.4: version "8.2.6" diff --git a/source/modules/cms_api/source/infrastructure/assets/graphql/schemas/vss_schema.graphql b/source/modules/cms_api/source/infrastructure/assets/graphql/schemas/vss_schema.graphql index 57abf826..25b6f5c1 100644 --- a/source/modules/cms_api/source/infrastructure/assets/graphql/schemas/vss_schema.graphql +++ b/source/modules/cms_api/source/infrastructure/assets/graphql/schemas/vss_schema.graphql @@ -1,14 +1,3 @@ -type Query @aws_lambda { - getVehicle( - # VIN of the vehicle that you want to request data for. - vin: String! - ): Vehicle - - listVehicles( - # page number of paginated results - page: Int - ): [Vehicle] -} # High-level vehicle data. type Vehicle { # Supported Version of VSS. @@ -10247,3 +10236,14 @@ type Vehicle_Connectivity_IsConnectivityAvailable { # Value: Indicates if connectivity between vehicle and cloud is available. True = Connectivity is available. False = Connectivity is not available. value: Boolean } +type Query @aws_lambda { + getVehicle( + # VIN of the vehicle that you want to request data for. + vin: String! + ): Vehicle + + listVehicles( + # page number of paginated results + page: Int + ): [Vehicle] +} diff --git a/source/modules/vpc/source/template.yaml b/source/modules/vpc/source/template.yaml index 571d537a..00715452 100644 --- a/source/modules/vpc/source/template.yaml +++ b/source/modules/vpc/source/template.yaml @@ -1,7 +1,7 @@ AWSTemplateFormatVersion: "2010-09-09" -Description: (SO0241-CMS.23) connected-mobility-solution-on-aws - vpc. Version v1.1.6 +Description: (SO0241-CMS.23) connected-mobility-solution-on-aws - vpc. Version v1.1.7 This template deploys a VPC, with a pair of public and private subnets spread across two Availability Zones. It deploys an internet gateway, with a default route on the public subnets. It deploys a pair of NAT gateways (one in each AZ),