Skip to content

Commit

Permalink
cleanup after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@anGie44
anGie44 committed Dec 17, 2021
1 parent 6253fdf commit 6be0e46
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 82 deletions.
158 changes: 81 additions & 77 deletions internal/service/elasticsearch/domain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,10 @@ func resourceDomainRead(d *schema.ResourceData, meta interface{}) error {

d.Set("access_policies", policies)
}
if err := d.Set("advanced_options", flex.PointersMapToStringList(ds.AdvancedOptions)); err != nil {
return fmt.Errorf("error setting advanced_options: %w", err)

options := advancedOptionsIgnoreDefault(d.Get("advanced_options").(map[string]interface{}), flex.PointersMapToStringList(ds.AdvancedOptions))
if err = d.Set("advanced_options", options); err != nil {
return fmt.Errorf("setting advanced_options %v: %w", options, err)
}

d.SetId(aws.StringValue(ds.ARN))
Expand Down Expand Up @@ -855,111 +857,113 @@ func resourceDomainUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*conns.AWSClient).ElasticsearchConn

if d.HasChangesExcept("tags", "tags_all") {
o, n := d.GetChange("tags_all")

if err := UpdateTags(conn, d.Id(), o, n); err != nil {
return fmt.Errorf("error updating Elasticsearch Cluster (%s) tags: %w", d.Id(), err)
input := elasticsearch.UpdateElasticsearchDomainConfigInput{
DomainName: aws.String(d.Get("domain_name").(string)),
}
}

input := elasticsearch.UpdateElasticsearchDomainConfigInput{
DomainName: aws.String(d.Get("domain_name").(string)),
}

if d.HasChange("access_policies") {
o, n := d.GetChange("access_policies")
if d.HasChange("access_policies") {
o, n := d.GetChange("access_policies")

if equivalent, err := awspolicy.PoliciesAreEquivalent(o.(string), n.(string)); err != nil || !equivalent {
input.AccessPolicies = aws.String(d.Get("access_policies").(string))
if equivalent, err := awspolicy.PoliciesAreEquivalent(o.(string), n.(string)); err != nil || !equivalent {
input.AccessPolicies = aws.String(d.Get("access_policies").(string))
}
}
}

if d.HasChange("advanced_options") {
input.AdvancedOptions = flex.ExpandStringMap(d.Get("advanced_options").(map[string]interface{}))
}
if d.HasChange("advanced_options") {
input.AdvancedOptions = flex.ExpandStringMap(d.Get("advanced_options").(map[string]interface{}))
}

if d.HasChange("advanced_security_options") {
input.AdvancedSecurityOptions = expandAdvancedSecurityOptions(d.Get("advanced_security_options").([]interface{}))
}
if d.HasChange("advanced_security_options") {
input.AdvancedSecurityOptions = expandAdvancedSecurityOptions(d.Get("advanced_security_options").([]interface{}))
}

if d.HasChange("auto_tune_options") {
input.AutoTuneOptions = expandAutoTuneOptions(d.Get("auto_tune_options").([]interface{})[0].(map[string]interface{}))
}
if d.HasChange("auto_tune_options") {
input.AutoTuneOptions = expandAutoTuneOptions(d.Get("auto_tune_options").([]interface{})[0].(map[string]interface{}))
}

if d.HasChange("domain_endpoint_options") {
input.DomainEndpointOptions = expandDomainEndpointOptions(d.Get("domain_endpoint_options").([]interface{}))
}
if d.HasChange("domain_endpoint_options") {
input.DomainEndpointOptions = expandDomainEndpointOptions(d.Get("domain_endpoint_options").([]interface{}))
}

if d.HasChanges("ebs_options", "cluster_config") {
options := d.Get("ebs_options").([]interface{})
if d.HasChanges("ebs_options", "cluster_config") {
options := d.Get("ebs_options").([]interface{})

if len(options) == 1 {
s := options[0].(map[string]interface{})
input.EBSOptions = expandEBSOptions(s)
}
if len(options) == 1 {
s := options[0].(map[string]interface{})
input.EBSOptions = expandEBSOptions(s)
}

if d.HasChange("cluster_config") {
config := d.Get("cluster_config").([]interface{})
if d.HasChange("cluster_config") {
config := d.Get("cluster_config").([]interface{})

if len(config) == 1 {
m := config[0].(map[string]interface{})
input.ElasticsearchClusterConfig = expandClusterConfig(m)
if len(config) == 1 {
m := config[0].(map[string]interface{})
input.ElasticsearchClusterConfig = expandClusterConfig(m)
}
}

}

}
if d.HasChange("snapshot_options") {
options := d.Get("snapshot_options").([]interface{})

if d.HasChange("snapshot_options") {
options := d.Get("snapshot_options").([]interface{})
if len(options) == 1 {
o := options[0].(map[string]interface{})

if len(options) == 1 {
o := options[0].(map[string]interface{})
snapshotOptions := elasticsearch.SnapshotOptions{
AutomatedSnapshotStartHour: aws.Int64(int64(o["automated_snapshot_start_hour"].(int))),
}

snapshotOptions := elasticsearch.SnapshotOptions{
AutomatedSnapshotStartHour: aws.Int64(int64(o["automated_snapshot_start_hour"].(int))),
input.SnapshotOptions = &snapshotOptions
}
}

input.SnapshotOptions = &snapshotOptions
if d.HasChange("vpc_options") {
options := d.Get("vpc_options").([]interface{})
s := options[0].(map[string]interface{})
input.VPCOptions = expandVPCOptions(s)
}
}

if d.HasChange("vpc_options") {
options := d.Get("vpc_options").([]interface{})
s := options[0].(map[string]interface{})
input.VPCOptions = expandVPCOptions(s)
}
if d.HasChange("cognito_options") {
options := d.Get("cognito_options").([]interface{})
input.CognitoOptions = expandCognitoOptions(options)
}

if d.HasChange("cognito_options") {
options := d.Get("cognito_options").([]interface{})
input.CognitoOptions = expandCognitoOptions(options)
}
if d.HasChange("log_publishing_options") {
input.LogPublishingOptions = expandLogPublishingOptions(d.Get("log_publishing_options").(*schema.Set))
}

if d.HasChange("log_publishing_options") {
input.LogPublishingOptions = expandLogPublishingOptions(d.Get("log_publishing_options").(*schema.Set))
}
_, err := conn.UpdateElasticsearchDomainConfig(&input)
if err != nil {
return err
}

_, err := conn.UpdateElasticsearchDomainConfig(&input)
if err != nil {
return err
}
if err := waitForDomainUpdate(conn, d.Get("domain_name").(string)); err != nil {
return fmt.Errorf("error waiting for Elasticsearch Domain Update (%s) to succeed: %w", d.Id(), err)
}

if err := waitForDomainUpdate(conn, d.Get("domain_name").(string)); err != nil {
return fmt.Errorf("error waiting for Elasticsearch Domain Update (%s) to succeed: %w", d.Id(), err)
}
if d.HasChange("elasticsearch_version") {
upgradeInput := elasticsearch.UpgradeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
TargetVersion: aws.String(d.Get("elasticsearch_version").(string)),
}

if d.HasChange("elasticsearch_version") {
upgradeInput := elasticsearch.UpgradeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
TargetVersion: aws.String(d.Get("elasticsearch_version").(string)),
}
_, err := conn.UpgradeElasticsearchDomain(&upgradeInput)
if err != nil {
return fmt.Errorf("Failed to upgrade elasticsearch domain: %w", err)
}

_, err := conn.UpgradeElasticsearchDomain(&upgradeInput)
if err != nil {
return fmt.Errorf("Failed to upgrade elasticsearch domain: %w", err)
if _, err := waitUpgradeSucceeded(conn, d.Get("domain_name").(string), d.Timeout(schema.TimeoutUpdate)); err != nil {
return fmt.Errorf("error waiting for Elasticsearch Domain Upgrade (%s) to succeed: %w", d.Id(), err)
}
}
}

if _, err := waitUpgradeSucceeded(conn, d.Get("domain_name").(string), d.Timeout(schema.TimeoutUpdate)); err != nil {
return fmt.Errorf("error waiting for Elasticsearch Domain Upgrade (%s) to succeed: %w", d.Id(), err)
if d.HasChange("tags_all") {
o, n := d.GetChange("tags_all")

if err := UpdateTags(conn, d.Id(), o, n); err != nil {
return fmt.Errorf("error updating Elasticsearch Cluster (%s) tags: %w", d.Id(), err)
}
}

Expand Down
1 change: 1 addition & 0 deletions internal/service/elasticsearch/domain_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/elasticsearchservice"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
Expand Down
8 changes: 3 additions & 5 deletions internal/service/elasticsearch/domain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ func TestAccElasticsearchDomain_basic(t *testing.T) {
Config: testAccDomainConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainExists(resourceName, &domain),
resource.TestCheckResourceAttr(resourceName, "domain_name", resourceId),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "es", fmt.Sprintf("domain/%s", resourceId)),
resource.TestCheckResourceAttr(resourceName, "elasticsearch_version", "1.5"),
resource.TestMatchResourceAttr(resourceName, "kibana_endpoint", regexp.MustCompile(`.*es\..*/_plugin/kibana/`)),
resource.TestCheckResourceAttr(resourceName, "vpc_options.#", "0"),
Expand Down Expand Up @@ -327,7 +325,7 @@ func TestAccElasticsearchDomain_duplicate(t *testing.T) {
t.Fatal(err)
}

err = tfelasticsearch.WaitForDomainCreation(conn, rName[:28], rName[:28])
err = tfelasticsearch.WaitForDomainCreation(conn, rName[:28])
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -1009,9 +1007,9 @@ func TestAccElasticsearchDomain_tags(t *testing.T) {
),
},
{
Config: testAccDomainConfigTags1(ri, "key2", "value2"),
Config: testAccDomainConfigTags1(rName, "key2", "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckESDomainExists(resourceName, &domain),
testAccCheckDomainExists(resourceName, &domain),
resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.key2", "value2"),
),
Expand Down

0 comments on commit 6be0e46

Please sign in to comment.