From adfbc780f3d20c23ae06d0c8188aa5cedaac45ea Mon Sep 17 00:00:00 2001
From: Sandeep Singh <snghigf@amazon.com>
Date: Mon, 13 May 2024 15:20:13 -0500
Subject: [PATCH] reduced the questionaaires

---
 .../templates/kb-infra-template.template      |  3 ++
 .../templates/main-template-out-tmp.yml       | 36 +++++++++----------
 .../templates/main-template-out.yml           | 36 +++++++++----------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/kb-infra-template.template b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/kb-infra-template.template
index 09cff553..5e4524ad 100644
--- a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/kb-infra-template.template
+++ b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/kb-infra-template.template
@@ -28,12 +28,15 @@ Parameters:
   Q10pVectorFieldName:
     Type: String
     Description: Vector field name
+    Default: bedrock-knowledge-base-default-vector
   Q11pMetaDataFieldName:
     Type: String
     Description: Metadata field name
+    Default: AMAZON_BEDROCK_METADATA
   Q12pTextFieldName:
     Type: String
     Description: Text field name
+    Default: AMAZON_BEDROCK_TEXT_CHUNK
   pCollectionArn:
     Type: String
     Description: Name of the Collection Arn
diff --git a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out-tmp.yml b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out-tmp.yml
index ce2467f2..7855f2d5 100644
--- a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out-tmp.yml
+++ b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out-tmp.yml
@@ -53,18 +53,18 @@ Parameters:
     Default: e2e-rag-index
     AllowedPattern: ^[a-z0-9](-*[a-z0-9])*
     ConstraintDescription: Must be lowercase or numbers with a length of 1-63 characters
-  Q10pVectorFieldName:
-    Type: String
-    Description: Vector field name
-    Default: bedrock-knowledge-base-default-vector
-  Q11pMetaDataFieldName:
-    Type: String
-    Description: Metadata field name
-    Default: AMAZON_BEDROCK_METADATA
-  Q12pTextFieldName:
-    Type: String
-    Description: Text field name
-    Default: AMAZON_BEDROCK_TEXT_CHUNK
+  # Q10pVectorFieldName:
+  #   Type: String
+  #   Description: Vector field name
+  #   Default: bedrock-knowledge-base-default-vector
+  # Q11pMetaDataFieldName:
+  #   Type: String
+  #   Description: Metadata field name
+  #   Default: AMAZON_BEDROCK_METADATA
+  # Q12pTextFieldName:
+  #   Type: String
+  #   Description: Text field name
+  #   Default: AMAZON_BEDROCK_TEXT_CHUNK
 Resources:
   KbRoleStack:
     Type: AWS::CloudFormation::Stack
@@ -118,12 +118,12 @@ Resources:
           Ref: Q08pCollectionName
         Q09pIndexName:
           Ref: Q09pIndexName
-        Q10pVectorFieldName:
-          Ref: Q10pVectorFieldName
-        Q11pMetaDataFieldName:
-          Ref: Q11pMetaDataFieldName
-        Q12pTextFieldName:
-          Ref: Q12pTextFieldName
+        # Q10pVectorFieldName:
+        #   Ref: Q10pVectorFieldName
+        # Q11pMetaDataFieldName:
+        #   Ref: Q11pMetaDataFieldName
+        # Q12pTextFieldName:
+        #   Ref: Q12pTextFieldName
         pCollectionArn:
           Fn::GetAtt:
           - OSSInfraStack
diff --git a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out.yml b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out.yml
index 0f038fa4..eafff102 100644
--- a/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out.yml
+++ b/knowledge-bases/03-infra/e2e-rag-using-bedrock-kb-cfn/templates/main-template-out.yml
@@ -53,18 +53,18 @@ Parameters:
     Default: e2e-rag-index
     AllowedPattern: ^[a-z0-9](-*[a-z0-9])*
     ConstraintDescription: Must be lowercase or numbers with a length of 1-63 characters
-  Q10pVectorFieldName:
-    Type: String
-    Description: Vector field name
-    Default: bedrock-knowledge-base-default-vector
-  Q11pMetaDataFieldName:
-    Type: String
-    Description: Metadata field name
-    Default: AMAZON_BEDROCK_METADATA
-  Q12pTextFieldName:
-    Type: String
-    Description: Text field name
-    Default: AMAZON_BEDROCK_TEXT_CHUNK
+  # Q10pVectorFieldName:
+  #   Type: String
+  #   Description: Vector field name
+  #   Default: bedrock-knowledge-base-default-vector
+  # Q11pMetaDataFieldName:
+  #   Type: String
+  #   Description: Metadata field name
+  #   Default: AMAZON_BEDROCK_METADATA
+  # Q12pTextFieldName:
+  #   Type: String
+  #   Description: Text field name
+  #   Default: AMAZON_BEDROCK_TEXT_CHUNK
 Resources:
   KbRoleStack:
     Type: AWS::CloudFormation::Stack
@@ -118,12 +118,12 @@ Resources:
           Ref: Q08pCollectionName
         Q09pIndexName:
           Ref: Q09pIndexName
-        Q10pVectorFieldName:
-          Ref: Q10pVectorFieldName
-        Q11pMetaDataFieldName:
-          Ref: Q11pMetaDataFieldName
-        Q12pTextFieldName:
-          Ref: Q12pTextFieldName
+        # Q10pVectorFieldName:
+        #   Ref: Q10pVectorFieldName
+        # Q11pMetaDataFieldName:
+        #   Ref: Q11pMetaDataFieldName
+        # Q12pTextFieldName:
+        #   Ref: Q12pTextFieldName
         pCollectionArn:
           Fn::GetAtt:
           - OSSInfraStack