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

feat(opensearch): add support for latest amazon opensearch service 2.3 #22943

Merged
merged 13 commits into from
Jan 15, 2023
Merged

feat(opensearch): add support for latest amazon opensearch service 2.3 #22943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
00779e9
feat(opensearch): add support for latest amazon opensearch service 2.3
agusti-t Nov 22, 2022
adac963
chore(aws-appsync/test): Changes in existing generated files
agusti-t Nov 24, 2022
bc46258
style(aws-appsync/test): Remove extra line
agusti-t Nov 24, 2022
b00ba6c
chore(aws-appsync/test): Generated files due to opensearch version
agusti-t Nov 24, 2022
15cb27b
chore(aws-appsync/test): Generated files due to opensearch version (2)
agusti-t Nov 24, 2022
3c4f224
docs(opensearch/version): Clarify availability of 2.3
agusti-t Nov 24, 2022
87704cd
fix(appsync/test): Fix linting
agusti-t Nov 24, 2022
575103d
Revert "chore(aws-appsync/test): Changes in existing generated files"
TheRealAmazonKendra Jan 12, 2023
d1cbfca
Revert "chore(aws-appsync/test): Generated files due to opensearch ve…
TheRealAmazonKendra Jan 12, 2023
6935cf6
Revert "chore(aws-appsync/test): Generated files due to opensearch ve…
TheRealAmazonKendra Jan 12, 2023
e434a6b
update integ tests
TheRealAmazonKendra Jan 12, 2023
0f70273
test(opensearch): Run unit test for all OpenSearch engine versions
agusti-t Jan 13, 2023
efe6e63
Merge branch 'main' into OpenSearch_2_3
mergify[bot] Jan 14, 2023
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appsync/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ import * as opensearch from '@aws-cdk/aws-opensearchservice';

const user = new iam.User(this, 'User');
const domain = new opensearch.Domain(this, 'Domain', {
version: opensearch.EngineVersion.OPENSEARCH_1_3,
version: opensearch.EngineVersion.OPENSEARCH_2_3,
removalPolicy: RemovalPolicy.DESTROY,
fineGrainedAccessControl: { masterUserArn: user.userArn },
encryptionAtRest: { enabled: true },
Expand Down
6 changes: 3 additions & 3 deletions ...-cdk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "22.0.0",
"version": "29.0.0",
"files": {
"cbf69265acb5253067d9fc78cec3e7b151737dc0ba84d10aedd04a2c12f84bc4": {
"f8a2a9f9e0d429354b6c00646ad4364f5e46ab6ceecf270d2ff59b9befcba8b5": {
"source": {
"path": "appsync-opensearch.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "cbf69265acb5253067d9fc78cec3e7b151737dc0ba84d10aedd04a2c12f84bc4.json",
"objectKey": "f8a2a9f9e0d429354b6c00646ad4364f5e46ab6ceecf270d2ff59b9befcba8b5.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...dk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/appsync-opensearch.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"EncryptionAtRestOptions": {
"Enabled": true
},
"EngineVersion": "OpenSearch_1.3",
"EngineVersion": "OpenSearch_2.3",
"LogPublishingOptions": {},
"NodeToNodeEncryptionOptions": {
"Enabled": true
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"22.0.0"}
{"version":"29.0.0"}
12 changes: 5 additions & 7 deletions packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"version": "22.0.0",
"version": "29.0.0",
"testCases": {
"integ.graphql-opensearch": {
"opensearch-2.3-stack/DefaultTest": {
"stacks": [
"appsync-opensearch"
],
"diffAssets": false,
"stackUpdateWorkflow": true
"assertionStack": "opensearch-2.3-stack/DefaultTest/DeployAssert",
"assertionStackName": "opensearch23stackDefaultTestDeployAssert16E12129"
}
},
"synthContext": {},
"enableLookups": false
}
}
54 changes: 46 additions & 8 deletions packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "22.0.0",
"version": "29.0.0",
"artifacts": {
"appsync-opensearch.assets": {
"type": "cdk:asset-manifest",
Expand All @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cbf69265acb5253067d9fc78cec3e7b151737dc0ba84d10aedd04a2c12f84bc4.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f8a2a9f9e0d429354b6c00646ad4364f5e46ab6ceecf270d2ff59b9befcba8b5.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -98,18 +98,56 @@
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "appsync-opensearch"
},
"opensearch23stackDefaultTestDeployAssert16E12129.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "opensearch23stackDefaultTestDeployAssert16E12129.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"opensearch23stackDefaultTestDeployAssert16E12129": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "opensearch23stackDefaultTestDeployAssert16E12129.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"opensearch23stackDefaultTestDeployAssert16E12129.assets"
],
"apidsQuerygetTestsResolver5C6FBB59": [
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"opensearch23stackDefaultTestDeployAssert16E12129.assets"
],
"metadata": {
"/opensearch-2.3-stack/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/opensearch-2.3-stack/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "apidsQuerygetTestsResolver5C6FBB59",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "appsync-opensearch"
"displayName": "opensearch-2.3-stack/DefaultTest/DeployAssert"
},
"Tree": {
"type": "cdk:tree",
Expand Down
19 changes: 19 additions & 0 deletions ...aphql-opensearch.js.snapshot/opensearch23stackDefaultTestDeployAssert16E12129.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "29.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
"path": "opensearch23stackDefaultTestDeployAssert16E12129.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
36 changes: 36 additions & 0 deletions ...hql-opensearch.js.snapshot/opensearch23stackDefaultTestDeployAssert16E12129.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
58 changes: 56 additions & 2 deletions packages/@aws-cdk/aws-appsync/test/integ.graphql-opensearch.js.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"encryptionAtRestOptions": {
"enabled": true
},
"engineVersion": "OpenSearch_1.3",
"engineVersion": "OpenSearch_2.3",
"logPublishingOptions": {},
"nodeToNodeEncryptionOptions": {
"enabled": true
Expand Down Expand Up @@ -383,12 +383,66 @@
"version": "0.0.0"
}
},
"opensearch-2.3-stack": {
"id": "opensearch-2.3-stack",
"path": "opensearch-2.3-stack",
"children": {
"DefaultTest": {
"id": "DefaultTest",
"path": "opensearch-2.3-stack/DefaultTest",
"children": {
"Default": {
"id": "Default",
"path": "opensearch-2.3-stack/DefaultTest/Default",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.209"
}
},
"DeployAssert": {
"id": "DeployAssert",
"path": "opensearch-2.3-stack/DefaultTest/DeployAssert",
"children": {
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "opensearch-2.3-stack/DefaultTest/DeployAssert/BootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "opensearch-2.3-stack/DefaultTest/DeployAssert/CheckBootstrapVersion",
"constructInfo": {
"fqn": "@aws-cdk/core.CfnRule",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/core.Stack",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/integ-tests.IntegTestCase",
"version": "0.0.0"
}
}
},
"constructInfo": {
"fqn": "@aws-cdk/integ-tests.IntegTest",
"version": "0.0.0"
}
},
"Tree": {
"id": "Tree",
"path": "Tree",
"constructInfo": {
"fqn": "constructs.Construct",
"version": "10.1.182"
"version": "10.1.209"
}
}
},
Expand Down
Loading