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

feat(elasticsearch): graduate to stable 🚀 #13900

Merged
merged 8 commits into from
Apr 1, 2021
Merged

feat(elasticsearch): graduate to stable 🚀 #13900

merged 8 commits into from
Apr 1, 2021

Conversation

iliapolo
Copy link
Contributor

@iliapolo iliapolo commented Mar 31, 2021 •
edited
Loading

This PR includes a last minute API change that standardizes the way VPC configuration is passed to the domain. It also provides sane defaults, enabling users to simply pass vpc in order to connect a domain to a VPC.

In addition, I added a missing integration test for VPC enabled domains.

Resolves #10965

BREAKING CHANGE: vpcOptions was removed. Use vpc, vpcSubnets and securityGroups instead.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@gitpod-io
Copy link

gitpod-io bot commented Mar 31, 2021 •
edited
Loading

@github-actions github-actions bot added the @aws-cdk/aws-elasticsearch Related to Amazon Elasticsearch Service label Mar 31, 2021
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Mar 31, 2021
iliapolo
iliapolo commented Mar 31, 2021
View reviewed changes
packages/@aws-cdk/aws-elasticsearch/test/domain.test.ts
@@ -1357,31 +1428,7 @@ describe('custom error responses', () => {

expect(() => new Domain(stack, 'Domain1', {
version: ElasticsearchVersion.V7_4,
vpcOptions: {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This whole config wasn't really needed to assert the test, which validates the availabilityZoneCount property below.

packages/@aws-cdk/aws-elasticsearch/test/domain.test.ts
@@ -1150,24 +1228,17 @@ describe('custom endpoints', () => {
describe('custom error responses', () => {

test('error when availabilityZoneCount does not match vpcOptions.subnets length', () => {
const vpc = new Vpc(stack, 'Vpc');
const vpc = new Vpc(stack, 'Vpc', {
maxAzs: 1,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Simpler way to enforce a single AZ.

@iliapolo iliapolo marked this pull request as ready for review March 31, 2021 10:18
@iliapolo iliapolo marked this pull request as draft March 31, 2021 10:19
iliapolo
iliapolo commented Mar 31, 2021
View reviewed changes
packages/@aws-cdk/aws-elasticsearch/lib/domain.ts
@@ -719,7 +714,7 @@ export interface IDomain extends cdk.IResource {
*
* @default maximum over 1 minute
*/
metricClusterIndexWriteBlocked(props?: MetricOptions): Metric;
metricClusterIndexWritesBlocked(props?: MetricOptions): Metric;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Validated with https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-managedomains-cloudwatchmetrics.html

@iliapolo iliapolo marked this pull request as ready for review March 31, 2021 10:31
@iliapolo iliapolo requested a review from a team March 31, 2021 10:32
@iliapolo iliapolo added the pr/do-not-merge This PR should not be merged at this time. label Mar 31, 2021
@iliapolo
Copy link
Contributor Author

Forgot to actually bump the stability

@iliapolo iliapolo removed the pr/do-not-merge This PR should not be merged at this time. label Mar 31, 2021
@mergify
Copy link
Contributor

mergify bot commented Apr 1, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 1371cf8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Apr 1, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 767cd31 into master Apr 1, 2021
@mergify mergify bot deleted the epolon/graduate-elasticsearch branch April 1, 2021 19:46
hollanddd pushed a commit to hollanddd/aws-cdk that referenced this pull request Aug 26, 2021
@iliapolo @hollanddd
feat(elasticsearch): graduate to stable 🚀 (aws#13900)
c2f43c3 
This PR includes a last minute API change that standardizes the way VPC configuration is passed to the domain. It also provides sane defaults, enabling users to simply pass `vpc` in order to connect a domain to a VPC.

In addition, I added a missing integration test for VPC enabled domains.

Resolves aws#10965

BREAKING CHANGE: `vpcOptions` was removed. Use `vpc`, `vpcSubnets` and `securityGroups` instead.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eladb eladb eladb approved these changes

Assignees

@iliapolo iliapolo

Labels
@aws-cdk/aws-elasticsearch Related to Amazon Elasticsearch Service contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[elasticsearch] Domain should accept a vpc and vpc_subnets properties to align with other CDK constructs
3 participants
@iliapolo @aws-cdk-automation @eladb