Skip to content

fix(es): [122278060] modify kibana_public_access #3191

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.

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 3 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 0 deletions .changelog/3191.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_elasticsearch_instance: Modify kibana_public_access settings when creating
```
4 changes: 2 additions & 2 deletions tencentcloud/acctest/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading