Update to version v7.0.3

Merge pull request #817 from aws-solutions/feature/v7.0.3

Author: ihmaws

.gitignore

@@ -113,4 +113,5 @@ Pipfile.lock
 .viperlightrc
 
 # Lambda requirements.txt files
-**/requirements.txt
+**/requirements.txt
+.aider*

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.3] - 2025-03-27
+
+### Fixed
+
+- Update SSM parameter migration to only migrate specified parameters [Issue #815](https://github.com/aws-solutions/qnabot-on-aws/issues/815)
+
 ## [7.0.2] - 2025-03-13
 
 ### Security

README.md

@@ -361,10 +361,8 @@ 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
-- [v7.0.2](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v7.0.2) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.2/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.2/qnabot-on-aws-vpc.template)
-- [v7.0.1](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v7.0.1) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.1/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.1/qnabot-on-aws-vpc.template)
-- [v7.0.0](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v7.0.0) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.0/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.0/qnabot-on-aws-vpc.template)
-  - _Note: Lambda Runtimes have been updated this release. Solution now uses: [**nodejs20** and python3.10]_
+- [v7.0.3](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v7.0.3) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.3/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v7.0.3/qnabot-on-aws-vpc.template)
+  - _Note: Lambda Runtimes have been updated in the v7.0.0 release. Solution now uses: [**nodejs20** and python3.10]_
 - [v6.1.5](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.5) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.5/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.5/qnabot-on-aws-vpc.template)
 - [v6.1.4](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.4) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.4/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.4/qnabot-on-aws-vpc.template)
 - [v6.1.3](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.3) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.3/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.3/qnabot-on-aws-vpc.template)

source/cli/aws_solutions/qnabot/cli/qnabot_cli.py

@@ -15,7 +15,7 @@
 @click.pass_context
 def cli(ctx) -> None:
     os.environ["SOLUTION_ID"] = "SO0189"
-    os.environ["SOLUTION_VERSION"] = "v7.0.2"
+    os.environ["SOLUTION_VERSION"] = "v7.0.3"
 
 
 @cli.command("import")

source/lambda/aws-sdk-layer/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "aws-layer",
-    "version": "7.0.2",
+    "version": "7.0.3",
     "description": "QnABot Lambda aws-sdk-layer",
     "main": "index.js",
     "scripts": {

source/lambda/aws-sdk-layer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cfn-lambda-layer",
-    "version": "7.0.2",
+    "version": "7.0.3",
     "description": "QnABot Cfn Lambda Layer",
     "main": "index.js",
     "scripts": {

source/lambda/cfn-lambda-layer/package-lock.json

@@ -4,7 +4,7 @@
  ************************************************************************************************ */
 
 const { DynamoDBClient, PutItemCommand, UpdateItemCommand, GetItemCommand } = require('@aws-sdk/client-dynamodb');
-const { SSMClient, GetParameterCommand, DeleteParameterCommand ,DescribeParametersCommand } = require('@aws-sdk/client-ssm');
+const { SSMClient, GetParameterCommand } = require('@aws-sdk/client-ssm');
 const { marshall } = require('@aws-sdk/util-dynamodb');
 const customSdkConfig = require('./util/customSdkConfig');
 const settingsJson = require('./DefaultSettings.json');
@@ -227,11 +227,6 @@ async function migrateFromSSM(tableName, ssmParameters) {
                         }
                 }
             }
-            const deleteParams = {
-                Name: ssmParameter
-            };
-            const deleteCommand = new DeleteParameterCommand(deleteParams)
-            await ssm.send(deleteCommand);
         }
         catch(error) {
             throw new Error(`Error migrating from SSM: ${error}`);
@@ -240,39 +235,6 @@ async function migrateFromSSM(tableName, ssmParameters) {
     }
 }
 
-async function getSSMParameters() {
-    const prefixes = [
-        'CFN-CustomQnABotSettings',
-        'CFN-DefaultQnABotSettings',
-        'CFN-PrivateQnABotSettings'
-    ];
-
-    let ssmParameters = []
-
-    for (const prefix of prefixes) {
-        const describeParams = {
-            ParameterFilters: [
-                {
-                    Key: "Name",
-                    Option: "BeginsWith",
-                    Values: [prefix]
-                }
-            ],
-            MaxResults: 1
-        };
-        const describeCommand = new DescribeParametersCommand(describeParams);
-        const describeResponse = await ssm.send(describeCommand);
-
-        if (describeResponse.Parameters.length > 0) {
-            ssmParameters = ssmParameters.concat(describeResponse.Parameters[0].Name);
-        }
-    }
-
-    return ssmParameters;
-}
-
-
-
 module.exports = class SettingsInitializer {
 
     async Create(params, reply) {
@@ -281,12 +243,18 @@ module.exports = class SettingsInitializer {
             let writePrivateSettings = true;
             // Initialize settings (will only add new settings if table is not empty)
             await writeSettingsToDynamoDB(SettingsTable, settingsJson);
-            const ssmParameters = await getSSMParameters();
+            
+            // Only migrate parameters that were explicitly passed to this function
+            const ssmParameters = [
+                params.DefaultSettingsParameter,
+                params.PrivateSettingsParameter,
+                params.CustomSettingsParameter
+            ]
 
             if (ssmParameters.length > 0) {
-                console.log('Legacy SSM parameters found. Performing migration from SSM to DynamoDB');
+                console.log(`Migrating specific SSM parameters: ${ssmParameters.join(', ')}`);
                 await migrateFromSSM(SettingsTable, ssmParameters);
-                writePrivateSettings = false
+                writePrivateSettings = false;
             } 
 
             await updatePrivateSettings(params, SettingsTable, writePrivateSettings);
@@ -323,5 +291,3 @@ module.exports = class SettingsInitializer {
         reply(null, ID, { FnGetAttrsDataObj: { Settings: "Deleted" } });
     }
 }
-
-