Skip to content

Commit a71baaa

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Add support for file-based HTTP domain control validation, available through Amazon CloudFront.
1 parent e2de3c0 commit a71baaa

27 files changed

+737
-385
lines changed

‎generator/ServiceModels/acm/acm-2015-12-08.api.json

Lines changed: 82 additions & 69 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/acm/acm-2015-12-08.docs.json

Lines changed: 23 additions & 6 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/acm/acm-2015-12-08.normal.json

Lines changed: 106 additions & 65 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/acm/acm-2015-12-08.paginators.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"pagination": {
33
"ListCertificates": {
44
"input_token": "NextToken",
5-
"limit_key": "MaxItems",
65
"output_token": "NextToken",
6+
"limit_key": "MaxItems",
77
"result_key": "CertificateSummaryList"
88
}
99
}
10-
}
10+
}

‎generator/ServiceModels/acm/acm-2015-12-08.smoke.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎generator/ServiceModels/acm/acm-2015-12-08.smoke2.json

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
{
2-
"version": 2,
3-
"testCases": [
4-
{
5-
"id": "ListCertificatesSuccess",
6-
"operationName": "ListCertificates",
7-
"input": {},
8-
"expectation": {
9-
"success": {}
10-
},
11-
"config": {
12-
"region": "us-west-2"
13-
}
14-
},
15-
{
16-
"id": "GetCertificateFailure",
17-
"operationName": "GetCertificate",
18-
"input": {
19-
"CertificateArn": "arn:aws:acm:region:123456789012:certificate\/12345678-1234-1234-1234-123456789012"
20-
},
21-
"expectation": {
22-
"failure": {}
23-
},
24-
"config": {
25-
"region": "us-west-2"
26-
}
27-
}
28-
]
29-
}
2+
"version" : 2,
3+
"testCases" : [ {
4+
"id" : "ListCertificatesSuccess",
5+
"operationName" : "ListCertificates",
6+
"input" : { },
7+
"expectation" : {
8+
"success" : { }
9+
},
10+
"config" : {
11+
"region" : "us-west-2",
12+
"useFips" : false,
13+
"useDualstack" : false,
14+
"useAccountIdRouting" : true
15+
}
16+
}, {
17+
"id" : "GetCertificateFailure",
18+
"operationName" : "GetCertificate",
19+
"input" : {
20+
"CertificateArn" : "arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012"
21+
},
22+
"expectation" : {
23+
"failure" : { }
24+
},
25+
"config" : {
26+
"region" : "us-west-2",
27+
"useFips" : false,
28+
"useDualstack" : false,
29+
"useAccountIdRouting" : true
30+
}
31+
} ]
32+
}

‎generator/ServiceModels/acm/acm-2015-12-08.waiters2.json

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
{
2-
"version": 2,
3-
"waiters": {
4-
"CertificateValidated": {
5-
"delay": 60,
6-
"maxAttempts": 40,
7-
"operation": "DescribeCertificate",
8-
"acceptors": [
9-
{
10-
"matcher": "pathAll",
11-
"expected": "SUCCESS",
12-
"argument": "Certificate.DomainValidationOptions[].ValidationStatus",
13-
"state": "success"
14-
},
15-
{
16-
"matcher": "pathAny",
17-
"expected": "PENDING_VALIDATION",
18-
"argument": "Certificate.DomainValidationOptions[].ValidationStatus",
19-
"state": "retry"
20-
},
21-
{
22-
"matcher": "path",
23-
"expected": "FAILED",
24-
"argument": "Certificate.Status",
25-
"state": "failure"
26-
},
27-
{
28-
"matcher": "error",
29-
"expected": "ResourceNotFoundException",
30-
"state": "failure"
31-
}
32-
]
2+
"version" : 2,
3+
"waiters" : {
4+
"CertificateValidated" : {
5+
"delay" : 60,
6+
"maxAttempts" : 5,
7+
"operation" : "DescribeCertificate",
8+
"acceptors" : [ {
9+
"matcher" : "pathAll",
10+
"argument" : "Certificate.DomainValidationOptions[].ValidationStatus",
11+
"state" : "success",
12+
"expected" : "SUCCESS"
13+
}, {
14+
"matcher" : "pathAny",
15+
"argument" : "Certificate.DomainValidationOptions[].ValidationStatus",
16+
"state" : "retry",
17+
"expected" : "PENDING_VALIDATION"
18+
}, {
19+
"matcher" : "path",
20+
"argument" : "Certificate.Status",
21+
"state" : "failure",
22+
"expected" : "FAILED"
23+
}, {
24+
"matcher" : "error",
25+
"state" : "failure",
26+
"expected" : "ResourceNotFoundException"
27+
} ]
3328
}
3429
}
35-
}
30+
}

‎sdk/code-analysis/ServiceAnalysis/CertificateManager/Generated/PropertyValueRules.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<property>Amazon.CertificateManager.Model.RequestCertificateRequest.DomainName</property>
144144
<min>1</min>
145145
<max>253</max>
146-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
146+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
147147
</property-value-rule>
148148
<property-value-rule>
149149
<property>Amazon.CertificateManager.Model.RequestCertificateRequest.IdempotencyToken</property>
@@ -167,13 +167,13 @@
167167
<property>Amazon.CertificateManager.Model.ResendValidationEmailRequest.Domain</property>
168168
<min>1</min>
169169
<max>253</max>
170-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
170+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
171171
</property-value-rule>
172172
<property-value-rule>
173173
<property>Amazon.CertificateManager.Model.ResendValidationEmailRequest.ValidationDomain</property>
174174
<min>1</min>
175175
<max>253</max>
176-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
176+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
177177
</property-value-rule>
178178
<property-value-rule>
179179
<property>Amazon.CertificateManager.Model.UpdateCertificateOptionsRequest.CertificateArn</property>
@@ -197,7 +197,7 @@
197197
<property>Amazon.CertificateManager.Model.CertificateDetail.DomainName</property>
198198
<min>1</min>
199199
<max>253</max>
200-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
200+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
201201
</property-value-rule>
202202
<property-value-rule>
203203
<property>Amazon.CertificateManager.Model.CertificateSummary.CertificateArn</property>
@@ -209,31 +209,31 @@
209209
<property>Amazon.CertificateManager.Model.CertificateSummary.DomainName</property>
210210
<min>1</min>
211211
<max>253</max>
212-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
212+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
213213
</property-value-rule>
214214
<property-value-rule>
215215
<property>Amazon.CertificateManager.Model.DomainValidation.DomainName</property>
216216
<min>1</min>
217217
<max>253</max>
218-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
218+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
219219
</property-value-rule>
220220
<property-value-rule>
221221
<property>Amazon.CertificateManager.Model.DomainValidation.ValidationDomain</property>
222222
<min>1</min>
223223
<max>253</max>
224-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
224+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
225225
</property-value-rule>
226226
<property-value-rule>
227227
<property>Amazon.CertificateManager.Model.DomainValidationOption.DomainName</property>
228228
<min>1</min>
229229
<max>253</max>
230-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
230+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
231231
</property-value-rule>
232232
<property-value-rule>
233233
<property>Amazon.CertificateManager.Model.DomainValidationOption.ValidationDomain</property>
234234
<min>1</min>
235235
<max>253</max>
236-
<pattern>^(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])$</pattern>
236+
<pattern>(\*\.)?(((?!-)[A-Za-z0-9-]{0,62}[A-Za-z0-9])\.)+((?!-)[A-Za-z0-9-]{1,62}[A-Za-z0-9])</pattern>
237237
</property-value-rule>
238238
<property-value-rule>
239239
<property>Amazon.CertificateManager.Model.ExpiryEventsConfiguration.DaysBeforeExpiry</property>

‎sdk/src/Services/CertificateManager/Generated/Model/CertificateDetail.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public partial class CertificateDetail
4848
private string _issuer;
4949
private KeyAlgorithm _keyAlgorithm;
5050
private List<KeyUsage> _keyUsages = AWSConfigs.InitializeCollections ? new List<KeyUsage>() : null;
51+
private CertificateManagedBy _managedBy;
5152
private DateTime? _notAfter;
5253
private DateTime? _notBefore;
5354
private CertificateOptions _options;
@@ -319,6 +320,25 @@ internal bool IsSetKeyUsages()
319320
return this._keyUsages != null && (this._keyUsages.Count > 0 || !AWSConfigs.InitializeCollections);
320321
}
321322

323+
/// <summary>
324+
/// Gets and sets the property ManagedBy.
325+
/// <para>
326+
/// Identifies the Amazon Web Services service that manages the certificate issued by
327+
/// ACM.
328+
/// </para>
329+
/// </summary>
330+
public CertificateManagedBy ManagedBy
331+
{
332+
get { return this._managedBy; }
333+
set { this._managedBy = value; }
334+
}
335+
336+
// Check to see if ManagedBy property is set
337+
internal bool IsSetManagedBy()
338+
{
339+
return this._managedBy != null;
340+
}
341+
322342
/// <summary>
323343
/// Gets and sets the property NotAfter.
324344
/// <para>

‎sdk/src/Services/CertificateManager/Generated/Model/CertificateSummary.cs

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public partial class CertificateSummary
4545
private DateTime? _issuedAt;
4646
private KeyAlgorithm _keyAlgorithm;
4747
private List<string> _keyUsages = AWSConfigs.InitializeCollections ? new List<string>() : null;
48+
private CertificateManagedBy _managedBy;
4849
private DateTime? _notAfter;
4950
private DateTime? _notBefore;
5051
private RenewalEligibility _renewalEligibility;
@@ -162,11 +163,12 @@ internal bool IsSetExtendedKeyUsages()
162163
/// <summary>
163164
/// Gets and sets the property HasAdditionalSubjectAlternativeNames.
164165
/// <para>
165-
/// When called by <a>ListCertificates</a>, indicates whether the full list of subject
166-
/// alternative names has been included in the response. If false, the response includes
167-
/// all of the subject alternative names included in the certificate. If true, the response
168-
/// only includes the first 100 subject alternative names included in the certificate.
169-
/// To display the full list of subject alternative names, use <a>DescribeCertificate</a>.
166+
/// When called by <a href="https://docs.aws.amazon.com/acm/latestAPIReference/API_ListCertificates.html">ListCertificates</a>,
167+
/// indicates whether the full list of subject alternative names has been included in
168+
/// the response. If false, the response includes all of the subject alternative names
169+
/// included in the certificate. If true, the response only includes the first 100 subject
170+
/// alternative names included in the certificate. To display the full list of subject
171+
/// alternative names, use <a href="https://docs.aws.amazon.com/acm/latestAPIReference/API_DescribeCertificate.html">DescribeCertificate</a>.
170172
/// </para>
171173
/// </summary>
172174
public bool? HasAdditionalSubjectAlternativeNames
@@ -275,6 +277,25 @@ internal bool IsSetKeyUsages()
275277
return this._keyUsages != null && (this._keyUsages.Count > 0 || !AWSConfigs.InitializeCollections);
276278
}
277279

280+
/// <summary>
281+
/// Gets and sets the property ManagedBy.
282+
/// <para>
283+
/// Identifies the Amazon Web Services service that manages the certificate issued by
284+
/// ACM.
285+
/// </para>
286+
/// </summary>
287+
public CertificateManagedBy ManagedBy
288+
{
289+
get { return this._managedBy; }
290+
set { this._managedBy = value; }
291+
}
292+
293+
// Check to see if ManagedBy property is set
294+
internal bool IsSetManagedBy()
295+
{
296+
return this._managedBy != null;
297+
}
298+
278299
/// <summary>
279300
/// Gets and sets the property NotAfter.
280301
/// <para>
@@ -389,9 +410,9 @@ internal bool IsSetStatus()
389410
/// </para>
390411
///
391412
/// <para>
392-
/// When called by <a>ListCertificates</a>, this parameter will only return the first
393-
/// 100 subject alternative names included in the certificate. To display the full list
394-
/// of subject alternative names, use <a>DescribeCertificate</a>.
413+
/// When called by <a href="https://docs.aws.amazon.com/acm/latestAPIReference/API_ListCertificates.html">ListCertificates</a>,
414+
/// this parameter will only return the first 100 subject alternative names included in
415+
/// the certificate. To display the full list of subject alternative names, use <a href="https://docs.aws.amazon.com/acm/latestAPIReference/API_DescribeCertificate.html">DescribeCertificate</a>.
395416
/// </para>
396417
/// </summary>
397418
[AWSProperty(Min=1, Max=100)]

0 commit comments

Comments
 (0)