From fe53df4a806c7673ce53a7ad47fc53c9fc80fa5f Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Wed, 23 Nov 2022 16:52:07 +0800 Subject: [PATCH 1/2] fix:adjust es version to avoid the deprecated es version --- tencentcloud/connectivity/client.go | 3 ++- tencentcloud/resource_tc_elasticsearch_instance_test.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tencentcloud/connectivity/client.go b/tencentcloud/connectivity/client.go index 6d22d411c9..1b7b93b80c 100644 --- a/tencentcloud/connectivity/client.go +++ b/tencentcloud/connectivity/client.go @@ -513,13 +513,14 @@ func (me *TencentCloudClient) UseEsClient() *es.Client { } cpf := me.NewClientProfile(300) + cpf.Language = "zh-CN" me.esConn, _ = es.NewClient(me.Credential, me.Region, cpf) me.esConn.WithHttpTransport(&LogRoundTripper{}) return me.esConn } -// UsePostgreClient returns postgresql client for service +// UsePostgresqlClient returns postgresql client for service func (me *TencentCloudClient) UsePostgresqlClient() *postgre.Client { if me.postgreConn != nil { return me.postgreConn diff --git a/tencentcloud/resource_tc_elasticsearch_instance_test.go b/tencentcloud/resource_tc_elasticsearch_instance_test.go index 312aabae05..842fabc5cc 100755 --- a/tencentcloud/resource_tc_elasticsearch_instance_test.go +++ b/tencentcloud/resource_tc_elasticsearch_instance_test.go @@ -57,7 +57,7 @@ func TestAccTencentCloudElasticsearchInstance_basic(t *testing.T) { testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.foo"), resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "instance_name", "tf-ci-test"), resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "availability_zone", defaultAZone), - resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "version", "7.5.1"), + resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "version", "7.10.1"), resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "vpc_id", defaultVpcId), resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "subnet_id", defaultSubnetId), resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "oss"), @@ -168,7 +168,7 @@ const testAccElasticsearchInstance = defaultVpcVariable + ` resource "tencentcloud_elasticsearch_instance" "foo" { instance_name = "tf-ci-test" availability_zone = var.availability_zone - version = "7.5.1" + version = "7.10.1" vpc_id = var.vpc_id subnet_id = var.subnet_id password = "Test1234" @@ -194,7 +194,7 @@ const testAccElasticsearchInstanceUpdate = defaultVpcVariable + ` resource "tencentcloud_elasticsearch_instance" "foo" { instance_name = "tf-ci-test-update" availability_zone = var.availability_zone - version = "7.5.1" + version = "7.14.2" vpc_id = var.vpc_id subnet_id = var.subnet_id password = "Test12345" From d294f2bb383d5825eae8f8665769237fcbf48574 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Thu, 24 Nov 2022 17:34:58 +0800 Subject: [PATCH 2/2] fix:adjust e2e case --- tencentcloud/resource_tc_elasticsearch_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/resource_tc_elasticsearch_instance_test.go b/tencentcloud/resource_tc_elasticsearch_instance_test.go index 842fabc5cc..4c19f42d7a 100755 --- a/tencentcloud/resource_tc_elasticsearch_instance_test.go +++ b/tencentcloud/resource_tc_elasticsearch_instance_test.go @@ -194,7 +194,7 @@ const testAccElasticsearchInstanceUpdate = defaultVpcVariable + ` resource "tencentcloud_elasticsearch_instance" "foo" { instance_name = "tf-ci-test-update" availability_zone = var.availability_zone - version = "7.14.2" + version = "7.10.1" vpc_id = var.vpc_id subnet_id = var.subnet_id password = "Test12345"