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 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..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{ @@ -461,8 +462,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(