Skip to content
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

Add auto tune options to aws_elasticsearch_domain #21652

Merged
merged 7 commits into from
Dec 3, 2021
Merged

Add auto tune options to aws_elasticsearch_domain #21652

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b70c8e5
Add auto_tune_options configuration block to aws_elasticsearch_domain
zhelding Nov 9, 2021
223a8a2
Add docs for auto_tune_options config on aws_elasticseach_domain
zhelding Nov 12, 2021
d292811
aws_elasticsearch_domain auto_tune_options - set Computed: true
zhelding Nov 15, 2021
6559604
Upgrade terraform-plugin-sdk dependency to latest
zhelding Nov 16, 2021
74ed867
Merge branch 'main' into f-aws_elasticsearch_domain-auto-tune
zhelding Dec 1, 2021
0fccf89
go mod tidy
zhelding Dec 1, 2021
8b369e6
Update elasticsearch config during Create iff auto_tune_options exists
zhelding Dec 2, 2021
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/21652.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note: enhancement
resource/aws_elasticsearch_domain: Add `auto_tune_options` configuration block
```
144 changes: 123 additions & 21 deletions internal/service/elasticsearch/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,63 @@ func ResourceDomain() *schema.Resource {
},
},
},
"auto_tune_options": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"desired_state": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(elasticsearch.AutoTuneDesiredState_Values(), false),
},
"maintenance_schedule": {
Type: schema.TypeSet,
Optional: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"start_at": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.IsRFC3339Time,
},
"duration": {
Type: schema.TypeList,
Required: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"value": {
Type: schema.TypeInt,
Required: true,
},
"unit": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(elasticsearch.TimeUnit_Values(), false),
},
},
},
},
"cron_expression_for_recurrence": {
Type: schema.TypeString,
Required: true,
},
},
},
},
"rollback_on_disable": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringInSlice(elasticsearch.RollbackOnDisable_Values(), false),
},
},
},
},
"domain_name": {
Type: schema.TypeString,
Required: true,
Expand Down Expand Up @@ -467,21 +524,25 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Elasticsearch domain %s already exists", aws.StringValue(resp.DomainStatus.DomainName))
}

input := elasticsearch.CreateElasticsearchDomainInput{
inputCreateDomain := elasticsearch.CreateElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
ElasticsearchVersion: aws.String(d.Get("elasticsearch_version").(string)),
}

if v, ok := d.GetOk("access_policies"); ok {
input.AccessPolicies = aws.String(v.(string))
inputCreateDomain.AccessPolicies = aws.String(v.(string))
}

if v, ok := d.GetOk("advanced_options"); ok {
input.AdvancedOptions = flex.ExpandStringMap(v.(map[string]interface{}))
inputCreateDomain.AdvancedOptions = flex.ExpandStringMap(v.(map[string]interface{}))
}

if v, ok := d.GetOk("advanced_security_options"); ok {
input.AdvancedSecurityOptions = expandAdvancedSecurityOptions(v.([]interface{}))
inputCreateDomain.AdvancedSecurityOptions = expandAdvancedSecurityOptions(v.([]interface{}))
}

if v, ok := d.GetOk("auto_tune_options"); ok && len(v.([]interface{})) > 0 {
inputCreateDomain.AutoTuneOptions = expandAutoTuneOptionsInput(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("ebs_options"); ok {
Expand All @@ -493,7 +554,7 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
}

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

Expand All @@ -504,7 +565,7 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
}

s := options[0].(map[string]interface{})
input.EncryptionAtRestOptions = expandEncryptAtRestOptions(s)
inputCreateDomain.EncryptionAtRestOptions = expandEncryptAtRestOptions(s)
}

if v, ok := d.GetOk("cluster_config"); ok {
Expand All @@ -515,15 +576,15 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("At least one field is expected inside cluster_config")
}
m := config[0].(map[string]interface{})
input.ElasticsearchClusterConfig = expandESClusterConfig(m)
inputCreateDomain.ElasticsearchClusterConfig = expandESClusterConfig(m)
}
}

if v, ok := d.GetOk("node_to_node_encryption"); ok {
options := v.([]interface{})

s := options[0].(map[string]interface{})
input.NodeToNodeEncryptionOptions = expandESNodeToNodeEncryptionOptions(s)
inputCreateDomain.NodeToNodeEncryptionOptions = expandESNodeToNodeEncryptionOptions(s)
}

if v, ok := d.GetOk("snapshot_options"); ok {
Expand All @@ -540,7 +601,7 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
AutomatedSnapshotStartHour: aws.Int64(int64(o["automated_snapshot_start_hour"].(int))),
}

input.SnapshotOptions = &snapshotOptions
inputCreateDomain.SnapshotOptions = &snapshotOptions
}
}

Expand All @@ -551,39 +612,39 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
}

s := options[0].(map[string]interface{})
input.VPCOptions = expandVPCOptions(s)
inputCreateDomain.VPCOptions = expandVPCOptions(s)
}

if v, ok := d.GetOk("log_publishing_options"); ok {
input.LogPublishingOptions = make(map[string]*elasticsearch.LogPublishingOption)
inputCreateDomain.LogPublishingOptions = make(map[string]*elasticsearch.LogPublishingOption)
options := v.(*schema.Set).List()
for _, vv := range options {
lo := vv.(map[string]interface{})
input.LogPublishingOptions[lo["log_type"].(string)] = &elasticsearch.LogPublishingOption{
inputCreateDomain.LogPublishingOptions[lo["log_type"].(string)] = &elasticsearch.LogPublishingOption{
CloudWatchLogsLogGroupArn: aws.String(lo["cloudwatch_log_group_arn"].(string)),
Enabled: aws.Bool(lo["enabled"].(bool)),
}
}
}

if v, ok := d.GetOk("domain_endpoint_options"); ok {
input.DomainEndpointOptions = expandDomainEndpointOptions(v.([]interface{}))
inputCreateDomain.DomainEndpointOptions = expandDomainEndpointOptions(v.([]interface{}))
}

if v, ok := d.GetOk("cognito_options"); ok {
input.CognitoOptions = expandCognitoOptions(v.([]interface{}))
inputCreateDomain.CognitoOptions = expandCognitoOptions(v.([]interface{}))
}

log.Printf("[DEBUG] Creating Elasticsearch domain: %s", input)
log.Printf("[DEBUG] Creating Elasticsearch domain: %s", inputCreateDomain)

// IAM Roles can take some time to propagate if set in AccessPolicies and created in the same terraform
var out *elasticsearch.CreateElasticsearchDomainOutput
err = resource.Retry(tfiam.PropagationTimeout, func() *resource.RetryError {
var err error
out, err = conn.CreateElasticsearchDomain(&input)
out, err = conn.CreateElasticsearchDomain(&inputCreateDomain)
if err != nil {
if tfawserr.ErrMessageContains(err, "InvalidTypeException", "Error setting policy") {
log.Printf("[DEBUG] Retrying creation of Elasticsearch domain %s", aws.StringValue(input.DomainName))
log.Printf("[DEBUG] Retrying creation of Elasticsearch domain %s", aws.StringValue(inputCreateDomain.DomainName))
return resource.RetryableError(err)
}
if tfawserr.ErrMessageContains(err, "ValidationException", "enable a service-linked role to give Amazon ES permissions") {
Expand Down Expand Up @@ -613,7 +674,7 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {
return nil
})
if tfresource.TimedOut(err) {
out, err = conn.CreateElasticsearchDomain(&input)
out, err = conn.CreateElasticsearchDomain(&inputCreateDomain)
}
if err != nil {
return fmt.Errorf("Error creating Elasticsearch domain: %s", err)
Expand All @@ -639,6 +700,24 @@ func resourceDomainCreate(d *schema.ResourceData, meta interface{}) error {

log.Printf("[DEBUG] Elasticsearch domain %q created", d.Id())

log.Printf("[DEBUG] Modifying config for Elasticsearch domain %q", d.Id())
zhelding marked this conversation as resolved.
Show resolved Hide resolved

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

if v, ok := d.GetOk("auto_tune_options"); ok && len(v.([]interface{})) > 0 {
inputUpdateDomainConfig.AutoTuneOptions = expandAutoTuneOptions(v.([]interface{})[0].(map[string]interface{}))
}

_, err = conn.UpdateElasticsearchDomainConfig(inputUpdateDomainConfig)

if err != nil {
return fmt.Errorf("Error modifying config for Elasticsearch domain: %s", err)
}

log.Printf("[DEBUG] Config for Elasticsearch domain %q modified", d.Id())

return resourceDomainRead(d, meta)
}

Expand Down Expand Up @@ -681,7 +760,7 @@ func resourceDomainRead(d *schema.ResourceData, meta interface{}) error {
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig

out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
outDescribeDomain, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})
if err != nil {
Expand All @@ -693,9 +772,21 @@ func resourceDomainRead(d *schema.ResourceData, meta interface{}) error {
return err
}

log.Printf("[DEBUG] Received Elasticsearch domain: %s", out)
log.Printf("[DEBUG] Received Elasticsearch domain: %s", outDescribeDomain)

ds := out.DomainStatus
ds := outDescribeDomain.DomainStatus

outDescribeDomainConfig, err := conn.DescribeElasticsearchDomainConfig(&elasticsearch.DescribeElasticsearchDomainConfigInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})

if err != nil {
return err
}

log.Printf("[DEBUG] Received config for Elasticsearch domain: %s", outDescribeDomainConfig)

dc := outDescribeDomainConfig.DomainConfig

if ds.AccessPolicies != nil && aws.StringValue(ds.AccessPolicies) != "" {
policies, err := structure.NormalizeJsonString(aws.StringValue(ds.AccessPolicies))
Expand Down Expand Up @@ -750,6 +841,13 @@ func resourceDomainRead(d *schema.ResourceData, meta interface{}) error {
}
}

if v := dc.AutoTuneOptions; v != nil {
err = d.Set("auto_tune_options", []interface{}{flattenAutoTuneOptions(v.Options)})
if err != nil {
return err
}
}

if err := d.Set("snapshot_options", flattenSnapshotOptions(ds.SnapshotOptions)); err != nil {
return fmt.Errorf("error setting snapshot_options: %s", err)
}
Expand Down Expand Up @@ -845,6 +943,10 @@ func resourceDomainUpdate(d *schema.ResourceData, meta interface{}) error {
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("domain_endpoint_options") {
input.DomainEndpointOptions = expandDomainEndpointOptions(d.Get("domain_endpoint_options").([]interface{}))
}
Expand Down
77 changes: 73 additions & 4 deletions internal/service/elasticsearch/domain_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,54 @@ func DataSourceDomain() *schema.Resource {
},
},
},
"auto_tune_options": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"desired_state": {
Type: schema.TypeString,
Computed: true,
},
"maintenance_schedule": {
Type: schema.TypeSet,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"start_at": {
Type: schema.TypeString,
Computed: true,
},
"duration": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"value": {
Type: schema.TypeInt,
Computed: true,
},
"unit": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"cron_expression_for_recurrence": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"rollback_on_disable": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"domain_name": {
Type: schema.TypeString,
Required: true,
Expand Down Expand Up @@ -281,20 +329,35 @@ func dataSourceDomainRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*conns.AWSClient).ElasticsearchConn
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig

req := &elasticsearchservice.DescribeElasticsearchDomainInput{
reqDescribeDomain := &elasticsearchservice.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
}

resp, err := conn.DescribeElasticsearchDomain(req)
respDescribeDomain, err := conn.DescribeElasticsearchDomain(reqDescribeDomain)
if err != nil {
return fmt.Errorf("error querying elasticsearch_domain: %w", err)
}

if resp.DomainStatus == nil {
if respDescribeDomain.DomainStatus == nil {
return fmt.Errorf("your query returned no results")
}

ds := resp.DomainStatus
ds := respDescribeDomain.DomainStatus

reqDescribeDomainConfig := &elasticsearchservice.DescribeElasticsearchDomainConfigInput{
DomainName: aws.String(d.Get("domain_name").(string)),
}

respDescribeDomainConfig, err := conn.DescribeElasticsearchDomainConfig(reqDescribeDomainConfig)
if err != nil {
return fmt.Errorf("error querying config for elasticsearch_domain: %w", err)
}

if respDescribeDomainConfig.DomainConfig == nil {
return fmt.Errorf("your query returned no results")
}

dc := respDescribeDomainConfig.DomainConfig

d.SetId(aws.StringValue(ds.ARN))

Expand All @@ -319,6 +382,12 @@ func dataSourceDomainRead(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("error setting advanced_security_options: %w", err)
}

if dc.AutoTuneOptions != nil {
if err := d.Set("auto_tune_options", []interface{}{flattenAutoTuneOptions(dc.AutoTuneOptions.Options)}); err != nil {
return fmt.Errorf("error setting auto_tune_options: %w", err)
}
}

if err := d.Set("ebs_options", flattenEBSOptions(ds.EBSOptions)); err != nil {
return fmt.Errorf("error setting ebs_options: %w", err)
}
Expand Down
Loading