Added optional "customMetadataField" for Amazon Aurora knowledge bases, allowing single-column metadata. Also added optional "textIndexName" for MongoDB Atlas knowledge bases, enabling hybrid search support.

Author: aws-sdk-dotnet-automation

generator/ServiceModels/bedrock-agent/bedrock-agent-2023-06-05.api.json

@@ -5307,6 +5307,7 @@
         "endpoint":{"shape":"MongoDbAtlasEndpoint"},
         "endpointServiceName":{"shape":"MongoDbAtlasEndpointServiceName"},
         "fieldMapping":{"shape":"MongoDbAtlasFieldMapping"},
+        "textIndexName":{"shape":"MongoDbAtlasIndexName"},
         "vectorIndexName":{"shape":"MongoDbAtlasIndexName"}
       }
     },
@@ -6047,6 +6048,7 @@
         "vectorField"
       ],
       "members":{
+        "customMetadataField":{"shape":"ColumnName"},
         "metadataField":{"shape":"ColumnName"},
         "primaryKeyField":{"shape":"ColumnName"},
         "textField":{"shape":"ColumnName"},

generator/ServiceModels/bedrock-agent/bedrock-agent-2023-06-05.docs.json

@@ -558,6 +558,7 @@
     "ColumnName": {
       "base": null,
       "refs": {
+        "RdsFieldMapping$customMetadataField": "<p>Provide a name for the universal metadata field where Amazon Bedrock will store any custom metadata from your data source.</p>",
         "RdsFieldMapping$metadataField": "<p>The name of the field in which Amazon Bedrock stores metadata about the vector store.</p>",
         "RdsFieldMapping$primaryKeyField": "<p>The name of the field in which Amazon Bedrock stores the ID for each entry.</p>",
         "RdsFieldMapping$textField": "<p>The name of the field in which Amazon Bedrock stores the raw text from your data. The text is split according to the chunking strategy you choose.</p>",
@@ -2795,6 +2796,7 @@
     "MongoDbAtlasIndexName": {
       "base": null,
       "refs": {
+        "MongoDbAtlasConfiguration$textIndexName": "<p>The name of the text search index in the MongoDB collection. This is required for using the hybrid search feature.</p>",
         "MongoDbAtlasConfiguration$vectorIndexName": "<p>The name of the MongoDB Atlas vector search index.</p>"
       }
     },

generator/ServiceModels/bedrock-agent/bedrock-agent-2023-06-05.normal.json

@@ -7639,6 +7639,10 @@
           "shape":"MongoDbAtlasFieldMapping",
           "documentation":"<p>Contains the names of the fields to which to map information about the vector store.</p>"
         },
+        "textIndexName":{
+          "shape":"MongoDbAtlasIndexName",
+          "documentation":"<p>The name of the text search index in the MongoDB collection. This is required for using the hybrid search feature.</p>"
+        },
         "vectorIndexName":{
           "shape":"MongoDbAtlasIndexName",
           "documentation":"<p>The name of the MongoDB Atlas vector search index.</p>"
@@ -8749,6 +8753,10 @@
         "vectorField"
       ],
       "members":{
+        "customMetadataField":{
+          "shape":"ColumnName",
+          "documentation":"<p>Provide a name for the universal metadata field where Amazon Bedrock will store any custom metadata from your data source.</p>"
+        },
         "metadataField":{
           "shape":"ColumnName",
           "documentation":"<p>The name of the field in which Amazon Bedrock stores metadata about the vector store.</p>"

sdk/code-analysis/ServiceAnalysis/BedrockAgent/Generated/PropertyValueRules.xml

@@ -2417,6 +2417,12 @@
     <max>255</max>
     <pattern>^(?:arn:aws(?:-us-gov|-cn|-iso|-iso-[a-z])*:.+:.*:\d+:.+/.+$|[a-zA-Z0-9*]+[a-zA-Z0-9._-]*)$</pattern>
   </property-value-rule>
+  <property-value-rule>
+    <property>Amazon.BedrockAgent.Model.MongoDbAtlasConfiguration.TextIndexName</property>
+    <min>0</min>
+    <max>2048</max>
+    <pattern>^.*$</pattern>
+  </property-value-rule>
   <property-value-rule>
     <property>Amazon.BedrockAgent.Model.MongoDbAtlasConfiguration.VectorIndexName</property>
     <min>0</min>
@@ -2722,6 +2728,12 @@
     <max>63</max>
     <pattern>^[a-zA-Z0-9_\.\-]+$</pattern>
   </property-value-rule>
+  <property-value-rule>
+    <property>Amazon.BedrockAgent.Model.RdsFieldMapping.CustomMetadataField</property>
+    <min>0</min>
+    <max>63</max>
+    <pattern>^[a-zA-Z0-9_\-]+$</pattern>
+  </property-value-rule>
   <property-value-rule>
     <property>Amazon.BedrockAgent.Model.RdsFieldMapping.MetadataField</property>
     <min>0</min>

sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/MongoDbAtlasConfigurationMarshaller.cs

@@ -89,6 +89,12 @@ public void Marshall(MongoDbAtlasConfiguration requestObject, JsonMarshallerCont
                 context.Writer.WriteObjectEnd();
             }
 
+            if(requestObject.IsSetTextIndexName())
+            {
+                context.Writer.WritePropertyName("textIndexName");
+                context.Writer.Write(requestObject.TextIndexName);
+            }
+
             if(requestObject.IsSetVectorIndexName())
             {
                 context.Writer.WritePropertyName("vectorIndexName");

sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/MongoDbAtlasConfigurationUnmarshaller.cs

@@ -102,6 +102,12 @@ public MongoDbAtlasConfiguration Unmarshall(JsonUnmarshallerContext context)
                     unmarshalledObject.FieldMapping = unmarshaller.Unmarshall(context);
                     continue;
                 }
+                if (context.TestExpression("textIndexName", targetDepth))
+                {
+                    var unmarshaller = StringUnmarshaller.Instance;
+                    unmarshalledObject.TextIndexName = unmarshaller.Unmarshall(context);
+                    continue;
+                }
                 if (context.TestExpression("vectorIndexName", targetDepth))
                 {
                     var unmarshaller = StringUnmarshaller.Instance;

sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/RdsFieldMappingMarshaller.cs

@@ -48,6 +48,12 @@ public void Marshall(RdsFieldMapping requestObject, JsonMarshallerContext contex
         {
             if(requestObject == null)
                 return;
+            if(requestObject.IsSetCustomMetadataField())
+            {
+                context.Writer.WritePropertyName("customMetadataField");
+                context.Writer.Write(requestObject.CustomMetadataField);
+            }
+
             if(requestObject.IsSetMetadataField())
             {
                 context.Writer.WritePropertyName("metadataField");

sdk/src/Services/BedrockAgent/Generated/Model/Internal/MarshallTransformations/RdsFieldMappingUnmarshaller.cs

@@ -66,6 +66,12 @@ public RdsFieldMapping Unmarshall(JsonUnmarshallerContext context)
             int targetDepth = context.CurrentDepth;
             while (context.ReadAtDepth(targetDepth))
             {
+                if (context.TestExpression("customMetadataField", targetDepth))
+                {
+                    var unmarshaller = StringUnmarshaller.Instance;
+                    unmarshalledObject.CustomMetadataField = unmarshaller.Unmarshall(context);
+                    continue;
+                }
                 if (context.TestExpression("metadataField", targetDepth))
                 {
                     var unmarshaller = StringUnmarshaller.Instance;

sdk/src/Services/BedrockAgent/Generated/Model/MongoDbAtlasConfiguration.cs

@@ -41,6 +41,7 @@ public partial class MongoDbAtlasConfiguration
         private string _endpoint;
         private string _endpointServiceName;
         private MongoDbAtlasFieldMapping _fieldMapping;
+        private string _textIndexName;
         private string _vectorIndexName;
 
         /// <summary>
@@ -159,6 +160,26 @@ internal bool IsSetFieldMapping()
             return this._fieldMapping != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property TextIndexName. 
+        /// <para>
+        /// The name of the text search index in the MongoDB collection. This is required for
+        /// using the hybrid search feature.
+        /// </para>
+        /// </summary>
+        [AWSProperty(Min=0, Max=2048)]
+        public string TextIndexName
+        {
+            get { return this._textIndexName; }
+            set { this._textIndexName = value; }
+        }
+
+        // Check to see if TextIndexName property is set
+        internal bool IsSetTextIndexName()
+        {
+            return this._textIndexName != null;
+        }
+
         /// <summary>
         /// Gets and sets the property VectorIndexName. 
         /// <para>

sdk/src/Services/BedrockAgent/Generated/Model/RdsFieldMapping.cs

@@ -34,11 +34,32 @@ namespace Amazon.BedrockAgent.Model
     /// </summary>
     public partial class RdsFieldMapping
     {
+        private string _customMetadataField;
         private string _metadataField;
         private string _primaryKeyField;
         private string _textField;
         private string _vectorField;
 
+        /// <summary>
+        /// Gets and sets the property CustomMetadataField. 
+        /// <para>
+        /// Provide a name for the universal metadata field where Amazon Bedrock will store any
+        /// custom metadata from your data source.
+        /// </para>
+        /// </summary>
+        [AWSProperty(Min=0, Max=63)]
+        public string CustomMetadataField
+        {
+            get { return this._customMetadataField; }
+            set { this._customMetadataField = value; }
+        }
+
+        // Check to see if CustomMetadataField property is set
+        internal bool IsSetCustomMetadataField()
+        {
+            return this._customMetadataField != null;
+        }
+
         /// <summary>
         /// Gets and sets the property MetadataField. 
         /// <para>