diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d9d0fe8..542d04b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.0.1] - 2024-06-26 +### Fixed +- Fixed bug that was restricting stack names to be below 26 characters. [Issue #741](https://github.com/aws-solutions/qnabot-on-aws/issues/741) +- Fixed a looping issue when using slots and chaining #721 ([PR #721](https://github.com/aws-solutions/qnabot-on-aws/pull/721)) - contributed by ([@amendlik](https://github.com/amendlik)) +- Github links with incorrect paths. + +### Updated +- Security patches for braces, urllib3, and ws. +- Improved latency of IAM policy propagation when switching the Bedrock embedding model. + ## [6.0.0] - 2024-06-07 ### Added - Integration with Amazon Bedrock @@ -30,7 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Kendra Webcrawler will now create data source in the native language if supported by Kendra. Kendra can now query in different languages. ([issue #713](https://github.com/aws-solutions/qnabot-on-aws/issues/713)) - Standardized folder structure - Made logging enhancements for Amazon OpenSearch Service and Amazon Data Firehose -- Added case conversion handlebars helpers([PRs #719](https://github.com/aws-solutions/qnabot-on-aws/pull/719)) - contributed by ([@amendlik](https://github.com/amendlik)) +- Added case conversion handlebars helpers([PR #719](https://github.com/aws-solutions/qnabot-on-aws/pull/719)) - contributed by ([@amendlik](https://github.com/amendlik)) - Consolidated common AWS SDK dependencies to reduce overall solution artifact size and lambdas deployment package size - Patched security vulnerabilities and and integrated with CloudFormation Guard evaluation tool - Added ability to TestAll in a selected locale, the locales to be tested should be defined in the template parameter `LexV2BotLocaleIds` @@ -320,12 +330,12 @@ __*Note: we recommend that you first deploy these changes in a non-production en ### Added -- Intent and Slot matching (an early implementation). This new capability supports creating dedicated custom Intents for a QnABot {Item ID}. You can extend QnABot to support one or more related intents. For example, you might create an intent that makes a car reservation, or assists an agent during a live chat or call (via Amazon Connect). More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/intent_slot_matching/README.md -- Support for using custom domain names for QnABot Designer and Client interfaces. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/custom_domain_name_setup/README.md -- AWS QnABot Command Line Interface (CLI) - the AWS QnABot CLI supports the capability to import and export questions and answers via command line. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/qnabot_cli/README.md -- Kendra Redirect - with the Kendra Redirect feature, you can now include a Kendra query within a Item ID. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/kendra_redirect/README.md +- Intent and Slot matching (an early implementation). This new capability supports creating dedicated custom Intents for a QnABot {Item ID}. You can extend QnABot to support one or more related intents. For example, you might create an intent that makes a car reservation, or assists an agent during a live chat or call (via Amazon Connect). More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/v5.2.0/docs/intent_slot_matching/README.md +- Support for using custom domain names for QnABot Designer and Client interfaces. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/v5.2.0/docs/custom_domain_name_setup/README.md +- AWS QnABot Command Line Interface (CLI) - the AWS QnABot CLI supports the capability to import and export questions and answers via command line. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/v5.2.0/docs/qnabot_cli.md +- Kendra Redirect - with the Kendra Redirect feature, you can now include a Kendra query within a Item ID. More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/v5.2.0/docs/kendra_redirect/README.md - Integration with Canvas LMS (an early example implementation). Students use their schools' learning management system (LMS) to keep track of their assignments, grades, and their course work. With this integration, students will be able to ask QnABot about their grades, syllabus, enrollments, assignments, and announcements. - More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/canvaslms_integration/README.md + More details in README: https://github.com/aws-solutions/qnabot-on-aws/blob/v5.2.0/docs/canvaslms_integration.md - Updated import functionality to support importing of QnABot questions and answers from a Excel file when uploaded to S3 data folder. - Added support for importing session attributes via Excel. - Updated runtime of Lambda functions (using Python runtime) to use Python runtime version 3.9. diff --git a/README.md b/README.md index 7e848e4c..7d5190b0 100644 --- a/README.md +++ b/README.md @@ -325,6 +325,7 @@ As QnABot evolves over the years, it makes use of various services and functiona _Note: **Deployable solution versions** refers to the ability to deploy the version of QnABot in their AWS accounts. **Actively supported versions** for QnABot is only available for the latest version of QnABot._ ### Deployable Versions +- [v6.0.1](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.0.1) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.1/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.1/qnabot-on-aws-vpc.template) - [v6.0.0](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.0.0) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.0/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.0/qnabot-on-aws-vpc.template) - [v5.5.2](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v5.5.2) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v5.5.2/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v5.5.2md/qnabot-on-aws-vpc.template) - We recommend to upgrade to this version as it fixes an issue with the testall functionality which may introduce a high number of versions stored in the testall S3 bucket when Content Designer has no Q&As. diff --git a/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py b/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py index 33882aba..f6eb4440 100644 --- a/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py +++ b/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py @@ -23,7 +23,7 @@ @click.pass_context def cli(ctx) -> None: os.environ["SOLUTION_ID"] = "SO0189" - os.environ["SOLUTION_VERSION"] = "v6.0.0" + os.environ["SOLUTION_VERSION"] = "v6.0.1" @cli.command("import") @@ -69,7 +69,7 @@ def qna_import( This command requires two (2) parameters: , . The cloudformation-stack-name parameter is used to know the AWS QnABot deployment to use to support the import process. \n - More information: https://github.com/aws-solutions/aws-qnabot/tree/main/docs/qnabot_cli.md + More information: https://github.com/aws-solutions/qnabot-on-aws/tree/main/source/docs/qnabot_cli/README.md """ try: response = qnabot_cli_helper.initiate_import( @@ -128,7 +128,7 @@ def qna_export(ctx, cloudformation_stack_name: str, export_filename: str, export This command requires two (2) parameters: , and . The cloudformation-stack-name parameter is used to know the AWS QnABot deployment to use to support the export process. \n - More information: https://github.com/aws-solutions/aws-qnabot/tree/main/docs/qnabot_cli.md + More information: https://github.com/aws-solutions/qnabot-on-aws/tree/main/source/docs/qnabot_cli/README.md """ try: response = qnabot_cli_helper.initiate_export( diff --git a/source/config.json b/source/config.json index 507d3f61..3a21e4cc 100644 --- a/source/config.json +++ b/source/config.json @@ -2,7 +2,7 @@ "region": "us-east-1", "profile": "default", "publicBucket": "solutions", - "publicPrefix": "qnabot-on-aws/v6.0.0", + "publicPrefix": "qnabot-on-aws/v6.0.1", "devEmail": "", "ApprovedDomain": "NONE", "Username": "Admin", diff --git a/source/docs/Technical Information.md b/source/docs/Technical Information.md index 1931d109..ceef9b6b 100644 --- a/source/docs/Technical Information.md +++ b/source/docs/Technical Information.md @@ -103,6 +103,9 @@ - ExportBucket - Used for staging files exported from QnABot. API Gateway is used a proxy for the bucket - ImportBucket - Used for staging files imported into QnABot - MetricsBucket - All captured usage data is sent to both OpenSearch and this bucket via Kinesis +- MainAccessLogBucket - Access log bucket for the AssetBucket, BuildStatusBucket, ExportBucket, ImportBucket and MetricsBucket +- devBootStrapAccessLogsBucket - Access log bucket for the dev Bootstrap bucket +- devAccessLogsBucket - Access Log bucket for the dev bucket ## Firehose - TestAllBucket - Results from “Test all” functionality diff --git a/source/docs/handlebars/README.md b/source/docs/handlebars/README.md index 34c9ae37..1115ef59 100644 --- a/source/docs/handlebars/README.md +++ b/source/docs/handlebars/README.md @@ -41,8 +41,8 @@ QnABot exposes the following content to the Handlebars context: |SessionAttributes._name_ | all session attributes are available to the handlebars context - see helpers 'setSessionAttr' and 'getSessionAttr' | |Slots._name_ | all slots filled by Lex are available to the handlebars context - see helper 'getSlot' | |Settings._name_ | all settings values are available to the handlebars context | -|Question | the users utterance, or question - translated to English if ENABLE\_MULTI\_LANGUAGE\_SUPPORT is true | -|OrigQuestion | the users utterance, or question - before translation to English if ENABLE\_MULTI\_LANGUAGE\_SUPPORT is true | +|Question | the users utterance, or question - translated as appropriate if ENABLE_MULTI_LANGUAGE_SUPPORT is true | +|OrigQuestion | the users utterance, or question - before translation if ENABLE_MULTI_LANGUAGE_SUPPORT is true | |PreviousQuestion | the users previous utterance, or question | |Sentiment | the detected sentiment value of user's question/utterance (POSITIVE\|NEGATIVE\|NEUTRAL\|MIXED)| diff --git a/source/docs/qnabot_cli/README.md b/source/docs/qnabot_cli/README.md index 9fb736e4..7ac23a58 100644 --- a/source/docs/qnabot_cli/README.md +++ b/source/docs/qnabot_cli/README.md @@ -5,7 +5,7 @@ The AWS QnABot CLI supports the capability to `import` and `export` questions an ## Setup Prerequisites To use the CLI, the following prerequisites are required: -- Download the `source` directory from codebase of AWS QnABot Solution (version 5.2.0 or higher) in [GitHub](https://github.com/aws-solutions/aws-qnabot) +- Download the `source` directory from codebase of AWS QnABot Solution (version 5.2.0 or higher) in [GitHub](https://github.com/aws-solutions/qnabot-on-aws) - AWS Command Line Interface (CLI). For more information, refer to: https://aws.amazon.com/cli/ - Python version 3.7 or higher. For more information on installing Python, refer to: https://docs.python.org/3/using/index.html - AWS IAM permissions having the below IAM policy. Attach the below IAM policy to the IAM user or IAM Role that you are using for the AWS CLI. Replace the below values when creating the IAM policy: diff --git a/source/docs/update_or_migrate_deployment/README.md b/source/docs/update_or_migrate_deployment/README.md new file mode 100644 index 00000000..652dd2d9 --- /dev/null +++ b/source/docs/update_or_migrate_deployment/README.md @@ -0,0 +1,85 @@ +# In-place upgrade of QnABot + +If you have previously deployed the solution and want to perform in-place upgrade, please refer to [Update the solution](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/update-the-solution.html) + +# Migrating QnABot Configurations and Data from Existing Cloudformation Stack to New Cloudformation Stack + +If you have previously deployed the solution but do not want to perform in-place upgrade or encountered issues during in-place upgrade or in case of a breaking change which does not allow you to upgrade in place, you may try migrating the solution configuration and data using this procedure: + +> **_NOTE:_** +Before getting started, we highly recommend reading [QnABot on AWS Implementation Guide](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/update-the-solution.html) to plan your deployment and refer to [revisions](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/revisions.html) for any changes. + +A. Deploying Cloudformation Stack: +1. Sign in to the AWS CloudFormation console, select your existing QnABot on AWS CloudFormation stack > Parameters. Make a note of the parameters of your existing stack. +2. Deploy latest QnABot stack by enter the appropriate Amazon S3 URL. For more information on deploying solution, please see [QnABot on AWS Implementation Guide](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/deploy-the-solution.html): + + - If using the default main template: [launch here](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/latest/qnabot-on-aws-main.template) + + - If using the VPC template: [launch here](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/latest/qnabot-on-aws-vpc.template) + +3. Under Parameters, modify them as necessary per the notes made in Step 1. +4. Choose Next. +6. On the Configure stack options page, choose Next. +7. On the Review page, review and confirm the settings. Be sure to check the box acknowledging that the template might create AWS Identity and Access Management (IAM) resources. +8. Choose View change set and verify the changes. Click Submit to deploy the stack. +9. Wait and confirm that deployment is complete + +B. Exporting and Import QnAs: + +1. Export QnAs from previous stack: + + a. Sign in to the content designer of previous stack, choose the tools menu ( ☰ ), and then choose the Export. + + b. Click on Export. For more details, please refer to [Importing and exporting chatbot answers](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/importing-and-exporting-chatbot-answers.html). + + > **_NOTE:_** + If for any event QnABot designer is not accessible, you may also find this data in S3 Export Bucket if it has been previously exported. If you do not find this data in export bucket, you may also find it OpenSearch indices. +2. Importing QnAs to new stack: + + a. Sign in to the content designer of your newly deployed stack, choose the tools menu ( ☰ ), choose the Import, and then choose From File. + + b. Import the JSON file exported previously in Step B.1.b. + + +C. Verifying and copying settings in the designer: +1. Export settings from previous stack: + + a. Sign in to the content designer of previous stack, select the tools menu ( ☰ ), and then choose Settings. + + b. Click on Export Settings. + + +2. Import settings to new stack: + + a. Sign in to the content designer of your newly deployed stack, select the tools menu ( ☰ ), and then choose Settings. + + b. Click on Import Settings. + +3. Please note there maybe new settings or enhancement with new releases. We recommend to review their description and modify them as required. + > **_NOTE:_** + If for any reason, the QnABot designer of the previous stack is not accessible, you may also find these settings backed up in AWS Systems Manager Parameter Store of your previous stack. In that case, you will refer to those settings from the Parameter Store and update them manually in the settings page of the newly deployed stack. + +D. Post-migration verification and cleaning: + + 1. Verify questions, answers and text passages that were imported are successfully loaded in the designer. + 2. Verify settings were imported correctly or correct them as necessary. + 3. Once you have loaded the questions, choose Edit from the Tools menu, choose LEX REBUILD from the top right edit card menu (⋮) and make sure it's successful. This also re-trains Amazon Lex using the newly added questions as training data. For more information, please refer to [Lex rebuild](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/configuring-intent-and-slot-matching.html#lex-rebuild). + 4. Using chat client provided through QnABot, please ensure that the questions are being answered corrently. You can also use the content designer to tune, test, and troubleshoot answers to fix problems. For more information, please refer to [Tuning, testing, and troubleshooting unexpected answers](https://docs.aws.amazon.com/solutions/latest/qnabot-on-aws/tuning-testing-and-troubleshooting-unexpected-answers.html). + > **_NOTE:_** + If you have deployed [AWS Lex Web UI](https://github.com/aws-samples/aws-lex-web-ui/blob/master/README.md) (this is not maintained as part of QnABot on AWS) to integrate with QnABot on AWS, please verify you have updated required information (e.g LexV2BotId, LexV2BotAliasId etc) available under newly deployed QnABot on AWS CloudFormation stack > Outputs. For more details, please refer to [Deploy a Web UI for Your Chatbot](https://aws.amazon.com/blogs/machine-learning/deploy-a-web-ui-for-your-chatbot/). + 5. Deleting your previous QnABot stack: + + a. Before deleting the previous stack, please validate if you need to retain any AWS CloudWatch Logs and data in AWS S3 buckets created by QnaBot. + + b. After validating, you may proceed to delete your existing deployment by selecting your existing QnABot on AWS CloudFormation stack > Delete. + + + ### Frequently Asked Questions (FAQs): +- Do I need to back-up and migrate Amazon DynamoDb database table? + - This is not required as it only contains user chat information to disambiguate follow-up questions from previous question and answer context. Once users start interacting with QnABot, the table rows will be populated and updated. + + + + + + diff --git a/source/docs/using_cloud9/README.md b/source/docs/using_cloud9/README.md index f524b6f7..1b0486c0 100644 --- a/source/docs/using_cloud9/README.md +++ b/source/docs/using_cloud9/README.md @@ -93,7 +93,7 @@ npm install latest-version ## Initialize the environment ```bash -git clone https://github.com/aws-solutions/aws-qnabot.git +git clone https://github.com/aws-solutions/qnabot-on-aws.git sudo yum install jq ``` diff --git a/source/lambda/aws-sdk-layer/package-lock.json b/source/lambda/aws-sdk-layer/package-lock.json index 1aa894ea..fdb725ae 100644 --- a/source/lambda/aws-sdk-layer/package-lock.json +++ b/source/lambda/aws-sdk-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "aws-layer", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aws-layer", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-bedrock-agent-runtime": "3.511.0", diff --git a/source/lambda/aws-sdk-layer/package.json b/source/lambda/aws-sdk-layer/package.json index 012a8794..84d931d9 100644 --- a/source/lambda/aws-sdk-layer/package.json +++ b/source/lambda/aws-sdk-layer/package.json @@ -1,6 +1,6 @@ { "name": "aws-layer", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda aws-sdk-layer", "main": "index.js", "scripts": { diff --git a/source/lambda/cfn-lambda-layer/package-lock.json b/source/lambda/cfn-lambda-layer/package-lock.json index 78eedd1b..6f2134b9 100644 --- a/source/lambda/cfn-lambda-layer/package-lock.json +++ b/source/lambda/cfn-lambda-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "cfn-lambda-layer", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cfn-lambda-layer", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "cfn-lambda": "^5.1.0" diff --git a/source/lambda/cfn-lambda-layer/package.json b/source/lambda/cfn-lambda-layer/package.json index 02bf928f..9c2f7565 100644 --- a/source/lambda/cfn-lambda-layer/package.json +++ b/source/lambda/cfn-lambda-layer/package.json @@ -1,6 +1,6 @@ { "name": "cfn-lambda-layer", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Cfn Lambda Layer", "main": "index.js", "scripts": { diff --git a/source/lambda/cfn/package-lock.json b/source/lambda/cfn/package-lock.json index ee60bbe3..663bf2b8 100644 --- a/source/lambda/cfn/package-lock.json +++ b/source/lambda/cfn/package-lock.json @@ -1,12 +1,12 @@ { "name": "cfn", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cfn", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-api-gateway": "3.511.0", @@ -3907,12 +3907,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -4594,9 +4594,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/cfn/package.json b/source/lambda/cfn/package.json index 2babed53..0c17a338 100644 --- a/source/lambda/cfn/package.json +++ b/source/lambda/cfn/package.json @@ -1,6 +1,6 @@ { "name": "cfn", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Cfn Lambda", "main": "index.js", "scripts": { diff --git a/source/lambda/common-modules-layer/package-lock.json b/source/lambda/common-modules-layer/package-lock.json index 56e7444d..928b611f 100644 --- a/source/lambda/common-modules-layer/package-lock.json +++ b/source/lambda/common-modules-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "common-modules-layer", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "common-modules-layer", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/credential-providers": "^3.511.0", diff --git a/source/lambda/common-modules-layer/package.json b/source/lambda/common-modules-layer/package.json index cb09aed9..7500a2e7 100644 --- a/source/lambda/common-modules-layer/package.json +++ b/source/lambda/common-modules-layer/package.json @@ -1,6 +1,6 @@ { "name": "common-modules-layer", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Common-modules-layer lambda", "main": "index.js", "scripts": { diff --git a/source/lambda/connect/package-lock.json b/source/lambda/connect/package-lock.json index a99ff608..e8cd56a9 100644 --- a/source/lambda/connect/package-lock.json +++ b/source/lambda/connect/package-lock.json @@ -1,12 +1,12 @@ { "name": "connect", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "connect", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -1311,12 +1311,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1734,9 +1734,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -4636,12 +4636,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -4924,9 +4924,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/connect/package.json b/source/lambda/connect/package.json index 55563a7b..254cc55c 100644 --- a/source/lambda/connect/package.json +++ b/source/lambda/connect/package.json @@ -1,6 +1,6 @@ { "name": "connect", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda function used to support the Connect setup wizard", "repository": { "type": "git", diff --git a/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js b/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js index 16170a7f..93fad708 100644 --- a/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js +++ b/source/lambda/es-proxy-layer/lib/fulfillment-event/evaluateConditionalChaining.js @@ -111,6 +111,11 @@ async function evaluateConditionalChaining(req, res, hit, conditionalChaining) { next_q = await evaluateNextQuestion(conditionalChaining, req, res, errors, next_q); qnabot.log('Chained document rule evaluated to:', next_q); + // Remove qid if set by slots - this would override the chained item + if(req.hasOwnProperty('qid')) { + delete req['qid']; + } + let hit2; if (next_q) { req.question = next_q; diff --git a/source/lambda/es-proxy-layer/package-lock.json b/source/lambda/es-proxy-layer/package-lock.json index 84da46a8..29508ca6 100644 --- a/source/lambda/es-proxy-layer/package-lock.json +++ b/source/lambda/es-proxy-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-firehose": "^3.511.0", @@ -5260,12 +5260,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -6089,9 +6089,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/es-proxy-layer/package.json b/source/lambda/es-proxy-layer/package.json index 4c0ba17c..500f072d 100644 --- a/source/lambda/es-proxy-layer/package.json +++ b/source/lambda/es-proxy-layer/package.json @@ -1,6 +1,6 @@ { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda managing querying of data store", "main": "index.js", "scripts": { diff --git a/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js b/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js index 90eb0ff5..057fb7a9 100644 --- a/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js +++ b/source/lambda/es-proxy-layer/test/fulfillment-event/evaluateConditionalChaining.test.js @@ -46,7 +46,7 @@ describe('evaluateConditionalChaining', () => { expect(errors).toEqual([]); expect(invokeLambda).toHaveBeenCalledTimes(0) expect(getHit).toHaveBeenCalledTimes(0) - expect(updatedReq.qid).toStrictEqual('Text.003') + expect(updatedReq.qid).toStrictEqual(undefined) }); test('evaluates a Lambda-based chaining rule', async () => { @@ -65,7 +65,7 @@ describe('evaluateConditionalChaining', () => { expect(errors).toEqual([]); expect(invokeLambda).toHaveBeenCalledTimes(1) expect(getHit).toHaveBeenCalledTimes(1) - expect(updatedReq.qid).toStrictEqual('Text.003') + expect(updatedReq.qid).toStrictEqual(undefined) }); }); diff --git a/source/lambda/export/package-lock.json b/source/lambda/export/package-lock.json index 3713bfb0..66ceadf1 100644 --- a/source/lambda/export/package-lock.json +++ b/source/lambda/export/package-lock.json @@ -1,12 +1,12 @@ { "name": "export", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "export", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" @@ -1799,12 +1799,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2248,9 +2248,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/export/package.json b/source/lambda/export/package.json index af466fc5..177d9c3b 100644 --- a/source/lambda/export/package.json +++ b/source/lambda/export/package.json @@ -1,6 +1,6 @@ { "name": "export", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda handling export of QIDs", "main": "index.js", "scripts": { diff --git a/source/lambda/fulfillment/package-lock.json b/source/lambda/fulfillment/package-lock.json index 4d302e82..a8efba0a 100644 --- a/source/lambda/fulfillment/package-lock.json +++ b/source/lambda/fulfillment/package-lock.json @@ -1,12 +1,12 @@ { "name": "fulfillment", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "fulfillment", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-dynamodb": "^3.511.0", @@ -3170,12 +3170,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3660,9 +3660,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/fulfillment/package.json b/source/lambda/fulfillment/package.json index d30d6f2f..87d541fb 100644 --- a/source/lambda/fulfillment/package.json +++ b/source/lambda/fulfillment/package.json @@ -1,6 +1,6 @@ { "name": "fulfillment", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda handling fulfillment of user requests", "main": "handler.js", "scripts": { diff --git a/source/lambda/genesys/package-lock.json b/source/lambda/genesys/package-lock.json index d151eb2e..a0143aae 100644 --- a/source/lambda/genesys/package-lock.json +++ b/source/lambda/genesys/package-lock.json @@ -1,12 +1,12 @@ { "name": "genesys", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "genesys", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -1311,12 +1311,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1734,9 +1734,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -4636,12 +4636,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -4924,9 +4924,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/genesys/package.json b/source/lambda/genesys/package.json index 239398a5..cce10b0a 100644 --- a/source/lambda/genesys/package.json +++ b/source/lambda/genesys/package.json @@ -1,6 +1,6 @@ { "name": "genesys", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda function used to support the Genesys setup wizard", "repository": { "type": "git", diff --git a/source/lambda/import/package-lock.json b/source/lambda/import/package-lock.json index 2aff03c0..56e4c3dc 100644 --- a/source/lambda/import/package-lock.json +++ b/source/lambda/import/package-lock.json @@ -1,12 +1,12 @@ { "name": "import", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "import", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "read-excel-file": "^5.7.1" @@ -1830,12 +1830,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2323,9 +2323,9 @@ "integrity": "sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==" }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/import/package.json b/source/lambda/import/package.json index 06ad0134..0fbddd4a 100644 --- a/source/lambda/import/package.json +++ b/source/lambda/import/package.json @@ -1,6 +1,6 @@ { "name": "import", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda handling import of QIDs", "main": "index.js", "scripts": { diff --git a/source/lambda/js_lambda_hook_sdk/package-lock.json b/source/lambda/js_lambda_hook_sdk/package-lock.json index 75bbe31e..5f2f2dd3 100644 --- a/source/lambda/js_lambda_hook_sdk/package-lock.json +++ b/source/lambda/js_lambda_hook_sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "js_lambda_hook_sdk", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "js_lambda_hook_sdk", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" @@ -1314,12 +1314,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1737,9 +1737,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -4644,12 +4644,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -4932,9 +4932,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/js_lambda_hook_sdk/package.json b/source/lambda/js_lambda_hook_sdk/package.json index 22bb10d5..06d2316d 100644 --- a/source/lambda/js_lambda_hook_sdk/package.json +++ b/source/lambda/js_lambda_hook_sdk/package.json @@ -1,6 +1,6 @@ { "name": "js_lambda_hook_sdk", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot convenience layer, allowing users to create custom lambda hooks", "directories": { "lambda_hook_sdk": "lambda_hook_sdk", diff --git a/source/lambda/lex-build/package-lock.json b/source/lambda/lex-build/package-lock.json index aad08706..3bafd61b 100644 --- a/source/lambda/lex-build/package-lock.json +++ b/source/lambda/lex-build/package-lock.json @@ -1,12 +1,12 @@ { "name": "lex-build", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lex-build", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-lex-model-building-service": "^3.511.0" @@ -2942,12 +2942,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3412,9 +3412,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/lex-build/package.json b/source/lambda/lex-build/package.json index 1c0a6d2a..28af9798 100644 --- a/source/lambda/lex-build/package.json +++ b/source/lambda/lex-build/package.json @@ -1,6 +1,6 @@ { "name": "lex-build", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot lambda for rebuilding Amazon Lex bots", "main": "handler.js", "scripts": { diff --git a/source/lambda/proxy-es/package-lock.json b/source/lambda/proxy-es/package-lock.json index 71068038..ef059464 100644 --- a/source/lambda/proxy-es/package-lock.json +++ b/source/lambda/proxy-es/package-lock.json @@ -1,12 +1,12 @@ { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0" } } diff --git a/source/lambda/proxy-es/package.json b/source/lambda/proxy-es/package.json index 8628f0c4..52c4ad9c 100644 --- a/source/lambda/proxy-es/package.json +++ b/source/lambda/proxy-es/package.json @@ -1,6 +1,6 @@ { "name": "proxy-es", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot Lambda function is used to proxy request from ApiGateway to OpenSearch", "main": "index.js", "author": { diff --git a/source/lambda/qnabot-common-layer/package-lock.json b/source/lambda/qnabot-common-layer/package-lock.json index 66e095fc..18b6a7fb 100644 --- a/source/lambda/qnabot-common-layer/package-lock.json +++ b/source/lambda/qnabot-common-layer/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-common-layer", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-common-layer", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-ssm": "^3.511.0", @@ -2527,12 +2527,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -2980,9 +2980,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/qnabot-common-layer/package.json b/source/lambda/qnabot-common-layer/package.json index e90a0c4e..64131f85 100644 --- a/source/lambda/qnabot-common-layer/package.json +++ b/source/lambda/qnabot-common-layer/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-common-layer", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda layers used to provide common logging and utility functions", "repository": { "type": "git", diff --git a/source/lambda/s3-clean/requirements.txt b/source/lambda/s3-clean/requirements.txt index 3603f607..6e211317 100644 --- a/source/lambda/s3-clean/requirements.txt +++ b/source/lambda/s3-clean/requirements.txt @@ -1,5 +1,3 @@ boto3 botocore==1.31.68 -crhelper==2.0.11 -requests==2.32.3 -urllib3==1.26.18 \ No newline at end of file +crhelper==2.0.11 \ No newline at end of file diff --git a/source/lambda/schema/package-lock.json b/source/lambda/schema/package-lock.json index 043adf61..a291fa73 100644 --- a/source/lambda/schema/package-lock.json +++ b/source/lambda/schema/package-lock.json @@ -1,12 +1,12 @@ { "name": "schema", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "schema", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "devDependencies": { "jest": "^29.7.0" @@ -1311,12 +1311,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1734,9 +1734,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -4636,12 +4636,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -4924,9 +4924,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/schema/package.json b/source/lambda/schema/package.json index 59df8f63..71b8bc95 100644 --- a/source/lambda/schema/package.json +++ b/source/lambda/schema/package.json @@ -1,6 +1,6 @@ { "name": "schema", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda function used to provide the schemas for the various qid types", "repository": { "type": "git", diff --git a/source/lambda/solution-helper/requirements.txt b/source/lambda/solution-helper/requirements.txt index afed8a83..8fc40dd5 100644 --- a/source/lambda/solution-helper/requirements.txt +++ b/source/lambda/solution-helper/requirements.txt @@ -1,3 +1,2 @@ crhelper==2.0.11 -requests==2.32.3 -urllib3==1.26.18 \ No newline at end of file +requests==2.32.3 \ No newline at end of file diff --git a/source/lambda/testall/package-lock.json b/source/lambda/testall/package-lock.json index 899e83a7..8b5e7583 100644 --- a/source/lambda/testall/package-lock.json +++ b/source/lambda/testall/package-lock.json @@ -1,12 +1,12 @@ { "name": "testall", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "testall", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "@aws-sdk/client-lex-runtime-v2": "^3.511.0" @@ -3027,12 +3027,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3506,9 +3506,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/testall/package.json b/source/lambda/testall/package.json index 3e9017f5..ed32c7b7 100644 --- a/source/lambda/testall/package.json +++ b/source/lambda/testall/package.json @@ -1,6 +1,6 @@ { "name": "testall", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda function that reads QnAs from opensearch and performs test validation against each question defined in qna against current Lex bot", "main": "index.js", "scripts": { diff --git a/source/lambda/translate/package-lock.json b/source/lambda/translate/package-lock.json index 41ae7231..828666f3 100644 --- a/source/lambda/translate/package-lock.json +++ b/source/lambda/translate/package-lock.json @@ -1,12 +1,12 @@ { "name": "translate", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "translate", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "devDependencies": { "aws-sdk-client-mock": "^3.0.1", @@ -1364,12 +1364,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1796,9 +1796,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -4816,12 +4816,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -5110,9 +5110,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" diff --git a/source/lambda/translate/package.json b/source/lambda/translate/package.json index 700d24c0..c884ef3d 100644 --- a/source/lambda/translate/package.json +++ b/source/lambda/translate/package.json @@ -1,6 +1,6 @@ { "name": "translate", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda function used to import custom terminologies into AWS Translate", "repository": { "type": "git", diff --git a/source/package-lock.json b/source/package-lock.json index eea95b9a..7580d293 100644 --- a/source/package-lock.json +++ b/source/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-on-aws", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-on-aws", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "os": [ "darwin", @@ -10288,9 +10288,9 @@ } }, "node_modules/aws-lex-web-ui/node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, @@ -10864,11 +10864,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -14821,9 +14821,9 @@ "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==" }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -17444,9 +17444,9 @@ } }, "node_modules/jest-environment-jsdom/node_modules/ws": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.0.tgz", - "integrity": "sha512-H/Z3H55mrcrgjFwI+5jKavgXvwQLtfPCUEp6pi35VhoB0pfcHnSoyuTzkBEZpzq49g1193CUEwIvmsjcotenYw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -26186,9 +26186,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -26544,9 +26544,9 @@ } }, "node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "dev": true, "engines": { "node": ">=8.3.0" diff --git a/source/package.json b/source/package.json index d513ddb7..1c02f5c5 100644 --- a/source/package.json +++ b/source/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-on-aws", - "version": "6.0.0", + "version": "6.0.1", "engines": { "node": ">=18.0.0", "npm": ">=10.0.0" diff --git a/source/templates/examples/examples/examples/RecentTopicsDemo.json b/source/templates/examples/examples/examples/RecentTopicsDemo.json index 1b0851e3..a45119b7 100644 --- a/source/templates/examples/examples/examples/RecentTopicsDemo.json +++ b/source/templates/examples/examples/examples/RecentTopicsDemo.json @@ -332,7 +332,7 @@ "qid": "RecentTopics.Instructions.001", "a": "See the instructions", "alt": { - "markdown": "Save the following JSON to a file and use the \"Import Settings\" option on the Settings page.\n\n```json\n{\n \"topic::Comprehend\": \"Amazon Comprehend::RecentTopics.Comprehend\",\n \"topic::Kendra\": \"Amazon Kendra::RecentTopics.Kendra\",\n \"topic::Lex\": \"Amazon Lex::RecentTopics.Lex\",\n \"topic::Polly\": \"Amazon Polly::RecentTopics.Polly\",\n \"topic::SageMaker\": \"Amazon SageMaker::RecentTopics.SageMaker\",\n \"topic::Translate\": \"Amazon Translate::RecentTopic.Translate\",\n }\n```\n\nSee [here](https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/recent_topics_lambda_hook_example/README.md) for more information." + "markdown": "Save the following JSON to a file and use the \"Import Settings\" option on the Settings page.\n\n```json\n{\n \"topic::Comprehend\": \"Amazon Comprehend::RecentTopics.Comprehend\",\n \"topic::Kendra\": \"Amazon Kendra::RecentTopics.Kendra\",\n \"topic::Lex\": \"Amazon Lex::RecentTopics.Lex\",\n \"topic::Polly\": \"Amazon Polly::RecentTopics.Polly\",\n \"topic::SageMaker\": \"Amazon SageMaker::RecentTopics.SageMaker\",\n \"topic::Translate\": \"Amazon Translate::RecentTopic.Translate\",\n }\n```\n\nSee [here](https://github.com/aws-solutions/qnabot-on-aws/blob/main/source/docs/recent_topics_lambda_hook_example/README.md) for more information." }, "type": "qna", "q": [ diff --git a/source/templates/examples/examples/package-lock.json b/source/templates/examples/examples/package-lock.json index 9a59ce47..836fb43d 100644 --- a/source/templates/examples/examples/package-lock.json +++ b/source/templates/examples/examples/package-lock.json @@ -1,12 +1,12 @@ { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/examples/package.json b/source/templates/examples/examples/package.json index 7e0ab572..7b74d3b1 100644 --- a/source/templates/examples/examples/package.json +++ b/source/templates/examples/examples/package.json @@ -1,6 +1,6 @@ { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda contains a collection of lambda hooks for QnABot and a custom resource to create the example documents", "main": "index.js", "scripts": { diff --git a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json index cdafa5e9..8d245fe6 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package-lock.json @@ -1,12 +1,12 @@ { "name": "createrecenttopicsresponse", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "createrecenttopicsresponse", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" diff --git a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json index f07aa491..096ec468 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CreateRecentTopicsResponse/package.json @@ -1,6 +1,6 @@ { "name": "createrecenttopicsresponse", - "version": "6.0.0", + "version": "6.0.1", "description": "Lambda hook that creates recent topic response", "main": "CreateRecentTopicResponse.js", "scripts": { diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json index 7469ebf7..9c7b8992 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package-lock.json @@ -1,12 +1,12 @@ { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json index 7a8d881f..64a8b4c0 100644 --- a/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json +++ b/source/templates/examples/extensions/js_lambda_hooks/CustomJSHook/package.json @@ -1,6 +1,6 @@ { "name": "examples", - "version": "6.0.0", + "version": "6.0.1", "description": "Creates custom JS Lambda Hooks", "main": "index.js", "scripts": { diff --git a/source/templates/examples/extensions/ui_imports/content/CanvasLMSIntegration.txt b/source/templates/examples/extensions/ui_imports/content/CanvasLMSIntegration.txt index 9a581c3a..1ff8cef7 100644 --- a/source/templates/examples/extensions/ui_imports/content/CanvasLMSIntegration.txt +++ b/source/templates/examples/extensions/ui_imports/content/CanvasLMSIntegration.txt @@ -1,4 +1,4 @@ NOTICE: Canvas LMS integration with QnABot on AWS is deprecated in this release and no longer be supported. Customers may fork the code needed for their specific use case from previous versions. The integration code will be removed in the next release. -Imports sample questions for interacting with Canvas LMS. More details: https://github.com/aws-solutions/aws-qnabot/blob/main/docs/canvaslms_integration.md \ No newline at end of file +Imports sample questions for interacting with Canvas LMS. More details: https://github.com/aws-solutions/qnabot-on-aws/blob/main/docs/canvaslms_integration.md \ No newline at end of file diff --git a/source/templates/examples/extensions/ui_imports/package-lock.json b/source/templates/examples/extensions/ui_imports/package-lock.json index 2afc79de..4a0a1c41 100644 --- a/source/templates/examples/extensions/ui_imports/package-lock.json +++ b/source/templates/examples/extensions/ui_imports/package-lock.json @@ -1,12 +1,12 @@ { "name": "ui_import", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ui_import", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "dependencies": { "cfn-response": "^1.0.1", diff --git a/source/templates/examples/extensions/ui_imports/package.json b/source/templates/examples/extensions/ui_imports/package.json index 3d46aee0..15756c8e 100644 --- a/source/templates/examples/extensions/ui_imports/package.json +++ b/source/templates/examples/extensions/ui_imports/package.json @@ -1,6 +1,6 @@ { "name": "ui_import", - "version": "6.0.0", + "version": "6.0.1", "description": "Add new content packages for Content Designer Import Examples/Extensions listing", "main": "ui_import.js", "scripts": { diff --git a/source/templates/import/__snapshots__/index.test.js.snap b/source/templates/import/__snapshots__/index.test.js.snap index 9003b277..a26fa18d 100644 --- a/source/templates/import/__snapshots__/index.test.js.snap +++ b/source/templates/import/__snapshots__/index.test.js.snap @@ -493,9 +493,17 @@ exports[`renders import template correctly 1`] = ` "bedrock:InvokeModel", ], "Effect": "Allow", - "Resource": { - "Fn::Sub": "arn:\${AWS::Partition}:bedrock:\${AWS::Region}::foundation-model/\${EmbeddingsBedrockModelId}", - }, + "Resource": [ + { + "Fn::Sub": "arn:\${AWS::Partition}:bedrock:\${AWS::Region}::foundation-model/amazon.titan-embed-text-v1", + }, + { + "Fn::Sub": "arn:\${AWS::Partition}:bedrock:\${AWS::Region}::foundation-model/cohere.embed-english-v3", + }, + { + "Fn::Sub": "arn:\${AWS::Partition}:bedrock:\${AWS::Region}::foundation-model/cohere.embed-multilingual-v3", + }, + ], }, ], "Version": "2012-10-17", diff --git a/source/templates/import/resources.js b/source/templates/import/resources.js index c6bb707c..9b07ad55 100644 --- a/source/templates/import/resources.js +++ b/source/templates/import/resources.js @@ -200,7 +200,11 @@ module.exports = Object.assign(require('./bucket'), { Action: [ "bedrock:InvokeModel", ], - Resource: { 'Fn::Sub': 'arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/${EmbeddingsBedrockModelId}' }, + Resource: [ + { 'Fn::Sub': 'arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/amazon.titan-embed-text-v1' }, + { 'Fn::Sub': 'arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-english-v3' }, + { 'Fn::Sub': 'arn:${AWS::Partition}:bedrock:${AWS::Region}::foundation-model/cohere.embed-multilingual-v3' }, + ], }, ], }, diff --git a/source/templates/master/__snapshots__/index.test.js.snap b/source/templates/master/__snapshots__/index.test.js.snap index 3a8d99cc..3ca55620 100644 --- a/source/templates/master/__snapshots__/index.test.js.snap +++ b/source/templates/master/__snapshots__/index.test.js.snap @@ -1091,7 +1091,7 @@ exports[`Verify master template is correct renders master template correctly 1`] "AllowedPattern": "[^ ]+", "ConstraintDescription": "Must be a valid comma separated list of Locale IDs", "Default": "en_US,es_US,fr_CA", - "Description": "Languages for QnABot on AWS voice interaction using LexV2. Specify as a comma separated list of valid Locale IDs without empty spaces - see https://github.com/aws-solutions/aws-qnabot/blob/main/docs/multilanguage_support/README.md#supported-languages", + "Description": "Languages for QnABot on AWS voice interaction using LexV2. Specify as a comma separated list of valid Locale IDs without empty spaces - see https://github.com/aws-solutions/qnabot-on-aws/blob/main/source/docs/multilanguage_support/README.md#supported-languages", "Type": "String", }, "OpenSearchDashboardsRetentionMinutes": { @@ -1216,6 +1216,7 @@ exports[`Verify master template is correct renders master template correctly 1`] "guard": { "SuppressedRules": [ "IAM_NO_INLINE_POLICY_CHECK", + "CFN_NO_EXPLICIT_RESOURCE_NAMES", ], }, }, @@ -1338,6 +1339,37 @@ exports[`Verify master template is correct renders master template correctly 1`] "PolicyName": "apiAccess", }, ], + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": [ + "0", + { + "Fn::Split": [ + "-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId", + }, + ], + }, + ], + }, + ], + }, + ], + }, + "-AdminRole", + ], + ], + }, }, "Type": "AWS::IAM::Role", }, @@ -2832,11 +2864,46 @@ exports[`Verify master template is correct renders master template correctly 1`] "iam:PassRole", ], "Effect": "Allow", - "Resource": [ - { - "Fn::Sub": "arn:\${AWS::Partition}:iam::\${AWS::AccountId}:role/\${AWS::StackName}-*", - }, - ], + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition", + }, + ":iam::", + { + "Ref": "AWS::AccountId", + }, + ":role/", + { + "Fn::Select": [ + "0", + { + "Fn::Split": [ + "-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId", + }, + ], + }, + ], + }, + ], + }, + ], + }, + "-*", + ], + ], + }, }, { "Action": [ @@ -10337,6 +10404,13 @@ exports.documents = (event, context, callback) => { "Type": "Custom::LexBot", }, "LexBotPolicy": { + "Metadata": { + "guard": { + "SuppressedRules": [ + "IAM_POLICY_NON_COMPLIANT_ARN", + ], + }, + }, "Properties": { "PolicyDocument": { "Statement": [ @@ -13598,6 +13672,7 @@ function message(code, name) { "guard": { "SuppressedRules": [ "IAM_NO_INLINE_POLICY_CHECK", + "CFN_NO_EXPLICIT_RESOURCE_NAMES", ], }, }, @@ -13640,6 +13715,37 @@ function message(code, name) { "PolicyName": "OpenSearchDashboardsAccessPolicy", }, ], + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": [ + "0", + { + "Fn::Split": [ + "-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId", + }, + ], + }, + ], + }, + ], + }, + ], + }, + "-OpenSearchDashboardsRole", + ], + ], + }, }, "Type": "AWS::IAM::Role", }, @@ -18023,6 +18129,7 @@ exports.handler = (event, context, callback) => { "guard": { "SuppressedRules": [ "IAM_NO_INLINE_POLICY_CHECK", + "CFN_NO_EXPLICIT_RESOURCE_NAMES", ], }, }, @@ -18050,6 +18157,37 @@ exports.handler = (event, context, callback) => { "Version": "2012-10-17", }, "Path": "/", + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": [ + "0", + { + "Fn::Split": [ + "-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId", + }, + ], + }, + ], + }, + ], + }, + ], + }, + "-UnauthenticatedRole", + ], + ], + }, }, "Type": "AWS::IAM::Role", }, @@ -18226,6 +18364,7 @@ exports.handler = (event, context, callback) => { "guard": { "SuppressedRules": [ "IAM_NO_INLINE_POLICY_CHECK", + "CFN_NO_EXPLICIT_RESOURCE_NAMES", ], }, }, @@ -18253,6 +18392,37 @@ exports.handler = (event, context, callback) => { "Version": "2012-10-17", }, "Path": "/", + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": [ + "0", + { + "Fn::Split": [ + "-", + { + "Fn::Select": [ + 2, + { + "Fn::Split": [ + "/", + { + "Ref": "AWS::StackId", + }, + ], + }, + ], + }, + ], + }, + ], + }, + "-UserRole", + ], + ], + }, }, "Type": "AWS::IAM::Role", }, diff --git a/source/templates/master/index.js b/source/templates/master/index.js index 9f6cf715..a97a5fa4 100644 --- a/source/templates/master/index.js +++ b/source/templates/master/index.js @@ -382,7 +382,7 @@ module.exports = { }, LexV2BotLocaleIds: { Description: - 'Languages for QnABot on AWS voice interaction using LexV2. Specify as a comma separated list of valid Locale IDs without empty spaces - see https://github.com/aws-solutions/aws-qnabot/blob/main/docs/multilanguage_support/README.md#supported-languages', + 'Languages for QnABot on AWS voice interaction using LexV2. Specify as a comma separated list of valid Locale IDs without empty spaces - see https://github.com/aws-solutions/qnabot-on-aws/blob/main/source/docs/multilanguage_support/README.md#supported-languages', Type: 'String', Default: 'en_US,es_US,fr_CA', AllowedPattern: '[^ ]+', diff --git a/source/templates/master/lex/fulfillment.js b/source/templates/master/lex/fulfillment.js index c7c3ff1b..1b787819 100644 --- a/source/templates/master/lex/fulfillment.js +++ b/source/templates/master/lex/fulfillment.js @@ -245,6 +245,9 @@ module.exports = { }, Roles: [{ Ref: 'FulfillmentLambdaRole' }], }, + Metadata: { + guard: util.cfnGuard('IAM_POLICY_NON_COMPLIANT_ARN'), + }, }, FulfillmentLambdaRole: { Type: 'AWS::IAM::Role', diff --git a/source/templates/master/roles.json b/source/templates/master/roles.json index 0e8917ed..18d71ad9 100644 --- a/source/templates/master/roles.json +++ b/source/templates/master/roles.json @@ -2,7 +2,7 @@ "OpenSearchDashboardsRole": { "Type": "AWS::IAM::Role", "Metadata": { - "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK"] } + "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK", "CFN_NO_EXPLICIT_RESOURCE_NAMES"] } }, "Properties": { "AssumeRolePolicyDocument": { @@ -24,6 +24,30 @@ } ] }, + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": ["0", + { + "Fn::Split": ["-", + { + "Fn::Select" : [2, + { + "Fn::Split": ["/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + }] + }] + }, + "-OpenSearchDashboardsRole" + ] + ]}, "Path": "/", "Policies": [ { @@ -71,6 +95,30 @@ ] }, "Path": "/", + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": ["0", + { + "Fn::Split": ["-", + { + "Fn::Select" : [2, + { + "Fn::Split": ["/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + }] + }] + }, + "-AdminRole" + ] + ]}, "Policies": [ { "PolicyName": "apiAccess", @@ -176,13 +224,13 @@ } ] }, - "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK"] } + "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK", "CFN_NO_EXPLICIT_RESOURCE_NAMES"] } } }, "UserRole": { "Type": "AWS::IAM::Role", "Metadata": { - "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK"] } + "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK", "CFN_NO_EXPLICIT_RESOURCE_NAMES"] } }, "Properties": { "AssumeRolePolicyDocument": { @@ -207,13 +255,37 @@ } ] }, - "Path": "/" + "Path": "/", + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": ["0", + { + "Fn::Split": ["-", + { + "Fn::Select" : [2, + { + "Fn::Split": ["/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + }] + }] + }, + "-UserRole" + ] + ]} } }, "UnauthenticatedRole": { "Type": "AWS::IAM::Role", "Metadata": { - "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK"] } + "guard": { "SuppressedRules": ["IAM_NO_INLINE_POLICY_CHECK","CFN_NO_EXPLICIT_RESOURCE_NAMES"] } }, "Properties": { "AssumeRolePolicyDocument": { @@ -238,7 +310,31 @@ } ] }, - "Path": "/" + "Path": "/", + "RoleName": { + "Fn::Join": [ + "", + [ + { + "Fn::Select": ["0", + { + "Fn::Split": ["-", + { + "Fn::Select" : [2, + { + "Fn::Split": ["/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + }] + }] + }, + "-UnauthenticatedRole" + ] + ]} } }, "CFNLambdaRole": { @@ -344,11 +440,41 @@ "Action": [ "iam:PassRole" ], - "Resource": [ - { - "Fn::Sub": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/${AWS::StackName}-*" - } - ] + "Resource": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":role/", + { + "Fn::Select": ["0", + { + "Fn::Split": ["-", + { + "Fn::Select" : [2, + { + "Fn::Split": ["/", + { + "Ref": "AWS::StackId" + } + ] + } + ] + }] + }] + }, + "-*" + ] + ] + } + }, { "Effect": "Allow", diff --git a/source/templates/package-lock.json b/source/templates/package-lock.json index 9ed3878f..131c7f34 100644 --- a/source/templates/package-lock.json +++ b/source/templates/package-lock.json @@ -1,12 +1,12 @@ { "name": "qnabot-on-aws-infrastructure", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "qnabot-on-aws-infrastructure", - "version": "6.0.0", + "version": "6.0.1", "license": "Apache-2.0", "devDependencies": { "@aws-sdk/client-s3": "3.511.0", @@ -3339,12 +3339,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3810,9 +3810,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" diff --git a/source/templates/package.json b/source/templates/package.json index 30f21656..c72f4977 100644 --- a/source/templates/package.json +++ b/source/templates/package.json @@ -1,6 +1,6 @@ { "name": "qnabot-on-aws-infrastructure", - "version": "6.0.0", + "version": "6.0.1", "description": "QnABot infrastructure", "scripts": { "clean": "rm -rf node_modules", diff --git a/source/website/js/components/customTranslate.vue b/source/website/js/components/customTranslate.vue index 9551f6df..6e27cd50 100644 --- a/source/website/js/components/customTranslate.vue +++ b/source/website/js/components/customTranslate.vue @@ -17,7 +17,7 @@ v-container(id="page-import") v-card v-card-title.text-h4.pa-6 Import Translate Custom Terminologies v-card-text.pb-0.pl-6.pr-6 - h3 For more information about Amazon Translate custom terminologies, see here + h3 For more information about Amazon Translate custom terminologies, see here v-card-text(v-if="!IsCustomTerminologyEnabled") p Set ENABLE_CUSTOM_TERMINOLOGY to true in settings to enable the use of terminology files for Amazon Translate v-card-text.pl-6.pr-6(v-if="IsCustomTerminologyEnabled") diff --git a/source/website/js/components/import.vue b/source/website/js/components/import.vue index bcbca772..902bfeac 100644 --- a/source/website/js/components/import.vue +++ b/source/website/js/components/import.vue @@ -103,7 +103,7 @@ module.exports = { importWarning: 'Warning, Importing will over write existing QnAs with the same ID
' + 'You can import either a JSON file exported from QnABot or a properly
' - + 'formatted Excel file. For the file format, see here.', + + 'formatted Excel file. For the file format, see here.', loading: false, testing: false, url: '', diff --git a/source/website/js/components/kendraIndex.vue b/source/website/js/components/kendraIndex.vue index 0953a7f8..ea9f5823 100644 --- a/source/website/js/components/kendraIndex.vue +++ b/source/website/js/components/kendraIndex.vue @@ -17,7 +17,7 @@ v-container#page-import v-card v-card-title.text-h4.pa-6 Kendra Web Crawling v-card-text.pb-0.pl-6.pr-6 - h3 For more information about Kendra Web Crawling, see here + h3 For more information about Kendra Web Crawling, see here v-card-text(v-if="!kendraIndexerEnabled").pa-6 h4 To Enable Kendra Web Crawling, following configuration is required. br diff --git a/source/website/js/components/settings.vue b/source/website/js/components/settings.vue index 773c1820..7a76f9e4 100644 --- a/source/website/js/components/settings.vue +++ b/source/website/js/components/settings.vue @@ -25,7 +25,7 @@ v-container() v-card-title h2 Settings v-card-text - h3 For more information about settings, see here + h3 For more information about settings, see here template( v-for="(headerSetting,headerIndex) in settingsMap" :key="headerIndex"