Skip to content

fix:adjust es version to avoid the deprecated es version #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 24, 2022
Merged

fix:adjust es version to avoid the deprecated es version #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe53df4
fix:adjust es version to avoid the deprecated es version
lyu571 Nov 23, 2022
d294f2b
fix:adjust e2e case
lyu571 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tencentcloud/connectivity/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tencentcloud/resource_tc_elasticsearch_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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"
Expand All @@ -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.10.1"
vpc_id = var.vpc_id
subnet_id = var.subnet_id
password = "Test12345"
Expand Down