Skip to content

Commit 866e868

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Allowed AMIs adds support for four new parameters - marketplaceProductCodes, deprecationTimeCondition, creationDateCondition and imageNames
1 parent cc39ad8 commit 866e868

26 files changed

+1246
-236
lines changed

‎generator/ServiceModels/ec2/ec2-2016-11-15.api.json‎

Lines changed: 99 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14834,6 +14834,21 @@
1483414834
}
1483514835
}
1483614836
},
14837+
"CreationDateCondition":{
14838+
"type":"structure",
14839+
"members":{
14840+
"MaximumDaysSinceCreated":{
14841+
"shape":"MaximumDaysSinceCreatedValue",
14842+
"locationName":"maximumDaysSinceCreated"
14843+
}
14844+
}
14845+
},
14846+
"CreationDateConditionRequest":{
14847+
"type":"structure",
14848+
"members":{
14849+
"MaximumDaysSinceCreated":{"shape":"MaximumDaysSinceCreatedValue"}
14850+
}
14851+
},
1483714852
"CreditSpecification":{
1483814853
"type":"structure",
1483914854
"members":{
@@ -16684,6 +16699,21 @@
1668416699
}
1668516700
}
1668616701
},
16702+
"DeprecationTimeCondition":{
16703+
"type":"structure",
16704+
"members":{
16705+
"MaximumDaysSinceDeprecated":{
16706+
"shape":"MaximumDaysSinceDeprecatedValue",
16707+
"locationName":"maximumDaysSinceDeprecated"
16708+
}
16709+
}
16710+
},
16711+
"DeprecationTimeConditionRequest":{
16712+
"type":"structure",
16713+
"members":{
16714+
"MaximumDaysSinceDeprecated":{"shape":"MaximumDaysSinceDeprecatedValue"}
16715+
}
16716+
},
1668716717
"DeprovisionByoipCidrRequest":{
1668816718
"type":"structure",
1668916719
"required":["Cidr"],
@@ -28919,6 +28949,22 @@
2891928949
"ImageProviders":{
2892028950
"shape":"ImageProviderList",
2892128951
"locationName":"imageProviderSet"
28952+
},
28953+
"MarketplaceProductCodes":{
28954+
"shape":"MarketplaceProductCodeList",
28955+
"locationName":"marketplaceProductCodeSet"
28956+
},
28957+
"ImageNames":{
28958+
"shape":"ImageNameList",
28959+
"locationName":"imageNameSet"
28960+
},
28961+
"DeprecationTimeCondition":{
28962+
"shape":"DeprecationTimeCondition",
28963+
"locationName":"deprecationTimeCondition"
28964+
},
28965+
"CreationDateCondition":{
28966+
"shape":"CreationDateCondition",
28967+
"locationName":"creationDateCondition"
2892228968
}
2892328969
}
2892428970
},
@@ -28935,7 +28981,17 @@
2893528981
"ImageProviders":{
2893628982
"shape":"ImageProviderRequestList",
2893728983
"locationName":"ImageProvider"
28938-
}
28984+
},
28985+
"MarketplaceProductCodes":{
28986+
"shape":"MarketplaceProductCodeRequestList",
28987+
"locationName":"MarketplaceProductCode"
28988+
},
28989+
"ImageNames":{
28990+
"shape":"ImageNameRequestList",
28991+
"locationName":"ImageName"
28992+
},
28993+
"DeprecationTimeCondition":{"shape":"DeprecationTimeConditionRequest"},
28994+
"CreationDateCondition":{"shape":"CreationDateConditionRequest"}
2893928995
}
2894028996
},
2894128997
"ImageCriterionRequestList":{
@@ -29026,6 +29082,22 @@
2902629082
}
2902729083
}
2902829084
},
29085+
"ImageName":{"type":"string"},
29086+
"ImageNameList":{
29087+
"type":"list",
29088+
"member":{
29089+
"shape":"ImageName",
29090+
"locationName":"item"
29091+
}
29092+
},
29093+
"ImageNameRequest":{"type":"string"},
29094+
"ImageNameRequestList":{
29095+
"type":"list",
29096+
"member":{
29097+
"shape":"ImageNameRequest",
29098+
"locationName":"item"
29099+
}
29100+
},
2902929101
"ImageProvider":{"type":"string"},
2903029102
"ImageProviderList":{
2903129103
"type":"list",
@@ -36877,6 +36949,22 @@
3687736949
"capacity-block"
3687836950
]
3687936951
},
36952+
"MarketplaceProductCode":{"type":"string"},
36953+
"MarketplaceProductCodeList":{
36954+
"type":"list",
36955+
"member":{
36956+
"shape":"MarketplaceProductCode",
36957+
"locationName":"item"
36958+
}
36959+
},
36960+
"MarketplaceProductCodeRequest":{"type":"string"},
36961+
"MarketplaceProductCodeRequestList":{
36962+
"type":"list",
36963+
"member":{
36964+
"shape":"MarketplaceProductCodeRequest",
36965+
"locationName":"item"
36966+
}
36967+
},
3688036968
"MaxIpv4AddrPerInterface":{"type":"integer"},
3688136969
"MaxIpv6AddrPerInterface":{"type":"integer"},
3688236970
"MaxNetworkInterfaces":{"type":"integer"},
@@ -36887,6 +36975,16 @@
3688736975
"min":0
3688836976
},
3688936977
"MaximumBandwidthInMbps":{"type":"integer"},
36978+
"MaximumDaysSinceCreatedValue":{
36979+
"type":"integer",
36980+
"max":2147483647,
36981+
"min":0
36982+
},
36983+
"MaximumDaysSinceDeprecatedValue":{
36984+
"type":"integer",
36985+
"max":2147483647,
36986+
"min":0
36987+
},
3689036988
"MaximumEbsAttachments":{"type":"integer"},
3689136989
"MaximumEfaInterfaces":{"type":"integer"},
3689236990
"MaximumEnaQueueCount":{"type":"integer"},

‎generator/ServiceModels/ec2/ec2-2016-11-15.docs.json‎

Lines changed: 97 additions & 11 deletions
Large diffs are not rendered by default.

‎generator/ServiceModels/ec2/ec2-2016-11-15.normal.json‎

Lines changed: 133 additions & 11 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,26 @@
971971
<min>1</min>
972972
<max>65535</max>
973973
</property-value-rule>
974+
<property-value-rule>
975+
<property>Amazon.EC2.Model.CreationDateCondition.MaximumDaysSinceCreated</property>
976+
<min>0</min>
977+
<max>2147483647</max>
978+
</property-value-rule>
979+
<property-value-rule>
980+
<property>Amazon.EC2.Model.CreationDateConditionRequest.MaximumDaysSinceCreated</property>
981+
<min>0</min>
982+
<max>2147483647</max>
983+
</property-value-rule>
984+
<property-value-rule>
985+
<property>Amazon.EC2.Model.DeprecationTimeCondition.MaximumDaysSinceDeprecated</property>
986+
<min>0</min>
987+
<max>2147483647</max>
988+
</property-value-rule>
989+
<property-value-rule>
990+
<property>Amazon.EC2.Model.DeprecationTimeConditionRequest.MaximumDaysSinceDeprecated</property>
991+
<min>0</min>
992+
<max>2147483647</max>
993+
</property-value-rule>
974994
<property-value-rule>
975995
<property>Amazon.EC2.Model.Ec2InstanceConnectEndpoint.InstanceConnectEndpointArn</property>
976996
<min>1</min>

‎sdk/src/Services/EC2/Generated/Model/CopySnapshotRequest.cs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,17 @@ namespace Amazon.EC2.Model
5555
/// </para>
5656
/// </li> </ul>
5757
/// <para>
58-
/// When copying snapshots to a Region, copies of encrypted EBS snapshots remain encrypted.
59-
/// Copies of unencrypted snapshots remain unencrypted, unless you enable encryption for
60-
/// the snapshot copy operation. By default, encrypted snapshot copies use the default
61-
/// KMS key; however, you can specify a different KMS key. To copy an encrypted snapshot
62-
/// that has been shared from another account, you must have permissions for the KMS key
63-
/// used to encrypt the snapshot.
58+
/// When copying snapshots to a Region, the encryption outcome for the snapshot copy depends
59+
/// on the Amazon EBS encryption by default setting for the destination Region, the encryption
60+
/// status of the source snapshot, and the encryption parameters you specify in the request.
61+
/// For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-copy-snapshot.html#creating-encrypted-snapshots">
62+
/// Encryption and snapshot copying</a>.
6463
/// </para>
6564
///
6665
/// <para>
67-
/// Snapshots copied to an Outpost are encrypted by default using the default encryption
68-
/// key for the Region, or a different key that you specify in the request using <b>KmsKeyId</b>.
69-
/// Outposts do not support unencrypted snapshots. For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#ami">Amazon
70-
/// EBS local snapshots on Outposts</a> in the <i>Amazon EBS User Guide</i>.
66+
/// Snapshots copied to an Outpost must be encrypted. Unencrypted snapshots are not supported
67+
/// on Outposts. For more information, <a href="https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#considerations">
68+
/// Amazon EBS local snapshots on Outposts</a>.
7169
/// </para>
7270
/// <note>
7371
/// <para>
@@ -225,10 +223,10 @@ internal bool IsSetDestinationRegion()
225223
/// Gets and sets the property Encrypted.
226224
/// <para>
227225
/// To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled,
228-
/// enable encryption using this parameter. Otherwise, omit this parameter. Encrypted
229-
/// snapshots are encrypted, even if you omit this parameter and encryption by default
230-
/// is not enabled. You cannot set this parameter to false. For more information, see
231-
/// <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon
226+
/// enable encryption using this parameter. Otherwise, omit this parameter. Copies of
227+
/// encrypted snapshots are encrypted, even if you omit this parameter and encryption
228+
/// by default is not enabled. You cannot set this parameter to false. For more information,
229+
/// see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon
232230
/// EBS encryption</a> in the <i>Amazon EBS User Guide</i>.
233231
/// </para>
234232
/// </summary>

‎sdk/src/Services/EC2/Generated/Model/CreateFpgaImageRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ namespace Amazon.EC2.Model
3535
///
3636
///
3737
/// <para>
38-
/// The create operation is asynchronous. To verify that the AFI is ready for use, check
39-
/// the output logs.
38+
/// The create operation is asynchronous. To verify that the AFI was successfully created
39+
/// and is ready for use, check the output logs.
4040
/// </para>
4141
///
4242
/// <para>

‎sdk/src/Services/EC2/Generated/Model/CreationDateCondition.cs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
/*
17+
* Do not modify this file. This file is generated from the ec2-2016-11-15.normal.json service model.
18+
*/
19+
using System;
20+
using System.Collections.Generic;
21+
using System.Xml.Serialization;
22+
using System.Text;
23+
using System.IO;
24+
using System.Net;
25+
26+
using Amazon.Runtime;
27+
using Amazon.Runtime.Internal;
28+
29+
#pragma warning disable CS0612,CS0618,CS1570
30+
namespace Amazon.EC2.Model
31+
{
32+
/// <summary>
33+
/// The maximum age for allowed images.
34+
/// </summary>
35+
public partial class CreationDateCondition
36+
{
37+
private int? _maximumDaysSinceCreated;
38+
39+
/// <summary>
40+
/// Gets and sets the property MaximumDaysSinceCreated.
41+
/// <para>
42+
/// The maximum number of days that have elapsed since the image was created. For example,
43+
/// a value of <c>300</c> allows images that were created within the last 300 days.
44+
/// </para>
45+
/// </summary>
46+
[AWSProperty(Min=0, Max=2147483647)]
47+
public int MaximumDaysSinceCreated
48+
{
49+
get { return this._maximumDaysSinceCreated.GetValueOrDefault(); }
50+
set { this._maximumDaysSinceCreated = value; }
51+
}
52+
53+
// Check to see if MaximumDaysSinceCreated property is set
54+
internal bool IsSetMaximumDaysSinceCreated()
55+
{
56+
return this._maximumDaysSinceCreated.HasValue;
57+
}
58+
59+
}
60+
}

‎sdk/src/Services/EC2/Generated/Model/CreationDateConditionRequest.cs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
/*
17+
* Do not modify this file. This file is generated from the ec2-2016-11-15.normal.json service model.
18+
*/
19+
using System;
20+
using System.Collections.Generic;
21+
using System.Xml.Serialization;
22+
using System.Text;
23+
using System.IO;
24+
using System.Net;
25+
26+
using Amazon.Runtime;
27+
using Amazon.Runtime.Internal;
28+
29+
#pragma warning disable CS0612,CS0618,CS1570
30+
namespace Amazon.EC2.Model
31+
{
32+
/// <summary>
33+
/// The maximum age for allowed images.
34+
/// </summary>
35+
public partial class CreationDateConditionRequest
36+
{
37+
private int? _maximumDaysSinceCreated;
38+
39+
/// <summary>
40+
/// Gets and sets the property MaximumDaysSinceCreated.
41+
/// <para>
42+
/// The maximum number of days that have elapsed since the image was created. For example,
43+
/// a value of <c>300</c> allows images that were created within the last 300 days.
44+
/// </para>
45+
/// </summary>
46+
[AWSProperty(Min=0, Max=2147483647)]
47+
public int MaximumDaysSinceCreated
48+
{
49+
get { return this._maximumDaysSinceCreated.GetValueOrDefault(); }
50+
set { this._maximumDaysSinceCreated = value; }
51+
}
52+
53+
// Check to see if MaximumDaysSinceCreated property is set
54+
internal bool IsSetMaximumDaysSinceCreated()
55+
{
56+
return this._maximumDaysSinceCreated.HasValue;
57+
}
58+
59+
}
60+
}

0 commit comments

Comments
 (0)