Skip to content

Commit 1822cc9

Browse files
authored
feat(certificatemanager): key algorithm support for PrivateCertificate and Certificate (#28597)
Add support for key algorithm when requesting a certificate `keyAlgorithm` support for `DnsValidatedCertificate` is not supported since the construct was _deprecated_. Added a warning if user tries to use `keyAlgorithm` for the construct instead. CloudFormation docs for [key algorithm](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-keyalgorithm). Closes #22887. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 3bf57de commit 1822cc9

File tree

15 files changed

+755
-4
lines changed

15 files changed

+755
-4
lines changed

packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.certificate-key-algorithm.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-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/integ-key-algorithm.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.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"Resources": {
3+
"ECprime256v1A2C983CE": {
4+
"Type": "AWS::CertificateManager::Certificate",
5+
"Properties": {
6+
"DomainName": "*.example.com",
7+
"DomainValidationOptions": [
8+
{
9+
"DomainName": "*.example.com",
10+
"HostedZoneId": "Z23ABC4XYZL05B"
11+
}
12+
],
13+
"KeyAlgorithm": "EC_prime256v1",
14+
"Tags": [
15+
{
16+
"Key": "Name",
17+
"Value": "integ-key-algorithm/EC_prime256v1"
18+
}
19+
],
20+
"ValidationMethod": "DNS"
21+
}
22+
},
23+
"ECsecp384r16CA95ECC": {
24+
"Type": "AWS::CertificateManager::Certificate",
25+
"Properties": {
26+
"DomainName": "*.example.com",
27+
"DomainValidationOptions": [
28+
{
29+
"DomainName": "*.example.com",
30+
"HostedZoneId": "Z23ABC4XYZL05B"
31+
}
32+
],
33+
"KeyAlgorithm": "EC_secp384r1",
34+
"Tags": [
35+
{
36+
"Key": "Name",
37+
"Value": "integ-key-algorithm/EC_secp384r1"
38+
}
39+
],
40+
"ValidationMethod": "DNS"
41+
}
42+
},
43+
"RSA2048CD164E12": {
44+
"Type": "AWS::CertificateManager::Certificate",
45+
"Properties": {
46+
"DomainName": "*.example.com",
47+
"DomainValidationOptions": [
48+
{
49+
"DomainName": "*.example.com",
50+
"HostedZoneId": "Z23ABC4XYZL05B"
51+
}
52+
],
53+
"KeyAlgorithm": "RSA_2048",
54+
"Tags": [
55+
{
56+
"Key": "Name",
57+
"Value": "integ-key-algorithm/RSA_2048"
58+
}
59+
],
60+
"ValidationMethod": "DNS"
61+
}
62+
}
63+
},
64+
"Parameters": {
65+
"BootstrapVersion": {
66+
"Type": "AWS::SSM::Parameter::Value<String>",
67+
"Default": "/cdk-bootstrap/hnb659fds/version",
68+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
69+
}
70+
},
71+
"Rules": {
72+
"CheckBootstrapVersion": {
73+
"Assertions": [
74+
{
75+
"Assert": {
76+
"Fn::Not": [
77+
{
78+
"Fn::Contains": [
79+
[
80+
"1",
81+
"2",
82+
"3",
83+
"4",
84+
"5"
85+
],
86+
{
87+
"Ref": "BootstrapVersion"
88+
}
89+
]
90+
}
91+
]
92+
},
93+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
94+
}
95+
]
96+
}
97+
}
98+
}

packages/@aws-cdk-testing/framework-integ/test/aws-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/integ.json

Lines changed: 14 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-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/integtestDefaultTestDeployAssert24D5C536.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-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/integtestDefaultTestDeployAssert24D5C536.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-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/manifest.json

Lines changed: 125 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)