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

Jump to bottom

resource/aws_elasticsearch_domain: Support three Availability Zone awareness #9398

Merged
merged 10 commits into from
Jul 18, 2019
Merged

resource/aws_elasticsearch_domain: Support three Availability Zone awareness #9398

merged 10 commits into from
Jul 18, 2019

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Jul 17, 2019 •
edited
Loading

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Closes #7504
Supersedes #8144

Release note for CHANGELOG:

* resource/aws_elasticsearch_domain: Add `cluster_config` configuration block `zone_awareness_config` configuration block (support three Availability Zone awareness)

Output from acceptance testing:

--- PASS: TestAccAWSElasticSearchDomain_duplicate (597.97s)
--- PASS: TestAccAWSElasticSearchDomain_importBasic (725.23s)
--- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_default_key (802.19s)
--- PASS: TestAccAWSElasticSearchDomain_tags (847.52s)
--- PASS: TestAccAWSElasticSearchDomain_basic (945.92s)
--- PASS: TestAccAWSElasticSearchDomain_v23 (1017.30s)
--- PASS: TestAccAWSElasticSearchDomain_vpc (1160.91s)
--- PASS: TestAccAWSElasticSearchDomain_policy (1210.63s)
--- PASS: TestAccAWSElasticSearchDomain_encrypt_at_rest_specify_key (1258.72s)
--- PASS: TestAccAWSElasticSearchDomain_NodeToNodeEncryption (1415.78s)
--- PASS: TestAccAWSElasticSearchDomain_complex (1476.53s)
--- PASS: TestAccAWSElasticSearchDomain_LogPublishingOptions (1695.50s)
--- PASS: TestAccAWSElasticSearchDomain_internetToVpcEndpoint (2051.69s)
--- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsCreateAndRemove (2282.65s)
--- PASS: TestAccAWSElasticSearchDomain_update (2531.43s)
--- PASS: TestAccAWSElasticSearchDomain_CognitoOptionsUpdate (2880.18s)
--- PASS: TestAccAWSElasticSearchDomain_update_volume_type (3129.68s)
--- PASS: TestAccAWSElasticSearchDomain_vpc_update (3163.77s)
--- PASS: TestAccAWSElasticSearchDomain_withDedicatedMaster (3577.62s)
--- PASS: TestAccAWSElasticSearchDomain_update_version (3778.04s)
--- PASS: TestAccAWSElasticSearchDomain_ClusterConfig_ZoneAwarenessConfig (5371.73s)

Joel Cressy and others added 8 commits April 1, 2019 09:22
[Elasticsearch] Implement specifying availability zone count when zon…
2c60a5d 
…e awareness enabled.
catch a nil c.ZoneAwarenessConfig before checking its attributes
bc2ea84
implement acceptance test for 3AZ zone-aware deployment
21f3700
assign a ZoneAwarenessConfig struct to the ZAC parameter with AZ Count
0f58958
only set zac when zone awareness is enabled, to mimic the flow of ded…
a5b7d35 
…icated masters
Expand test case to multiple zone aware configurations and update the…
87c8646 
… cluster each time.
@bflad
Merge branch 'master' of https://github.com/jtcressy/terraform-provid…
be37d9d 
…er-aws into jtcressy-master
@bflad
resource/aws_elasticsearch_domain: Finish implementation for ZoneAwar…
09b4a71 
…enessConfig

Output from acceptance testing:

```
--- PASS: TestAccAWSElasticSearchDomain_ClusterConfig_ZoneAwarenessConfig (5351.81s)
```
@bflad bflad added enhancement Requests to existing resources that expand the functionality or scope. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. labels Jul 17, 2019
@ghost ghost added size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. documentation Introduces or discusses updates to documentation. labels Jul 17, 2019
This was referenced Jul 17, 2019
Closed
Closed
bflad added 2 commits July 17, 2019 20:00
@bflad
resource/aws_elasticsearch_domain: Set availability_zone_count Defaul…
c13a1ab 
…t to 2 to match API
@bflad
tests/resource/aws_elasticsearch_domain: Add ImportStateId for ZoneAw…
135254e 
…arenessConfig import testing

The resource ID is an ARN and when used during import, returns an error that cannot be parsed by the AWS Go SDK:

```
--- FAIL: TestAccAWSElasticSearchDomain_ClusterConfig_ZoneAwarenessConfig (1020.88s)
    testing.go:568: Step 1 error: SerializationError: failed to unmarshal response error
        	status code: 400, request id:
        caused by: UnmarshalError: error message missing
```

Instead, set the import test ID to the match domain name.
@bflad bflad marked this pull request as ready for review July 18, 2019 04:46
@bflad bflad requested a review from a team July 18, 2019 04:46
nywilken
nywilken approved these changes Jul 18, 2019
View reviewed changes
Copy link
Contributor

@nywilken nywilken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good - nicely done.

@nywilken nywilken added this to the v2.20.0 milestone Jul 18, 2019
@bflad bflad merged commit 4f08dd0 into master Jul 18, 2019
@bflad bflad deleted the jtcressy-master branch July 18, 2019 16:52
bflad added a commit that referenced this pull request Jul 18, 2019
@bflad
Update CHANGELOG for #9398
ad59771
@shivpathak shivpathak mentioned this pull request Jul 20, 2019
Closed
@fliphess fliphess mentioned this pull request Jul 22, 2019
Merged
aknysh pushed a commit to cloudposse/terraform-aws-elasticsearch that referenced this pull request Jul 28, 2019
@fliphess @aknysh
Allow use of 3 availability zones (#23)
650d5c9 
* Allow use of 3 availability zones after hashicorp/terraform-provider-aws#9398

* Update module documentation

* Move zone_awareness out of zone_awareness_config

* Add an extra az to th tfvars

* Revert "Add an extra az to th tfvars"

This reverts commit cdc0d26.
Shogan pushed a commit to Shogan/terraform-aws-elasticsearch that referenced this pull request Oct 3, 2019
@fliphess @Shogan
Allow use of 3 availability zones (cloudposse#23)
19a5a48 
* Allow use of 3 availability zones after hashicorp/terraform-provider-aws#9398

* Update module documentation

* Move zone_awareness out of zone_awareness_config

* Add an extra az to th tfvars

* Revert "Add an extra az to th tfvars"

This reverts commit cdc0d26.
@ghost
Copy link

ghost commented Nov 2, 2019

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Nov 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nywilken nywilken nywilken approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/elasticsearch Issues and PRs that pertain to the elasticsearch service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v2.20.0
Development

Successfully merging this pull request may close these issues.

Support for AWS Elasticsearch across 3 availability zones
2 participants
@bflad @nywilken