From 17e37df920b3462253bc9c93b32be6d3c2726e0e Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Wed, 28 Feb 2024 10:30:40 -0600 Subject: [PATCH] Version v1.0.4 release --- .gitignore | 2 + .pre-commit-config.yaml | 56 ++++++------- CHANGELOG.md | 7 ++ CONTRIBUTING.md | 2 +- README.md | 4 +- deployment/build-s3-dist.sh | 4 +- deployment/cdk-solution-helper/README.md | 4 +- setup.py | 2 +- source/backstage/README.md | 2 +- source/backstage/backstage.json | 2 +- .../backstage/cdk/source/config/constants.py | 6 +- .../backstage_deploy_buildspec.json | 2 +- .../buildspecs/backstage_image_buildspec.json | 4 +- source/backstage/package.json | 29 ++++--- source/backstage/packages/app/package.json | 78 +++++++++---------- .../backstage/packages/backend/package.json | 61 +++++++-------- .../handlers/metrics/app/tests/__init__.py | 4 +- source/infrastructure/stacks/__init__.py | 2 +- .../v1/infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../infrastructure/source/config/constants.py | 2 +- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/config/constants.py | 6 +- .../test_cms_alerts_on_aws_snapshot.json | 12 +-- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/config/constants.py | 6 +- .../assets/graphql/schemas/vss_schema.graphql | 22 +++--- .../test_cms_api_on_aws_snapshot.json | 8 +- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/config/constants.py | 2 +- .../test_connect_and_store_snapshot.json | 4 +- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/.cdk-nag-suppression-list.json | 24 ++++++ .../source/config/constants.py | 2 +- ...cms_ev_battery_health_on_aws_snapshot.json | 12 +-- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/config/constants.py | 6 +- ...test_cms_provisioning_on_aws_snapshot.json | 2 +- .../test_vp_auxiliary_lambdas_snapshot.json | 4 +- ...test_vp_provisioning_lambdas_snapshot.json | 6 +- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/.cdk-nag-suppression-list.json | 8 ++ .../source/config/constants.py | 2 +- ...s_user_authentication_on_aws_snapshot.json | 14 ++-- .../v1/instance_infrastructure/README.md | 2 +- .../deployment/build-s3-dist.sh | 4 +- .../deployment/cdk-solution-helper/README.md | 4 +- .../source/config/constants.py | 6 +- .../source/console/README.md | 2 +- ...cms_vehicle_simulator_on_aws_snapshot.json | 2 +- .../test_vs_resource_snapshot.json | 2 +- .../test_vs_simulator_snapshot.json | 6 +- 65 files changed, 267 insertions(+), 244 deletions(-) diff --git a/.gitignore b/.gitignore index 0cad314f..da7d4d85 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,8 @@ coverage.xml .hypothesis/ .pytest_cache/ cover/ +*-cfnlogs.txt +.nightswatch/functional/results # Translations *.mo diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7534e3c4..c2c8d325 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,18 +3,18 @@ repos: rev: v3.2.0 hooks: - id: check-byte-order-marker # Forbid UTF-8 byte-order markers - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: check-case-conflict # Check for files with names that would conflict on a case-insensitive # filesystem like MacOS HFS+ or Windows FAT. - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: check-json - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: check-yaml exclude: (^source/backstage/examples|^.*/catalog-info.yaml|^templates) - id: check-toml - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: check-merge-conflict - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: check-added-large-files exclude: | (?x)^( @@ -24,25 +24,25 @@ repos: ^.*/Pipfile.lock )$ - id: end-of-file-fixer - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: fix-encoding-pragma - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: trailing-whitespace - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: mixed-line-ending - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: sort-simple-yaml # Requires explicit files parameter to enable file matching - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - id: detect-aws-credentials - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) args: ["--credentials-file", "~/.ada/credentials"] - id: detect-private-key - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - repo: https://github.com/Lucas-C/pre-commit-hooks rev: v1.5.1 hooks: - id: insert-license - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) files: \.py$ args: - --license-filepath @@ -52,7 +52,7 @@ repos: rev: v1.5.1 hooks: - id: insert-license - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) files: \.tsx|.ts$ args: - --license-filepath @@ -64,49 +64,49 @@ repos: rev: 22.3.0 hooks: - id: black - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - repo: https://github.com/hadialqattan/pycln rev: v2.2.2 hooks: - id: pycln - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) - repo: https://github.com/pycqa/isort rev: 5.12.0 hooks: - id: isort name: isort (python) - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) args: ["--profile", "black"] - repo: https://github.com/PyCQA/bandit rev: 1.7.4 hooks: - id: bandit - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) args: ["-c", "pyproject.toml"] additional_dependencies: [ "bandit[toml]" ] # - repo: https://github.com/kontrolilo/kontrolilo # rev: v2.2.0 # hooks: # - id: license-check-configuration-lint - # exclude: (^templates) + # exclude: ^(templates/|.nightswatch/) # language: python # - id: license-check-pipenv - # exclude: (^templates) + # exclude: ^(templates/|.nightswatch/) # language: python # - id: license-check-npm - # exclude: (^templates) + # exclude: ^(templates/|.nightswatch/) # language: python - repo: https://github.com/pypa/pip-audit rev: v2.6.1 hooks: - id: pip-audit - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) # Local hooks - repo: local hooks: - id: check-bash-syntax - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: Check Shell scripts syntax correctness language: system entry: bash -n @@ -114,7 +114,7 @@ repos: - repo: local hooks: - id: detect-empty-files - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: Detect empty files in the repo entry: deployment/detect-empty-files.sh language: system @@ -122,7 +122,7 @@ repos: - repo: local hooks: - id: pylint - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: pylint entry: pylint args: ["--extension-pkg-allow-list", "math"] @@ -132,7 +132,7 @@ repos: - repo: local hooks: - id: mypy - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: mypy entry: mypy types_or: [python, pyi] @@ -142,7 +142,7 @@ repos: - repo: local hooks: - id: cfn-nag - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: cfn-nag entry: deployment/run-cfn-nag.sh files: infrastructure @@ -153,7 +153,7 @@ repos: - repo: local hooks: - id: pytest-jest - exclude: (^templates) + exclude: ^(templates/|.nightswatch/) name: pytest-jest entry: deployment/run-unit-tests.sh args: ["--no-report", "--no-nested"] diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f11bae8..a73b6797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ 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.4] - 2024-02-28 + +### Fixed + +- 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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef9ee41f..f7f60d74 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,6 +55,6 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](https://github.com/aws-solutions/connected-mobility-solution-on-aws/blob/main/LICENSE.txt) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](https://github.com/aws-solutions/connected-mobility-solution-on-aws/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. diff --git a/README.md b/README.md index c023c11e..34c71467 100644 --- a/README.md +++ b/README.md @@ -470,10 +470,10 @@ Refer to the implementation guide for pricing information. ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the -[implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). +[implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/anonymized-data-collection.html). ## Teardown diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh index 812267c9..e262119c 100755 --- 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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/deployment/cdk-solution-helper/README.md b/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- 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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/setup.py b/setup.py index e9e8f29b..7d44c567 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ setuptools.setup( name="connected-mobility-solution-on-aws", - version="1.0.3", + version="1.0.4", 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/README.md b/source/backstage/README.md index c215cff3..5c398d02 100644 --- a/source/backstage/README.md +++ b/source/backstage/README.md @@ -154,7 +154,7 @@ Basic usage should stay within the free tier. ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/source/backstage/backstage.json b/source/backstage/backstage.json index 8c2d0fc0..06d58f64 100644 --- a/source/backstage/backstage.json +++ b/source/backstage/backstage.json @@ -1,3 +1,3 @@ { - "version": "1.19.5" + "version": "1.23.3" } diff --git a/source/backstage/cdk/source/config/constants.py b/source/backstage/cdk/source/config/constants.py index f58f6ed7..9ed829bf 100644 --- a/source/backstage/cdk/source/config/constants.py +++ b/source/backstage/cdk/source/config/constants.py @@ -21,11 +21,9 @@ class BackstageConstantsClass: SOLUTION_NAME: str = "Connected Mobility Solution on AWS" APPLICATION_TYPE: str = "AWS-Solutions" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" 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/cdk/source/infrastructure/buildspecs/backstage_deploy_buildspec.json b/source/backstage/cdk/source/infrastructure/buildspecs/backstage_deploy_buildspec.json index 5fa81b99..fb5256d9 100644 --- a/source/backstage/cdk/source/infrastructure/buildspecs/backstage_deploy_buildspec.json +++ b/source/backstage/cdk/source/infrastructure/buildspecs/backstage_deploy_buildspec.json @@ -10,7 +10,7 @@ "commands": [ "cd cdk", "pipenv install --dev", - "STACK_TARGET=\"cms-backstage-$STAGE\" pipenv run cdk deploy --context \"backstage-image-tag\"=\"$CODEBUILD_RESOLVED_SOURCE_VERSION\" --require-approval never" + "STACK_TARGET=\"cms-backstage-$STAGE\" pipenv run cdk deploy --context \"backstage-image-tag\"=\"s3_$CODEBUILD_RESOLVED_SOURCE_VERSION\" --require-approval never" ] } } diff --git a/source/backstage/cdk/source/infrastructure/buildspecs/backstage_image_buildspec.json b/source/backstage/cdk/source/infrastructure/buildspecs/backstage_image_buildspec.json index 13058d5e..f21a48b1 100644 --- a/source/backstage/cdk/source/infrastructure/buildspecs/backstage_image_buildspec.json +++ b/source/backstage/cdk/source/infrastructure/buildspecs/backstage_image_buildspec.json @@ -12,14 +12,14 @@ "echo \"Building from $(pwd) [Docker Buildkit: $DOCKER_BUILDKIT - Node: $(node --version) - NPM: $(npm --version) - TSC: $(yarn tsc --version)]\"", "yarn build:backend", "yarn build-image", - "docker tag backstage:latest $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION", + "docker tag backstage:latest $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:s3_$CODEBUILD_RESOLVED_SOURCE_VERSION", "docker tag backstage:latest $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:$IMAGE_TAG" ] }, "post_build": { "commands": [ "aws ecr get-login-password --region $AWS_DEFAULT_REGION | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com", - "docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION", + "docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:s3_$CODEBUILD_RESOLVED_SOURCE_VERSION", "docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_NAME:$IMAGE_TAG" ] } diff --git a/source/backstage/package.json b/source/backstage/package.json index c4641322..ee4c28f6 100644 --- a/source/backstage/package.json +++ b/source/backstage/package.json @@ -1,6 +1,6 @@ { "name": "cms-backstage", - "version": "1.0.0", + "version": "1.0.4", "private": true, "license": "Apache-2.0", "description": "Backstage implementation preconfigured to work with CMS", @@ -31,29 +31,26 @@ ] }, "devDependencies": { - "@backstage/cli": "^0.23.1", - "@spotify/prettier-config": "^15.0.0", + "@backstage/cli": "^0.25.2", "@types/supertest": "^2.0.14", "concurrently": "^8.0.1", "lerna": "^7.1.5", - "node-gyp": "^9.3.1", - "prettier": "3", - "typescript": "^5.1.6", + "node-gyp": "^10.0.0", + "prettier": "^3", + "typescript": "^5.3.2", "xml2js": "^0.5.0", "yaml": "^2.2.2" }, "resolutions": { - "@types/react": "^17", - "@babel/traverse": "^7.23.2", - "browserify-sign": "^4.2.2", - "@octokit/webhooks": "^10.9.2", - "octokit": "^3.1.2", - "follow-redirects": "^1.15.4", - "swagger-ui-react": "5.10.5", - "ip": "2.0.1", - "@backstage/backend-app-api": "^0.5.11" + "@types/react": "^18", + "@types/react-dom": "^18", + "@backstage/plugin-home": "^0.6.2", + "@backstage/backend-app-api": "^0.5.13", + "@backstage/backend-common": "^0.21.2", + "@backstage/backend-plugin-api": "^0.6.12", + "@backstage/core-components": "^0.14.0", + "@backstage/theme": "^0.5.1" }, - "prettier": "@spotify/prettier-config", "lint-staged": { "*.{js,jsx,ts,tsx,mjs,cjs}": [ "eslint --fix", diff --git a/source/backstage/packages/app/package.json b/source/backstage/packages/app/package.json index 3a5b90d5..6fe33943 100644 --- a/source/backstage/packages/app/package.json +++ b/source/backstage/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "1.0.0", + "version": "1.0.4", "private": true, "bundled": true, "license": "Apache-2.0", @@ -22,52 +22,53 @@ "dependencies": { "@aws/aws-codeservices-plugin-for-backstage": "0.1.3", "@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.1", - "@backstage/core-app-api": "^1.11.0", - "@backstage/core-components": "^0.13.6", - "@backstage/core-plugin-api": "^1.7.0", - "@backstage/integration-react": "^1.1.20", - "@backstage/plugin-api-docs": "^0.9.12", - "@backstage/plugin-catalog": "^1.14.0", - "@backstage/plugin-catalog-common": "^1.0.17", - "@backstage/plugin-catalog-graph": "^0.2.37", - "@backstage/plugin-catalog-import": "^0.10.1", - "@backstage/plugin-catalog-react": "^1.8.5", - "@backstage/plugin-github-actions": "^0.6.6", - "@backstage/plugin-home": "^0.5.9", - "@backstage/plugin-org": "^0.6.15", - "@backstage/plugin-permission-react": "^0.4.16", - "@backstage/plugin-scaffolder": "^1.15.1", - "@backstage/plugin-search": "^1.4.1", - "@backstage/plugin-search-react": "^1.7.1", - "@backstage/plugin-tech-radar": "^0.6.9", - "@backstage/plugin-techdocs": "^1.8.0", - "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.1", - "@backstage/plugin-techdocs-react": "^1.1.12", - "@backstage/plugin-user-settings": "^0.7.11", - "@backstage/theme": "^0.4.3", + "@backstage/app-defaults": "^1.5.0", + "@backstage/catalog-model": "^1.4.4", + "@backstage/cli": "^0.25.2", + "@backstage/core-app-api": "^1.12.0", + "@backstage/core-components": "^0.14.0", + "@backstage/core-plugin-api": "^1.9.0", + "@backstage/integration-react": "^1.1.24", + "@backstage/plugin-api-docs": "^0.11.0", + "@backstage/plugin-catalog": "^1.17.0", + "@backstage/plugin-catalog-common": "^1.0.21", + "@backstage/plugin-catalog-graph": "^0.4.0", + "@backstage/plugin-catalog-import": "^0.10.6", + "@backstage/plugin-catalog-react": "^1.10.0", + "@backstage/plugin-github-actions": "^0.6.11", + "@backstage/plugin-home": "^0.6.2", + "@backstage/plugin-org": "^0.6.20", + "@backstage/plugin-permission-react": "^0.4.20", + "@backstage/plugin-scaffolder": "^1.18.0", + "@backstage/plugin-search": "^1.4.6", + "@backstage/plugin-search-react": "^1.7.6", + "@backstage/plugin-tech-radar": "^0.6.13", + "@backstage/plugin-techdocs": "^1.10.0", + "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.5", + "@backstage/plugin-techdocs-react": "^1.1.16", + "@backstage/plugin-user-settings": "^0.8.1", + "@backstage/theme": "^0.5.1", "@gitbeaker/rest": "39.10.3", "@immobiliarelabs/backstage-plugin-gitlab": "6.0.0", "@roadiehq/backstage-plugin-home-rss": "1.2.11", - "react": "^17", - "react-dom": "^17", - "react-router": "6.15.0", - "react-router-dom": "6.15.0", + "@react-hookz/web": "^23.1.0", + "react": "^18", + "react-dom": "^18", + "react-router": "^6.3.0", + "react-router-dom": "^6.3.0", "sanitize-html": "2.10.0" }, "devDependencies": { - "@backstage/test-utils": "^1.4.4", - "@testing-library/dom": "^9.3.1", + "@backstage/test-utils": "^1.5.0", + "@testing-library/dom": "^9.0.0", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^12", - "@testing-library/user-event": "^14.4.3", + "@testing-library/react": "^14.0.0", + "@testing-library/user-event": "^14.0.0", "@types/node": "20.1.1", "@types/react": "*", "@types/react-dom": "*", - "@types/react-router": "5.1.20", - "@types/react-router-dom": "^5.3.3", + "@types/react-router": "*", + "@types/react-router-dom": "*", "@types/sanitize-html": "^2.9.0", "cross-env": "7.0.3", "cypress": "^13.3.0", @@ -76,9 +77,6 @@ "jsonwebtoken": "9.0.0", "start-server-and-test": "2.0.0" }, - "resolutions": { - "follow-redirects": "^1.15.4" - }, "browserslist": { "production": [ ">0.2%", diff --git a/source/backstage/packages/backend/package.json b/source/backstage/packages/backend/package.json index 0652c439..abe762d7 100644 --- a/source/backstage/packages/backend/package.json +++ b/source/backstage/packages/backend/package.json @@ -19,43 +19,44 @@ }, "dependencies": { "@aws-crypto/sha256-js": "5.0.0", - "@aws-sdk/client-cognito-identity-provider": "3.427.0", - "@aws-sdk/client-eks": "3.427.0", - "@aws-sdk/client-secrets-manager": "3.427.0", - "@aws-sdk/client-sts": "3.427.0", + "@aws-sdk/client-eks": "3.515.0", + "@aws-sdk/client-secrets-manager": "3.515.0", + "@aws-sdk/client-sts": "3.515.0", "@aws-sdk/credential-providers": "3.427.0", "@aws-sdk/signature-v4": "3.374.0", + "@aws-sdk/client-cognito-identity-provider": "3.515.0", "@aws/aws-codeservices-backend-plugin-for-backstage": "0.1.3", "@aws/aws-proton-backend-plugin-for-backstage": "0.2.2", - "@backstage/backend-common": "^0.19.8", - "@backstage/backend-tasks": "^0.5.11", - "@backstage/catalog-client": "^1.4.5", - "@backstage/catalog-model": "^1.4.3", + "@backstage/backend-common": "^0.21.2", + "@backstage/backend-tasks": "^0.5.17", + "@backstage/catalog-client": "^1.6.0", + "@backstage/catalog-model": "^1.4.4", "@backstage/config": "^1.1.1", - "@backstage/plugin-app-backend": "^0.3.54", - "@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", - "@backstage/plugin-catalog-backend-module-gitlab": "^0.3.3", - "@backstage/plugin-code-coverage-backend": "^0.2.20", - "@backstage/plugin-events-backend": "^0.2.15", - "@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.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", - "@backstage/plugin-search-backend-node": "^1.2.10", - "@backstage/plugin-techdocs-backend": "^1.8.0", + "@backstage/plugin-app-backend": "^0.3.60", + "@backstage/plugin-auth-backend": "^0.21.2", + "@backstage/plugin-auth-node": "^0.4.7", + "@backstage/plugin-catalog-backend": "^1.17.2", + "@backstage/plugin-catalog-backend-module-aws": "^0.3.6", + "@backstage/plugin-catalog-backend-module-gitlab": "^0.3.9", + "@backstage/plugin-code-coverage-backend": "^0.2.26", + "@backstage/plugin-events-backend": "^0.2.21", + "@backstage/plugin-events-backend-module-gitlab": "^0.1.22", + "@backstage/plugin-permission-common": "^0.7.12", + "@backstage/plugin-permission-node": "^0.7.23", + "@backstage/plugin-proxy-backend": "^0.4.10", + "@backstage/plugin-scaffolder-backend": "^1.21.2", + "@backstage/plugin-scaffolder-backend-module-gitlab": "^0.2.15", + "@backstage/plugin-search-backend": "^1.5.2", + "@backstage/plugin-search-backend-module-pg": "^0.5.21", + "@backstage/plugin-search-backend-node": "^1.2.16", + "@backstage/plugin-techdocs-backend": "^1.9.5", "@immobiliarelabs/backstage-plugin-gitlab-backend": "6.0.0", "app": "file:../app", - "prettier": "^3" + "prettier": "^3", + "jwt-decode": "^3.1.0" }, "devDependencies": { - "@backstage/cli": "^0.23.1", + "@backstage/cli": "^0.25.2", "@types/cookie-parser": "1.4.3", "@types/dockerode": "3.3.17", "@types/luxon": "3.3.0", @@ -63,10 +64,6 @@ "@types/uuid": "^9.0.2", "supertest": "^6.3.3" }, - "resolutions": { - "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 index 5a3039a8..b6a5eed0 100644 --- 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.3" + os.environ["SOLUTION_VERSION"] = "v1.0.4" 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.3"}, + {"Key": "Solutions:SolutionVersion", "Value": "v1.0.4"}, {"Key": "Solutions:ApplicationType", "Value": "AWS-Solutions"}, { "Key": "Solutions:SolutionName", diff --git a/source/infrastructure/stacks/__init__.py b/source/infrastructure/stacks/__init__.py index 1a09de88..c018c824 100644 --- 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.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION}" diff --git a/templates/environments/cms_environment/v1/infrastructure/README.md b/templates/environments/cms_environment/v1/infrastructure/README.md index 89be00db..fc8206b5 100644 --- a/templates/environments/cms_environment/v1/infrastructure/README.md +++ b/templates/environments/cms_environment/v1/infrastructure/README.md @@ -24,7 +24,7 @@ List of functionality ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). 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 index a3910cc4..2601c4d1 100755 --- 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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/environments/cms_environment/v1/infrastructure/deployment/cdk-solution-helper/README.md b/templates/environments/cms_environment/v1/infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/environments/cms_environment/v1/infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/environments/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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 index 216b1c88..078596df 100644 --- a/templates/environments/cms_environment/v1/infrastructure/source/config/constants.py +++ b/templates/environments/cms_environment/v1/infrastructure/source/config/constants.py @@ -15,7 +15,7 @@ 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.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.6" USER_AGENT_STRING: str = ( diff --git a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/README.md index eba9d211..ec35ff3c 100644 --- a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/README.md @@ -144,7 +144,7 @@ Basic usage should stay within the free tier. ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index b45610eb..b8619a4d 100755 --- a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_alerts_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_alerts_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/config/constants.py index f57cc1b8..ab3270fd 100644 --- a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -15,12 +15,10 @@ class AlertsConstantsClass: MODULE_NAME: str = "cms-alerts-on-aws" SOLUTION_NAME: str = "Connected Mobility Solution on AWS" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.10" - 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}" SNS_TOPIC_PREFIX: str = "CMS" diff --git a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_alerts_on_aws_snapshot.json b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_alerts_on_aws_snapshot.json index f5e015d1..79bfe50e 100644 --- a/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_alerts_on_aws_snapshot.json +++ b/templates/modules/cms_alerts_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_alerts_on_aws_snapshot.json @@ -147,7 +147,7 @@ "TOKEN_VALIDATION_LAMBDA_ARN": { "Ref": "cmsalertsmoduleinputsconstructssmtokenvalidationlambdaarnParameter1CA960BF" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.4" } }, "FunctionName": "cms-alerts-on-aws-stack-dev-authorization-lambda", @@ -373,7 +373,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { @@ -944,7 +944,7 @@ "Ref": "cmsalertsnotificationconstructnotificationstable6C23B163" }, "SNS_TOPIC_PREFIX": "CMS", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.4" } }, "FunctionName": "cms-alerts-on-aws-stack-dev-create-alerts-lambda", @@ -1559,7 +1559,7 @@ "DEPLOYMENT_UUID": { "Ref": "deploymentuuidParameter" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.4" } }, "FunctionName": "cms-alerts-on-aws-stack-dev-send-notifications-lambda", @@ -1818,7 +1818,7 @@ "ALERTS_SNS_TOPIC_ARN": { "Ref": "cmsalertssnstosqsconstructsnstopic5DB29F7E" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.4" } }, "FunctionName": "cms-alerts-on-aws-stack-dev-publish-lambda", @@ -2411,7 +2411,7 @@ "Ref": "cmsalertsusersubscriptionsconstructusersubscriptiontopicgeneralkeyD95E7C20" }, "SNS_TOPIC_PREFIX": "CMS", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.10/v1.0.4", "USER_EMAIL_SUBSCRIPTIONS_TABLE": { "Ref": "cmsalertsusersubscriptionsconstructuseremailsubscriptionstableA74BB966" } diff --git a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/README.md index b3ac438d..2764bce9 100644 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/README.md @@ -202,7 +202,7 @@ At rest, the API's cost should be minimal. ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index b45610eb..b8619a4d 100755 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_api_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_api_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/config/constants.py index 3d235682..00e0dd74 100644 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -15,12 +15,10 @@ class APIConstantsClass: MODULE_NAME: str = "cms-api-on-aws" SOLUTION_NAME: str = "Connected Mobility Solution on AWS" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.12" - 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}" APIConstants = APIConstantsClass() diff --git a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/infrastructure/assets/graphql/schemas/vss_schema.graphql b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/infrastructure/assets/graphql/schemas/vss_schema.graphql index 25b6f5c1..57abf826 100644 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/infrastructure/assets/graphql/schemas/vss_schema.graphql +++ b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/infrastructure/assets/graphql/schemas/vss_schema.graphql @@ -1,3 +1,14 @@ +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. @@ -10236,14 +10247,3 @@ 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/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_api_on_aws_snapshot.json b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_api_on_aws_snapshot.json index bb00b893..d1cc3434 100644 --- a/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_api_on_aws_snapshot.json +++ b/templates/modules/cms_api_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_api_on_aws_snapshot.json @@ -204,7 +204,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { @@ -803,8 +803,8 @@ "Ref": "cmsapimoduleinputsssmoperationalreportmetricsenabledParameterEBD14CF8" }, "SOLUTION_ID": "SO0241", - "SOLUTION_VERSION": "v1.0.3", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.12/v1.0.3" + "SOLUTION_VERSION": "v1.0.4", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.12/v1.0.4" } }, "FunctionName": "cms-api-on-aws-stack-dev-athena-data-source-lambda", @@ -1208,7 +1208,7 @@ "TOKEN_VALIDATION_LAMBDA_ARN": { "Ref": "cmsapimoduleinputsssmtokenvalidationlambdaarnParameter5DC16C8D" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.12/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.12/v1.0.4" } }, "FunctionName": "cms-api-on-aws-stack-dev-authorization-lambda", diff --git a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/README.md index f3b45620..7526eae1 100644 --- a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/README.md @@ -145,7 +145,7 @@ Basic usage (small simulations for short durations) should stay within the free ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index a3910cc4..2601c4d1 100755 --- a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_connect_store_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_connect_store_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/config/constants.py index d5f741c1..3c8c5bee 100644 --- a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -15,7 +15,7 @@ class ConnectStoreConstantsClass: MODULE_NAME: str = "cms-connect-store-on-aws" SOLUTION_NAME: str = "Connected Mobility Solution on AWS" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.3" USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}" diff --git a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_connect_and_store_snapshot.json b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_connect_and_store_snapshot.json index 039a3fe1..74231524 100644 --- a/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_connect_and_store_snapshot.json +++ b/templates/modules/cms_connect_store_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_connect_and_store_snapshot.json @@ -181,7 +181,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { @@ -242,7 +242,7 @@ "AUTHENTICATION_USER_POOL_REGION": { "Ref": "connectstoreconnectstoremoduleinputsconstructssmauthenticationuserpoolregionParameter062424AC" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.3/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.3/v1.0.4" } }, "FunctionName": "cms-connect-store-on-aws-stack-dev-vehicle-alarm", diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/README.md index bd0b46eb..d34ff45e 100644 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/README.md @@ -218,7 +218,7 @@ Check out Amazon Managed Grafana pricing [here](https://aws.amazon.com/grafana/p ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index b45610eb..b8619a4d 100755 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json index 375f4efe..09bfbb54 100644 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json @@ -265,5 +265,29 @@ "reason": "Some libraries used throughout the solution are not yet supported in Python 3.11. For consistency, all lambdas are currently kept at Python 3.10. Future refactoring of unsupported libraries will enable the use of 3.11 throughout the solution." } ] + }, + "/cms-ev-battery-health-on-aws-stack-dev/cms-ev-battery-health/cms-ev-provision-alerts-construct/custom-resource-provider/framework-onEvent/Resource": { + "rules_to_suppress": [ + { + "id": "AwsSolutions-L1", + "reason": "Some libraries used throughout the solution are not yet supported in Python 3.11. For consistency, all lambdas are currently kept at Python 3.10. Future refactoring of unsupported libraries will enable the use of 3.11 throughout the solution." + } + ] + }, + "/cms-ev-battery-health-on-aws-stack-dev/cms-ev-battery-health/cms-ev-provision-alerts-construct/custom-resource-provider/framework-isComplete/Resource": { + "rules_to_suppress": [ + { + "id": "AwsSolutions-L1", + "reason": "Some libraries used throughout the solution are not yet supported in Python 3.11. For consistency, all lambdas are currently kept at Python 3.10. Future refactoring of unsupported libraries will enable the use of 3.11 throughout the solution." + } + ] + }, + "/cms-ev-battery-health-on-aws-stack-dev/cms-ev-battery-health/cms-ev-provision-alerts-construct/custom-resource-provider/framework-onTimeout/Resource": { + "rules_to_suppress": [ + { + "id": "AwsSolutions-L1", + "reason": "Some libraries used throughout the solution are not yet supported in Python 3.11. For consistency, all lambdas are currently kept at Python 3.10. Future refactoring of unsupported libraries will enable the use of 3.11 throughout the solution." + } + ] } } diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/config/constants.py index d9fab797..c9b87ac4 100644 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -15,7 +15,7 @@ class EVBatteryHealthConstantsClass: MODULE_NAME: str = "cms-ev-battery-health-on-aws" SOLUTION_NAME: str = "Connected Mobility Solution on AWS" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.11" USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}" diff --git a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_ev_battery_health_on_aws_snapshots/test_cms_ev_battery_health_on_aws_snapshot.json b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_ev_battery_health_on_aws_snapshots/test_cms_ev_battery_health_on_aws_snapshot.json index d8951a66..f09bbe48 100644 --- a/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_ev_battery_health_on_aws_snapshots/test_cms_ev_battery_health_on_aws_snapshot.json +++ b/templates/modules/cms_ev_battery_health_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_ev_battery_health_on_aws_snapshots/test_cms_ev_battery_health_on_aws_snapshot.json @@ -887,7 +887,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { @@ -927,7 +927,7 @@ "Description": "CMS EV battery health custom resource lambda function", "Environment": { "Variables": { - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.4" } }, "FunctionName": "cms-ev-battery-health-on-aws-stack-dev-custom-resource-lambda", @@ -1317,7 +1317,7 @@ "Endpoint" ] }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.4" } }, "FunctionName": "cms-ev-battery-health-on-aws-stack-dev-rotate-secret-lambda", @@ -2212,7 +2212,7 @@ "AUTHENTICATION_USER_POOL_REGION": { "Ref": "cmsevbatteryhealthcmsevmoduleinputsconstructssmauthenticationuserpoolregionParameterB4D73345" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.4" } }, "FunctionName": "cms-ev-battery-health-on-aws-stack-dev-process-alerts-lambda", @@ -2514,7 +2514,7 @@ "Id" ] }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.4" } }, "FunctionName": "cms-ev-battery-health-on-aws-stack-dev-workspace-active-lambda", @@ -3901,7 +3901,7 @@ "Endpoint" ] }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.11/v1.0.4" } }, "FunctionName": "cms-ev-battery-health-on-aws-stack-dev-s3-to-grafana-lambda", diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/README.md index 0332d4a9..e963aed0 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/README.md @@ -189,7 +189,7 @@ Basic usage should stay within the free tier. ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index a3910cc4..2601c4d1 100755 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/config/constants.py index 8bc47efd..9e23bf4c 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -17,12 +17,10 @@ class VPConstantsClass: PROVISIONING_TEMPLATE_NAME = "cms-vehicle-provisioning-template" CLAIM_CERT_PROVISIONING_POLICY_NAME = "claim-certificate-provisioning-policy" SOLUTION_ID = "SO0241" - SOLUTION_VERSION = "v1.0.3" + SOLUTION_VERSION = "v1.0.4" APPLICATION_TYPE = "AWS-Solutions" CAPABILITY_ID = "CMS.5" - 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}" VPConstants = VPConstantsClass() diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_provisioning_on_aws_snapshot.json b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_provisioning_on_aws_snapshot.json index f1abccfb..760c8930 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_provisioning_on_aws_snapshot.json +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_provisioning_on_aws_snapshot.json @@ -101,7 +101,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_auxiliary_lambdas_snapshot.json b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_auxiliary_lambdas_snapshot.json index 8061732e..0d45e416 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_auxiliary_lambdas_snapshot.json +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_auxiliary_lambdas_snapshot.json @@ -103,7 +103,7 @@ "Description": "CMS provisioning custom resource lambda function", "Environment": { "Variables": { - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.4" } }, "FunctionName": "cms-provisioning-on-aws-stack-dev-custom-resource-lambda", @@ -441,7 +441,7 @@ "Environment": { "Variables": { "CLAIM_CERT_PROVISIONING_POLICY_NAME": "claim-certificate-provisioning-policy", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.4" } }, "FunctionName": "cms-provisioning-on-aws-stack-dev-rotate-secret-lambda", diff --git a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_provisioning_lambdas_snapshot.json b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_provisioning_lambdas_snapshot.json index 7af2e3b6..c9304746 100644 --- a/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_provisioning_lambdas_snapshot.json +++ b/templates/modules/cms_provisioning_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vp_provisioning_lambdas_snapshot.json @@ -218,7 +218,7 @@ "PROVISIONED_VEHICLES_TABLE_NAME": { "Ref": "provisionedvehiclestable1D94D49A" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.4" } }, "FunctionName": "cms-provisioning-on-aws-stack-dev-initial-connection-lambda", @@ -675,7 +675,7 @@ "Ref": "provisionedvehiclestable1D94D49A" }, "PROVISIONING_TEMPLATE_NAME": "cms-vehicle-provisioning-template", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.4" } }, "FunctionName": "cms-provisioning-on-aws-stack-dev-post-provisioning-lambda", @@ -1000,7 +1000,7 @@ "PROVISIONED_VEHICLES_TABLE_NAME": { "Ref": "provisionedvehiclestable1D94D49A" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.5/v1.0.4" } }, "FunctionName": "cms-provisioning-on-aws-stack-dev-pre-provisioning-lambda", diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/README.md index a7fad842..74d2ef69 100644 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/README.md @@ -190,7 +190,7 @@ are low. At rest, the Authentication module's cost is minimal. For details, see ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index b45610eb..b8619a4d 100755 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json index e2e6ff96..0102a613 100644 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/.cdk-nag-suppression-list.json @@ -161,5 +161,13 @@ "reason": "App client secret should not be rotated. Client secret cannot be updated without destroying the app client." } ] + }, + "/cms-user-authentication-on-aws-stack-dev/AWS679f53fac002430cb0da5b7982bd2287/Resource": { + "rules_to_suppress": [ + { + "id": "AwsSolutions-L1", + "reason": "Some libraries used throughout the solution are not yet supported in Python 3.11. For consistency, all lambdas are currently kept at Python 3.10. Future refactoring of unsupported libraries will enable the use of 3.11 throughout the solution." + } + ] } } diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/config/constants.py index 7ea111a7..6a910f2a 100644 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -16,7 +16,7 @@ class UserAuthenticationConstantsClass: MODULE_NAME: str = "cms-user-authentication-on-aws" SOLUTION_NAME: str = "Connected Mobility Solution on AWS" SOLUTION_ID: str = "SO0241" - SOLUTION_VERSION: str = "v1.0.3" + SOLUTION_VERSION: str = "v1.0.4" APPLICATION_TYPE: str = "AWS-Solutions" CAPABILITY_ID = "CMS.22" USER_AGENT_STRING: str = f"AWSSOLUTION/{SOLUTION_ID}/{SOLUTION_VERSION} AWSSOLUTION-CAPABILITY/{CAPABILITY_ID}/{SOLUTION_VERSION}" diff --git a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_user_authentication_on_aws_snapshots/test_cms_user_authentication_on_aws_snapshot.json b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_user_authentication_on_aws_snapshots/test_cms_user_authentication_on_aws_snapshot.json index cd846906..85f103d7 100644 --- a/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_user_authentication_on_aws_snapshots/test_cms_user_authentication_on_aws_snapshot.json +++ b/templates/modules/cms_user_authentication_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_cms_user_authentication_on_aws_snapshots/test_cms_user_authentication_on_aws_snapshot.json @@ -207,7 +207,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { @@ -699,7 +699,7 @@ "COGNITO_USER_POOL_ID": { "Ref": "cmsuserauthenticationcognitouserpool42033C47" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4" } }, "FunctionName": "cms-user-authentication-on-aws-stack-dev-create-app-client", @@ -869,7 +869,7 @@ "Description": "CMS User Authentication custom resource lambda function", "Environment": { "Variables": { - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4" } }, "FunctionName": "cms-user-authentication-on-aws-stack-dev-custom-resource-lambda", @@ -1023,7 +1023,7 @@ "COGNITO_USER_POOL_ID": { "Ref": "cmsuserauthenticationcognitouserpool42033C47" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4" } }, "FunctionName": "cms-user-authentication-on-aws-stack-dev-delete-app-client", @@ -1418,7 +1418,7 @@ "Arn" ] }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4", "USER_CLIENT_ID": { "Ref": "cmsuserauthenticationcognitouserpoolcmsuserappclientCFC65C67" }, @@ -1626,7 +1626,7 @@ "SERVICE_CLIENT_ID": { "Ref": "cmsuserauthenticationcognitouserpoolcmsserviceappclient1FA07BA9" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4", "USER_CLIENT_ID": { "Ref": "cmsuserauthenticationcognitouserpoolcmsuserappclientCFC65C67" }, @@ -1790,7 +1790,7 @@ "COGNITO_USER_POOL_ID": { "Ref": "cmsuserauthenticationcognitouserpool42033C47" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.22/v1.0.4" } }, "FunctionName": "cms-user-authentication-on-aws-stack-dev-update-app-client", diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/README.md b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/README.md index 617c3554..73680d62 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/README.md +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/README.md @@ -167,7 +167,7 @@ Basic usage (small simulations for short durations) should stay within the free ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh index ab88e918..b9d619f8 100755 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/build-s3-dist.sh +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_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.3]: " solution_version - solution_version=${solution_version:-"v1.0.3"} + read -p "Solution Version [v1.0.4]: " solution_version + solution_version=${solution_version:-"v1.0.4"} fi dashed_version="${solution_version//./$'_'}" diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md index b657214a..8554eb44 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/deployment/cdk-solution-helper/README.md +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/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.3/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" + "S3Key": "trademarked-solution-name/v1.0.4/asset.d513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7.zip" }, ... "Handler": "assetd513e93e266931de36e1c7e79c27b196f84ab928fce63d364d9152ca501551f7/index.handler" ``` diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/config/constants.py b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/config/constants.py index d5b7b256..d3f02e13 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/config/constants.py +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/config/constants.py @@ -16,12 +16,10 @@ class VSConstantsClass: TOPIC_PREFIX = "cms/data/simulated" SOLUTION_NAME = "Connected Mobility Solution on AWS" SOLUTION_ID = "SO0241" - SOLUTION_VERSION = "v1.0.3" + SOLUTION_VERSION = "v1.0.4" APPLICATION_TYPE = "AWS-Solutions" CAPABILITY_ID = "CMS.1" - 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}" VSConstants = VSConstantsClass() diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/console/README.md b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/console/README.md index 7b7ca06c..7fc29dbd 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/console/README.md +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/console/README.md @@ -160,7 +160,7 @@ Basic usage (small simulations for short durations) should stay within the free ## Collection of Operational Metrics -This solution collects anonymous operational metrics to help AWS improve +This solution collects anonymized operational metrics to help AWS improve the quality and features of the solution. For more information, including how to disable this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/connected-mobility-solution-on-aws/operational-metrics.html). diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_vehicle_simulator_on_aws_snapshot.json b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_vehicle_simulator_on_aws_snapshot.json index cf397d9b..b9d4617e 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_vehicle_simulator_on_aws_snapshot.json +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_cms_vehicle_simulator_on_aws_snapshot.json @@ -202,7 +202,7 @@ "ApplicationType": "AWS-Solutions", "SolutionID": "SO0241", "SolutionName": "Connected Mobility Solution on AWS", - "Version": "v1.0.3" + "Version": "v1.0.4" }, "Description": "Attribute group for solution information", "Name": { diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_resource_snapshot.json b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_resource_snapshot.json index 81c2cecf..558e1924 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_resource_snapshot.json +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_resource_snapshot.json @@ -226,7 +226,7 @@ "Variables": { "SOLUTION_ID": "test", "SOLUTION_VERSION": "test", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.3" + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.4" } }, "FunctionName": "cms-vehicle-simulator-on-aws-stack-dev-custom-resources-lambda", diff --git a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_simulator_snapshot.json b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_simulator_snapshot.json index 19302a5a..f228981f 100644 --- a/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_simulator_snapshot.json +++ b/templates/modules/cms_vehicle_simulator_on_aws/v1/instance_infrastructure/source/tests/infrastructure/__snapshots__/test_snapshot/test_vs_simulator_snapshot.json @@ -310,7 +310,7 @@ "SOLUTION_ID": { "Ref": "simulatorconstructssmsolutionidParameter309B25A9" }, - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.4", "VERSION": { "Fn::ImportValue": "cms-vehicle-simulator-on-aws-stack-dev-solution-version" } @@ -642,7 +642,7 @@ "Ref": "simulatorconstructssmsolutionidParameter309B25A9" }, "TOPIC_PREFIX": "cms/data/simulated", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.4", "VERSION": { "Fn::ImportValue": "cms-vehicle-simulator-on-aws-stack-dev-solution-version" } @@ -992,7 +992,7 @@ "Ref": "simulatorconstructssmsolutionidParameter309B25A9" }, "TOPIC_PREFIX": "cms/data/simulated", - "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.3 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.3", + "USER_AGENT_STRING": "AWSSOLUTION/SO0241/v1.0.4 AWSSOLUTION-CAPABILITY/CMS.1/v1.0.4", "VERSION": { "Fn::ImportValue": "cms-vehicle-simulator-on-aws-stack-dev-solution-version" }