From 08183351fdd3ec50d0f28a74ecb4d6c936e7d026 Mon Sep 17 00:00:00 2001 From: Yathi <511386+yuth@users.noreply.github.com> Date: Mon, 27 Sep 2021 16:04:16 -0700 Subject: [PATCH] chore: add additional instance types to @searchable directive (#8284) --- .../src/cdk/create-cfnParameters.ts | 22 +++++++++++++++++++ .../src/resources.ts | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/packages/amplify-graphql-searchable-transformer/src/cdk/create-cfnParameters.ts b/packages/amplify-graphql-searchable-transformer/src/cdk/create-cfnParameters.ts index 239b0d66853..66dcb2bbc1f 100644 --- a/packages/amplify-graphql-searchable-transformer/src/cdk/create-cfnParameters.ts +++ b/packages/amplify-graphql-searchable-transformer/src/cdk/create-cfnParameters.ts @@ -15,6 +15,7 @@ export function createParametersStack(stack: Stack): Map { OpenSearchInstanceType, OpenSearchEBSVolumeGB, } = ResourceConstants.PARAMETERS; + return new Map([ [ OpenSearchAccessIAMRoleName, @@ -135,6 +136,27 @@ export function createParametersStack(stack: Stack): Map { 'i3.4xlarge.elasticsearch', 'i3.8xlarge.elasticsearch', 'i3.16xlarge.elasticsearch', + 'r6gd.12xlarge.elasticsearch', + 'ultrawarm1.xlarge.elasticsearch', + 'm5.4xlarge.elasticsearch', + 't3.xlarge.elasticsearch', + 'm6g.xlarge.elasticsearch', + 'm6g.12xlarge.elasticsearch', + 't2.micro.elasticsearch', + 'r6gd.16xlarge.elasticsearch', + 'd2.2xlarge.elasticsearch', + 't3.micro.elasticsearch', + 'm5.large.elasticsearch', + 'd2.4xlarge.elasticsearch', + 't3.small.elasticsearch', + 'c5.2xlarge.elasticsearch', + 'c6g.2xlarge.elasticsearch', + 'd2.8xlarge.elasticsearch', + 'c5.4xlarge.elasticsearch', + 't4g.medium.elasticsearch', + 'c6g.4xlarge.elasticsearch', + 'c6g.xlarge.elasticsearch', + 'c6g.12xlarge.elasticsearch', ], }), ], diff --git a/packages/graphql-elasticsearch-transformer/src/resources.ts b/packages/graphql-elasticsearch-transformer/src/resources.ts index e5342be879c..1c7e7a4aaf7 100644 --- a/packages/graphql-elasticsearch-transformer/src/resources.ts +++ b/packages/graphql-elasticsearch-transformer/src/resources.ts @@ -98,6 +98,27 @@ export class ResourceFactory { 'i3.4xlarge.elasticsearch', 'i3.8xlarge.elasticsearch', 'i3.16xlarge.elasticsearch', + 'r6gd.12xlarge.elasticsearch', + 'ultrawarm1.xlarge.elasticsearch', + 'm5.4xlarge.elasticsearch', + 't3.xlarge.elasticsearch', + 'm6g.xlarge.elasticsearch', + 'm6g.12xlarge.elasticsearch', + 't2.micro.elasticsearch', + 'r6gd.16xlarge.elasticsearch', + 'd2.2xlarge.elasticsearch', + 't3.micro.elasticsearch', + 'm5.large.elasticsearch', + 'd2.4xlarge.elasticsearch', + 't3.small.elasticsearch', + 'c5.2xlarge.elasticsearch', + 'c6g.2xlarge.elasticsearch', + 'd2.8xlarge.elasticsearch', + 'c5.4xlarge.elasticsearch', + 't4g.medium.elasticsearch', + 'c6g.4xlarge.elasticsearch', + 'c6g.xlarge.elasticsearch', + 'c6g.12xlarge.elasticsearch', ], }), [ResourceConstants.PARAMETERS.ElasticsearchEBSVolumeGB]: new NumberParameter({