Skip to content

Commit a33b68c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into jramacha-patch-1
2 parents 0f421b2 + a5a8855 commit a33b68c

25 files changed

Lines changed: 1600 additions & 27 deletions

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdkinteg-logs-resource-policy.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdkinteg-logs-resource-policy.template.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"Resources": {
3+
"AppLogsGroupC90FBC0A": {
4+
"Type": "AWS::Logs::LogGroup",
5+
"Properties": {
6+
"RetentionInDays": 731
7+
},
8+
"UpdateReplacePolicy": "Delete",
9+
"DeletionPolicy": "Delete"
10+
},
11+
"ResourcePolicyD790E185": {
12+
"Type": "AWS::Logs::ResourcePolicy",
13+
"Properties": {
14+
"PolicyDocument": {
15+
"Fn::Join": [
16+
"",
17+
[
18+
"{\"Statement\":[{\"Action\":[\"logs:CreateLogStream\",\"logs:PutLogEvents\"],\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"es.amazonaws.com\"},\"Resource\":\"",
19+
{
20+
"Fn::GetAtt": [
21+
"AppLogsGroupC90FBC0A",
22+
"Arn"
23+
]
24+
},
25+
"\"}],\"Version\":\"2012-10-17\"}"
26+
]
27+
]
28+
},
29+
"PolicyName": "cdkinteglogsresourcepolicyResourcePolicyB41E8C17"
30+
}
31+
}
32+
},
33+
"Outputs": {
34+
"ExportsOutputFnGetAttAppLogsGroupC90FBC0AArn7BBE8767": {
35+
"Value": {
36+
"Fn::GetAtt": [
37+
"AppLogsGroupC90FBC0A",
38+
"Arn"
39+
]
40+
},
41+
"Export": {
42+
"Name": "cdkinteg-logs-resource-policy:ExportsOutputFnGetAttAppLogsGroupC90FBC0AArn7BBE8767"
43+
}
44+
}
45+
},
46+
"Parameters": {
47+
"BootstrapVersion": {
48+
"Type": "AWS::SSM::Parameter::Value<String>",
49+
"Default": "/cdk-bootstrap/hnb659fds/version",
50+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
51+
}
52+
},
53+
"Rules": {
54+
"CheckBootstrapVersion": {
55+
"Assertions": [
56+
{
57+
"Assert": {
58+
"Fn::Not": [
59+
{
60+
"Fn::Contains": [
61+
[
62+
"1",
63+
"2",
64+
"3",
65+
"4",
66+
"5"
67+
],
68+
{
69+
"Ref": "BootstrapVersion"
70+
}
71+
]
72+
}
73+
]
74+
},
75+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
76+
}
77+
]
78+
}
79+
}
80+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdkinteg-opensearch-without-logs-resource-policy.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/cdkinteg-opensearch-without-logs-resource-policy.template.json‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
{
2+
"Resources": {
3+
"Domain66AC69E0": {
4+
"Type": "AWS::OpenSearchService::Domain",
5+
"Properties": {
6+
"ClusterConfig": {
7+
"DedicatedMasterEnabled": false,
8+
"InstanceCount": 1,
9+
"InstanceType": "r5.large.search",
10+
"MultiAZWithStandbyEnabled": false,
11+
"ZoneAwarenessEnabled": false
12+
},
13+
"DomainEndpointOptions": {
14+
"EnforceHTTPS": false,
15+
"TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07"
16+
},
17+
"EBSOptions": {
18+
"EBSEnabled": true,
19+
"VolumeSize": 10,
20+
"VolumeType": "gp2"
21+
},
22+
"EncryptionAtRestOptions": {
23+
"Enabled": false
24+
},
25+
"EngineVersion": "OpenSearch_2.11",
26+
"LogPublishingOptions": {
27+
"ES_APPLICATION_LOGS": {
28+
"CloudWatchLogsLogGroupArn": {
29+
"Fn::ImportValue": "cdkinteg-logs-resource-policy:ExportsOutputFnGetAttAppLogsGroupC90FBC0AArn7BBE8767"
30+
},
31+
"Enabled": true
32+
}
33+
},
34+
"NodeToNodeEncryptionOptions": {
35+
"Enabled": false
36+
}
37+
},
38+
"UpdateReplacePolicy": "Delete",
39+
"DeletionPolicy": "Delete"
40+
}
41+
},
42+
"Parameters": {
43+
"BootstrapVersion": {
44+
"Type": "AWS::SSM::Parameter::Value<String>",
45+
"Default": "/cdk-bootstrap/hnb659fds/version",
46+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
47+
}
48+
},
49+
"Rules": {
50+
"CheckBootstrapVersion": {
51+
"Assertions": [
52+
{
53+
"Assert": {
54+
"Fn::Not": [
55+
{
56+
"Fn::Contains": [
57+
[
58+
"1",
59+
"2",
60+
"3",
61+
"4",
62+
"5"
63+
],
64+
{
65+
"Ref": "BootstrapVersion"
66+
}
67+
]
68+
}
69+
]
70+
},
71+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
72+
}
73+
]
74+
}
75+
}
76+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-opensearchservice/test/integ.opensearch.without-logs-resource-policy.js.snapshot/integ.json‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)