Skip to content

Commit 1f46925

Browse files
This release adds AvailabilityZoneId support for CreateVolume, DescribeVolume, LaunchTemplates, RunInstances, DescribeInstances, CreateDefaultSubnet, SpotInstances, and CreateDefaultSubnet APIs.
1 parent a6cd2ca commit 1f46925

File tree

63 files changed

+1183
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1183
-311
lines changed

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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11936,11 +11936,11 @@
1193611936
},
1193711937
"CreateDefaultSubnetRequest":{
1193811938
"type":"structure",
11939-
"required":["AvailabilityZone"],
1194011939
"members":{
1194111940
"AvailabilityZone":{"shape":"AvailabilityZoneName"},
1194211941
"DryRun":{"shape":"Boolean"},
11943-
"Ipv6Native":{"shape":"Boolean"}
11942+
"Ipv6Native":{"shape":"Boolean"},
11943+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"}
1194411944
}
1194511945
},
1194611946
"CreateDefaultSubnetResult":{
@@ -14399,9 +14399,9 @@
1439914399
},
1440014400
"CreateVolumeRequest":{
1440114401
"type":"structure",
14402-
"required":["AvailabilityZone"],
1440314402
"members":{
1440414403
"AvailabilityZone":{"shape":"AvailabilityZoneName"},
14404+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
1440514405
"Encrypted":{
1440614406
"shape":"Boolean",
1440714407
"locationName":"encrypted"
@@ -20768,6 +20768,7 @@
2076820768
"DescribeSpotPriceHistoryRequest":{
2076920769
"type":"structure",
2077020770
"members":{
20771+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
2077120772
"DryRun":{
2077220773
"shape":"Boolean",
2077320774
"locationName":"dryRun"
@@ -29162,6 +29163,10 @@
2916229163
"shape":"String",
2916329164
"locationName":"availabilityZone"
2916429165
},
29166+
"AvailabilityZoneId":{
29167+
"shape":"String",
29168+
"locationName":"availabilityZoneId"
29169+
},
2916529170
"BytesConverted":{
2916629171
"shape":"Long",
2916729172
"locationName":"bytesConverted"
@@ -29330,11 +29335,11 @@
2933029335
"ImportVolumeRequest":{
2933129336
"type":"structure",
2933229337
"required":[
29333-
"AvailabilityZone",
2933429338
"Image",
2933529339
"Volume"
2933629340
],
2933729341
"members":{
29342+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
2933829343
"DryRun":{
2933929344
"shape":"Boolean",
2934029345
"locationName":"dryRun"
@@ -29373,6 +29378,10 @@
2937329378
"shape":"String",
2937429379
"locationName":"availabilityZone"
2937529380
},
29381+
"AvailabilityZoneId":{
29382+
"shape":"String",
29383+
"locationName":"availabilityZoneId"
29384+
},
2937629385
"BytesConverted":{
2937729386
"shape":"Long",
2937829387
"locationName":"bytesConverted"
@@ -31062,6 +31071,10 @@
3106231071
"shape":"String",
3106331072
"locationName":"availabilityZone"
3106431073
},
31074+
"AvailabilityZoneId":{
31075+
"shape":"AvailabilityZoneId",
31076+
"locationName":"availabilityZoneId"
31077+
},
3106531078
"OutpostArn":{
3106631079
"shape":"String",
3106731080
"locationName":"outpostArn"
@@ -35071,6 +35084,10 @@
3507135084
"shape":"String",
3507235085
"locationName":"availabilityZone"
3507335086
},
35087+
"AvailabilityZoneId":{
35088+
"shape":"AvailabilityZoneId",
35089+
"locationName":"availabilityZoneId"
35090+
},
3507435091
"Affinity":{
3507535092
"shape":"String",
3507635093
"locationName":"affinity"
@@ -35109,6 +35126,7 @@
3510935126
"type":"structure",
3511035127
"members":{
3511135128
"AvailabilityZone":{"shape":"String"},
35129+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
3511235130
"Affinity":{"shape":"String"},
3511335131
"GroupName":{"shape":"PlacementGroupName"},
3511435132
"HostId":{"shape":"DedicatedHostId"},
@@ -40608,6 +40626,10 @@
4060840626
"Placement":{
4060940627
"type":"structure",
4061040628
"members":{
40629+
"AvailabilityZoneId":{
40630+
"shape":"AvailabilityZoneId",
40631+
"locationName":"availabilityZoneId"
40632+
},
4061140633
"Affinity":{
4061240634
"shape":"String",
4061340635
"locationName":"affinity"
@@ -45903,6 +45925,10 @@
4590345925
"shape":"ServiceState",
4590445926
"locationName":"serviceState"
4590545927
},
45928+
"AvailabilityZoneIds":{
45929+
"shape":"ValueStringList",
45930+
"locationName":"availabilityZoneIdSet"
45931+
},
4590645932
"AvailabilityZones":{
4590745933
"shape":"ValueStringList",
4590845934
"locationName":"availabilityZoneSet"
@@ -45990,6 +46016,10 @@
4599046016
"shape":"String",
4599146017
"locationName":"serviceRegion"
4599246018
},
46019+
"AvailabilityZoneIds":{
46020+
"shape":"ValueStringList",
46021+
"locationName":"availabilityZoneIdSet"
46022+
},
4599346023
"AvailabilityZones":{
4599446024
"shape":"ValueStringList",
4599546025
"locationName":"availabilityZoneSet"
@@ -46978,6 +47008,10 @@
4697847008
"shape":"String",
4697947009
"locationName":"launchedAvailabilityZone"
4698047010
},
47011+
"LaunchedAvailabilityZoneId":{
47012+
"shape":"String",
47013+
"locationName":"launchedAvailabilityZoneId"
47014+
},
4698147015
"ProductDescription":{
4698247016
"shape":"RIProductDescription",
4698347017
"locationName":"productDescription"
@@ -47210,6 +47244,10 @@
4721047244
"shape":"String",
4721147245
"locationName":"availabilityZone"
4721247246
},
47247+
"AvailabilityZoneId":{
47248+
"shape":"String",
47249+
"locationName":"availabilityZoneId"
47250+
},
4721347251
"InstanceType":{
4721447252
"shape":"InstanceType",
4721547253
"locationName":"instanceType"
@@ -51662,6 +51700,10 @@
5166251700
"Volume":{
5166351701
"type":"structure",
5166451702
"members":{
51703+
"AvailabilityZoneId":{
51704+
"shape":"String",
51705+
"locationName":"availabilityZoneId"
51706+
},
5166551707
"OutpostArn":{
5166651708
"shape":"String",
5166751709
"locationName":"outpostArn"

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

Lines changed: 45 additions & 30 deletions
Large diffs are not rendered by default.

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

Lines changed: 100 additions & 33 deletions
Large diffs are not rendered by default.

sdk/src/Services/EC2/Generated/Model/AdvertiseByoipCidrRequest.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ namespace Amazon.EC2.Model
5252
/// It can take a few minutes before traffic to the specified addresses starts routing
5353
/// to Amazon Web Services because of BGP propagation delays.
5454
/// </para>
55+
///
56+
/// <para>
57+
/// To stop advertising the BYOIP CIDR, use <a>WithdrawByoipCidr</a>.
58+
/// </para>
5559
/// </summary>
5660
public partial class AdvertiseByoipCidrRequest : AmazonEC2Request
5761
{

sdk/src/Services/EC2/Generated/Model/CreateDefaultSubnetRequest.cs

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,20 @@ namespace Amazon.EC2.Model
3939
public partial class CreateDefaultSubnetRequest : AmazonEC2Request
4040
{
4141
private string _availabilityZone;
42+
private string _availabilityZoneId;
4243
private bool? _ipv6Native;
4344

4445
/// <summary>
4546
/// Gets and sets the property AvailabilityZone.
4647
/// <para>
4748
/// The Availability Zone in which to create the default subnet.
4849
/// </para>
50+
///
51+
/// <para>
52+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but
53+
/// not both.
54+
/// </para>
4955
/// </summary>
50-
[AWSProperty(Required=true)]
5156
public string AvailabilityZone
5257
{
5358
get { return this._availabilityZone; }
@@ -60,6 +65,29 @@ internal bool IsSetAvailabilityZone()
6065
return this._availabilityZone != null;
6166
}
6267

68+
/// <summary>
69+
/// Gets and sets the property AvailabilityZoneId.
70+
/// <para>
71+
/// The ID of the Availability Zone.
72+
/// </para>
73+
///
74+
/// <para>
75+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but
76+
/// not both.
77+
/// </para>
78+
/// </summary>
79+
public string AvailabilityZoneId
80+
{
81+
get { return this._availabilityZoneId; }
82+
set { this._availabilityZoneId = value; }
83+
}
84+
85+
// Check to see if AvailabilityZoneId property is set
86+
internal bool IsSetAvailabilityZoneId()
87+
{
88+
return this._availabilityZoneId != null;
89+
}
90+
6391
/// <summary>
6492
/// Gets and sets the property Ipv6Native.
6593
/// <para>

sdk/src/Services/EC2/Generated/Model/CreateImageRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public CreateImageRequest(string instanceId, string name)
107107
/// You can't modify the encryption status of existing volumes or snapshots. To create
108108
/// an AMI with volumes or snapshots that have a different encryption status (for example,
109109
/// where the source volume and snapshots are unencrypted, and you want to create an AMI
110-
/// with encrypted volumes or snapshots), copy the image instead.
110+
/// with encrypted volumes or snapshots), use the <a>CopyImage</a> action.
111111
/// </para>
112112
/// </li> <li>
113113
/// <para>

sdk/src/Services/EC2/Generated/Model/CreateVolumeRequest.cs

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ namespace Amazon.EC2.Model
6060
public partial class CreateVolumeRequest : AmazonEC2Request
6161
{
6262
private string _availabilityZone;
63+
private string _availabilityZoneId;
6364
private string _clientToken;
6465
private bool? _encrypted;
6566
private int? _iops;
@@ -82,7 +83,7 @@ public CreateVolumeRequest() { }
8283
/// <summary>
8384
/// Instantiates CreateVolumeRequest with the parameterized properties
8485
/// </summary>
85-
/// <param name="availabilityZone">The ID of the Availability Zone in which to create the volume. For example, <c>us-east-1a</c>.</param>
86+
/// <param name="availabilityZone">The ID of the Availability Zone in which to create the volume. For example, <c>us-east-1a</c>. Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but not both.</param>
8687
/// <param name="size">The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size. The following are the supported volumes sizes for each volume type: <ul> <li> <c>gp2</c> and <c>gp3</c>: 1 - 16,384 GiB </li> <li> <c>io1</c>: 4 - 16,384 GiB </li> <li> <c>io2</c>: 4 - 65,536 GiB </li> <li> <c>st1</c> and <c>sc1</c>: 125 - 16,384 GiB </li> <li> <c>standard</c>: 1 - 1024 GiB </li> </ul></param>
8788
public CreateVolumeRequest(string availabilityZone, int size)
8889
{
@@ -93,7 +94,7 @@ public CreateVolumeRequest(string availabilityZone, int size)
9394
/// <summary>
9495
/// Instantiates CreateVolumeRequest with the parameterized properties
9596
/// </summary>
96-
/// <param name="availabilityZone">The ID of the Availability Zone in which to create the volume. For example, <c>us-east-1a</c>.</param>
97+
/// <param name="availabilityZone">The ID of the Availability Zone in which to create the volume. For example, <c>us-east-1a</c>. Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but not both.</param>
9798
/// <param name="snapshotId">The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.</param>
9899
public CreateVolumeRequest(string availabilityZone, string snapshotId)
99100
{
@@ -106,8 +107,12 @@ public CreateVolumeRequest(string availabilityZone, string snapshotId)
106107
/// <para>
107108
/// The ID of the Availability Zone in which to create the volume. For example, <c>us-east-1a</c>.
108109
/// </para>
110+
///
111+
/// <para>
112+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but
113+
/// not both.
114+
/// </para>
109115
/// </summary>
110-
[AWSProperty(Required=true)]
111116
public string AvailabilityZone
112117
{
113118
get { return this._availabilityZone; }
@@ -120,6 +125,29 @@ internal bool IsSetAvailabilityZone()
120125
return this._availabilityZone != null;
121126
}
122127

128+
/// <summary>
129+
/// Gets and sets the property AvailabilityZoneId.
130+
/// <para>
131+
/// The ID of the Availability Zone in which to create the volume. For example, <c>use1-az1</c>.
132+
/// </para>
133+
///
134+
/// <para>
135+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> must be specified, but
136+
/// not both.
137+
/// </para>
138+
/// </summary>
139+
public string AvailabilityZoneId
140+
{
141+
get { return this._availabilityZoneId; }
142+
set { this._availabilityZoneId = value; }
143+
}
144+
145+
// Check to see if AvailabilityZoneId property is set
146+
internal bool IsSetAvailabilityZoneId()
147+
{
148+
return this._availabilityZoneId != null;
149+
}
150+
123151
/// <summary>
124152
/// Gets and sets the property ClientToken.
125153
/// <para>

sdk/src/Services/EC2/Generated/Model/DeprovisionByoipCidrRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ namespace Amazon.EC2.Model
3737
///
3838
///
3939
/// <para>
40-
/// Before you can release an address range, you must stop advertising it and you must
41-
/// not have any IP addresses allocated from its address range.
40+
/// Before you can release an address range, you must stop advertising it using <a>WithdrawByoipCidr</a>
41+
/// and you must not have any IP addresses allocated from its address range.
4242
/// </para>
4343
/// </summary>
4444
public partial class DeprovisionByoipCidrRequest : AmazonEC2Request

sdk/src/Services/EC2/Generated/Model/DescribeByoipCidrsRequest.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@ namespace Amazon.EC2.Model
3131
{
3232
/// <summary>
3333
/// Container for the parameters to the DescribeByoipCidrs operation.
34-
/// Describes the IP address ranges that were provisioned for use with Amazon Web Services
35-
/// resources through through bring your own IP addresses (BYOIP).
34+
/// Describes the IP address ranges that were specified in calls to <a>ProvisionByoipCidr</a>.
35+
///
36+
///
37+
/// <para>
38+
/// To describe the address pools that were created when you provisioned the address ranges,
39+
/// use <a>DescribePublicIpv4Pools</a> or <a>DescribeIpv6Pools</a>.
40+
/// </para>
3641
/// </summary>
3742
public partial class DescribeByoipCidrsRequest : AmazonEC2Request
3843
{

sdk/src/Services/EC2/Generated/Model/DescribeImageAttributeRequest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public DescribeImageAttributeRequest() { }
5555
/// Instantiates DescribeImageAttributeRequest with the parameterized properties
5656
/// </summary>
5757
/// <param name="imageId">The ID of the AMI.</param>
58-
/// <param name="attribute">The AMI attribute. <b>Note</b>: The <c>blockDeviceMapping</c> attribute is deprecated. Using this attribute returns the <c>Client.AuthFailure</c> error. To get information about the block device mappings for an AMI, describe the image instead.</param>
58+
/// <param name="attribute">The AMI attribute. <b>Note</b>: The <c>blockDeviceMapping</c> attribute is deprecated. Using this attribute returns the <c>Client.AuthFailure</c> error. To get information about the block device mappings for an AMI, use the <a>DescribeImages</a> action.</param>
5959
public DescribeImageAttributeRequest(string imageId, ImageAttributeName attribute)
6060
{
6161
_imageId = imageId;
@@ -71,7 +71,7 @@ public DescribeImageAttributeRequest(string imageId, ImageAttributeName attribut
7171
/// <para>
7272
/// <b>Note</b>: The <c>blockDeviceMapping</c> attribute is deprecated. Using this attribute
7373
/// returns the <c>Client.AuthFailure</c> error. To get information about the block device
74-
/// mappings for an AMI, describe the image instead.
74+
/// mappings for an AMI, use the <a>DescribeImages</a> action.
7575
/// </para>
7676
/// </summary>
7777
[AWSProperty(Required=true)]

0 commit comments

Comments
 (0)