Skip to content

Commit a7ea0d9

Browse files
authored
fix(es): [122278060] modify kibana_public_access (#3191)
* fix(es): [122278060] modify kibana_public_access * faet: add changelog * fix: modify cos_backup properties
1 parent 0bd9946 commit a7ea0d9

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.changelog/3191.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_elasticsearch_instance: Modify kibana_public_access settings when creating
3+
```

tencentcloud/acctest/basic.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,8 +1148,8 @@ const (
11481148
DefaultEsInstanceId = "es-5wn36he6"
11491149
DefaultEsSecurityGroup = "sg-edmur627"
11501150
DefaultEsLogstash = "ls-kru90fkz"
1151-
DefaultEsVpcId = "vpc-lrj71tt3"
1152-
DefaultEsSubnetId = "subnet-kggvos8o"
1151+
DefaultEsVpcId = "vpc-38vqkwq1"
1152+
DefaultEsSubnetId = "subnet-qoyiqmn0"
11531153
)
11541154

11551155
const DefaultEsVariables = `

tencentcloud/services/es/resource_tc_elasticsearch_instance.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ func ResourceTencentCloudElasticsearchInstance() *schema.Resource {
245245
"cos_backup": {
246246
Type: schema.TypeList,
247247
Optional: true,
248+
Computed: true,
248249
MaxItems: 1,
249250
Description: "COS automatic backup information.",
250251
Elem: &schema.Resource{
@@ -461,8 +462,12 @@ func resourceTencentCloudElasticsearchInstanceCreate(d *schema.ResourceData, met
461462
// KibanaPublicAccess
462463
var kibanaPublicAccess string
463464
if v, ok := d.GetOk("kibana_public_access"); ok {
464-
kibanaPublicAccess = v.(string)
465-
isUpdate = true
465+
// 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
466+
publicAccess := v.(string)
467+
if publicAccess != ES_KIBANA_PUBLIC_ACCESS_OPEN {
468+
kibanaPublicAccess = publicAccess
469+
isUpdate = true
470+
}
466471
}
467472
if isUpdate {
468473
err = resource.Retry(tccommon.WriteRetryTimeout*2, func() *resource.RetryError {

tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@ func TestAccTencentCloudElasticsearchInstanceResource_kibanaPublicAccess(t *test
128128
Providers: tcacctest.AccProviders,
129129
CheckDestroy: testAccCheckElasticsearchInstanceDestroy,
130130
Steps: []resource.TestStep{
131+
{
132+
Config: testAccElasticsearchInstanceKibanaPublicAccessOpen,
133+
Check: resource.ComposeTestCheckFunc(
134+
testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.es_kibana"),
135+
resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.es_kibana", "kibana_public_access", "OPEN"),
136+
),
137+
},
131138
{
132139
Config: testAccElasticsearchInstanceKibanaPublicAccessClose,
133140
Check: resource.ComposeTestCheckFunc(

0 commit comments

Comments
 (0)