From 7a01a8a8622789e7bd8e9b11016551702523b1dd Mon Sep 17 00:00:00 2001
From: arunma <arunma@tencent.com>
Date: Fri, 7 Mar 2025 14:16:35 +0800
Subject: [PATCH 1/3] fix(es): [122278060] modify kibana_public_access

---
 tencentcloud/acctest/basic.go                             | 4 ++--
 .../services/es/resource_tc_elasticsearch_instance.go     | 8 ++++++--
 .../es/resource_tc_elasticsearch_instance_test.go         | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tencentcloud/acctest/basic.go b/tencentcloud/acctest/basic.go
index 10ec15adec..906fbc90b3 100644
--- a/tencentcloud/acctest/basic.go
+++ b/tencentcloud/acctest/basic.go
@@ -1148,8 +1148,8 @@ const (
 	DefaultEsInstanceId    = "es-5wn36he6"
 	DefaultEsSecurityGroup = "sg-edmur627"
 	DefaultEsLogstash      = "ls-kru90fkz"
-	DefaultEsVpcId         = "vpc-lrj71tt3"
-	DefaultEsSubnetId      = "subnet-kggvos8o"
+	DefaultEsVpcId         = "vpc-38vqkwq1"
+	DefaultEsSubnetId      = "subnet-qoyiqmn0"
 )
 
 const DefaultEsVariables = `
diff --git a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
index 007d8d8fd1..8d50b1687c 100644
--- a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
+++ b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
@@ -461,8 +461,12 @@ func resourceTencentCloudElasticsearchInstanceCreate(d *schema.ResourceData, met
 	// KibanaPublicAccess
 	var kibanaPublicAccess string
 	if v, ok := d.GetOk("kibana_public_access"); ok {
-		kibanaPublicAccess = v.(string)
-		isUpdate = true
+		// The default value is OPEN when creating. If you call the modification interface again and change it to OPEN, the interface will report an error InvalidParameter.InvalidPublicAccess
+		publicAccess := v.(string)
+		if publicAccess != ES_KIBANA_PUBLIC_ACCESS_OPEN {
+			kibanaPublicAccess = publicAccess
+			isUpdate = true
+		}
 	}
 	if isUpdate {
 		err = resource.Retry(tccommon.WriteRetryTimeout*2, func() *resource.RetryError {
diff --git a/tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go b/tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go
index 188d476734..bf4e7daed3 100644
--- a/tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go
+++ b/tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go
@@ -128,6 +128,13 @@ func TestAccTencentCloudElasticsearchInstanceResource_kibanaPublicAccess(t *test
 		Providers:    tcacctest.AccProviders,
 		CheckDestroy: testAccCheckElasticsearchInstanceDestroy,
 		Steps: []resource.TestStep{
+			{
+				Config: testAccElasticsearchInstanceKibanaPublicAccessOpen,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.es_kibana"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.es_kibana", "kibana_public_access", "OPEN"),
+				),
+			},
 			{
 				Config: testAccElasticsearchInstanceKibanaPublicAccessClose,
 				Check: resource.ComposeTestCheckFunc(

From 05e3b05e1b5e431d17b4cc64ef86f168a55e4a0e Mon Sep 17 00:00:00 2001
From: arunma <arunma@tencent.com>
Date: Fri, 7 Mar 2025 14:18:47 +0800
Subject: [PATCH 2/3] faet: add changelog

---
 .changelog/3191.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/3191.txt

diff --git a/.changelog/3191.txt b/.changelog/3191.txt
new file mode 100644
index 0000000000..186bfbd0c0
--- /dev/null
+++ b/.changelog/3191.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_elasticsearch_instance: Modify kibana_public_access settings when creating
+```
\ No newline at end of file

From a4fb7cb8cae25c833bcc62c1cbb5f6e64acb5649 Mon Sep 17 00:00:00 2001
From: arunma <arunma@tencent.com>
Date: Fri, 7 Mar 2025 14:44:04 +0800
Subject: [PATCH 3/3] fix: modify cos_backup properties

---
 tencentcloud/services/es/resource_tc_elasticsearch_instance.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
index 8d50b1687c..1670b6fe48 100644
--- a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
+++ b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go
@@ -245,6 +245,7 @@ func ResourceTencentCloudElasticsearchInstance() *schema.Resource {
 			"cos_backup": {
 				Type:        schema.TypeList,
 				Optional:    true,
+				Computed:    true,
 				MaxItems:    1,
 				Description: "COS automatic backup information.",
 				Elem: &schema.Resource{