feat: tls index add user innner key value

张哲铭 · 张哲铭 · commit a1c45cdb0e92 · 2023-09-11T16:05:45.000+08:00
diff --git a/example/dataTlsIndexes/main.tf b/example/dataTlsIndexes/main.tf
@@ -1,3 +1,3 @@
 data "volcengine_tls_indexes" "default" {
-  ids = ["65d67d34-c5b4-4ec8-b3a9-175d3366****"]
+  ids = ["7ce12237-6670-44a7-9d79-2e36961586e6"]
 }
diff --git a/example/tlsIndex/main.tf b/example/tlsIndex/main.tf
@@ -1,11 +1,11 @@
 resource "volcengine_tls_index" "foo" {
-  topic_id = "65d67d34-c5b4-4ec8-b3a9-175d3366****"
+  topic_id = "7ce12237-6670-44a7-9d79-2e36961586e6"
 
-  full_text {
-    case_sensitive = true
-    delimiter = "!"
-    include_chinese = false
-  }
+#  full_text {
+#    case_sensitive = true
+#    delimiter = "!"
+#    include_chinese = false
+#  }
 
   key_value {
     key = "k1"
@@ -15,11 +15,11 @@ resource "volcengine_tls_index" "foo" {
     include_chinese = false
     sql_flag = false
     json_keys {
-      key = "k2.k4"
+      key = "class"
       value_type = "text"
     }
     json_keys {
-      key = "k3.k4"
+      key = "age"
       value_type = "long"
     }
   }
@@ -32,4 +32,21 @@ resource "volcengine_tls_index" "foo" {
     include_chinese = false
     sql_flag = false
   }
+
+  user_inner_key_value {
+    key = "__content__"
+    value_type = "json"
+    delimiter = ",:-/ "
+    case_sensitive = false
+    include_chinese = false
+    sql_flag = false
+    json_keys {
+      key = "age"
+      value_type = "long"
+    }
+    json_keys {
+      key = "name"
+      value_type = "long"
+    }
+  }
 }
diff --git a/volcengine/tls/index/data_source_volcengine_tls_indexes.go b/volcengine/tls/index/data_source_volcengine_tls_indexes.go
@@ -157,6 +157,84 @@ func DataSourceVolcengineTlsIndexes() *schema.Resource {
 								},
 							},
 						},
+						"user_inner_key_value": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "The reserved field index configuration of the tls topic.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"key": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The key of the KeyValue index.",
+									},
+									"value_type": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The type of value.",
+									},
+									"case_sensitive": {
+										Type:        schema.TypeBool,
+										Computed:    true,
+										Description: "Whether the value is case sensitive.",
+									},
+									"delimiter": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The delimiter of the value.",
+									},
+									"include_chinese": {
+										Type:        schema.TypeBool,
+										Computed:    true,
+										Description: "Whether the value include chinese.",
+									},
+									"sql_flag": {
+										Type:        schema.TypeBool,
+										Computed:    true,
+										Description: "Whether the filed is enabled for analysis.",
+									},
+									"json_keys": {
+										Type:        schema.TypeList,
+										Computed:    true,
+										Description: "The JSON subfield key value index.",
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"key": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "The key of the subfield key value index.",
+												},
+												"value_type": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "The type of value.",
+												},
+												"case_sensitive": {
+													Type:        schema.TypeBool,
+													Computed:    true,
+													Description: "Whether the value is case sensitive.",
+												},
+												"delimiter": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "The delimiter of the value.",
+												},
+												"include_chinese": {
+													Type:        schema.TypeBool,
+													Computed:    true,
+													Description: "Whether the value include chinese.",
+												},
+												"sql_flag": {
+													Type:        schema.TypeBool,
+													Computed:    true,
+													Description: "Whether the filed is enabled for analysis.",
+												},
+											},
+										},
+									},
+								},
+							},
+						},
 					},
 				},
 			},
diff --git a/volcengine/tls/index/resource_volcengine_tls_index.go b/volcengine/tls/index/resource_volcengine_tls_index.go
@@ -69,7 +69,7 @@ func ResourceVolcengineTlsIndex() *schema.Resource {
 				},
 			},
 			"key_value": {
-				Type:         schema.TypeList,
+				Type:         schema.TypeSet,
 				Optional:     true,
 				AtLeastOneOf: []string{"full_text", "key_value"},
 				Description:  "The key value info of the tls index.",
@@ -111,7 +111,7 @@ func ResourceVolcengineTlsIndex() *schema.Resource {
 							Description: "Whether the filed is enabled for analysis.",
 						},
 						"json_keys": {
-							Type:     schema.TypeList,
+							Type:     schema.TypeSet,
 							Optional: true,
 							//DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
 							//	logger.DebugInfo("testValueType1", k)
@@ -145,7 +145,70 @@ func ResourceVolcengineTlsIndex() *schema.Resource {
 					},
 				},
 			},
-
+			"user_inner_key_value": {
+				Type:        schema.TypeSet,
+				Optional:    true,
+				Description: "The reserved field index configuration of the tls index.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "The key of the KeyValueInfo.",
+						},
+						"value_type": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"long", "double", "text", "json"}, false),
+							Description:  "The type of value. Valid values: `long`, `double`, `text`, `json`.",
+						},
+						"case_sensitive": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							Description: "Whether the value is case sensitive.",
+						},
+						"delimiter": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Default:     "",
+							Description: "The delimiter of the value.",
+						},
+						"include_chinese": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							Description: "Whether the value include chinese.",
+						},
+						"sql_flag": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							Description: "Whether the filed is enabled for analysis.",
+						},
+						"json_keys": {
+							Type:        schema.TypeSet,
+							Optional:    true,
+							Description: "The JSON subfield key value index.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"key": {
+										Type:        schema.TypeString,
+										Required:    true,
+										Description: "The key of the subfield key value index.",
+									},
+									"value_type": {
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringInSlice([]string{"long", "double", "text"}, false),
+										Description:  "The type of value. Valid values: `long`, `double`, `text`.",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 			"create_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
diff --git a/volcengine/tls/index/service_volcengine_tls_index.go b/volcengine/tls/index/service_volcengine_tls_index.go

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`data "volcengine_tls_indexes" "default" {`
`2`		`- ids = ["65d67d34-c5b4-4ec8-b3a9-175d3366****"]`
	`2`	`+ ids = ["7ce12237-6670-44a7-9d79-2e36961586e6"]`
`3`	`3`	`}`