Skip to content

Commit fbe349c

Browse files
EC2 - Adding support for AvailabilityZoneId
1 parent edcfd78 commit fbe349c

32 files changed

+639
-33
lines changed

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6866,7 +6866,6 @@
68666866
},
68676867
"AllocateHostsRequest":{
68686868
"type":"structure",
6869-
"required":["AvailabilityZone"],
68706869
"members":{
68716870
"InstanceFamily":{"shape":"String"},
68726871
"TagSpecifications":{
@@ -6880,6 +6879,7 @@
68806879
"shape":"AssetIdList",
68816880
"locationName":"AssetId"
68826881
},
6882+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
68836883
"AutoPlacement":{
68846884
"shape":"AutoPlacement",
68856885
"locationName":"autoPlacement"
@@ -7156,6 +7156,10 @@
71567156
"shape":"String",
71577157
"locationName":"availabilityZone"
71587158
},
7159+
"AvailabilityZoneId":{
7160+
"shape":"String",
7161+
"locationName":"availabilityZoneId"
7162+
},
71597163
"Instance":{
71607164
"shape":"AnalysisComponent",
71617165
"locationName":"instance"
@@ -9987,6 +9991,10 @@
99879991
"Tenancy":{
99889992
"shape":"CapacityReservationTenancy",
99899993
"locationName":"tenancy"
9994+
},
9995+
"AvailabilityZoneId":{
9996+
"shape":"AvailabilityZoneId",
9997+
"locationName":"availabilityZoneId"
99909998
}
99919999
}
999210000
},
@@ -19584,6 +19592,7 @@
1958419592
"shape":"ReservedInstancesOfferingIdStringList",
1958519593
"locationName":"ReservedInstancesOfferingId"
1958619594
},
19595+
"AvailabilityZoneId":{"shape":"AvailabilityZoneId"},
1958719596
"DryRun":{
1958819597
"shape":"Boolean",
1958919598
"locationName":"dryRun"
@@ -24222,6 +24231,10 @@
2422224231
"shape":"ValueStringList",
2422324232
"locationName":"availabilityZoneSet"
2422424233
},
24234+
"AvailabilityZoneIds":{
24235+
"shape":"ValueStringList",
24236+
"locationName":"availabilityZoneIdSet"
24237+
},
2422524238
"Cidrs":{
2422624239
"shape":"ValueStringList",
2422724240
"locationName":"cidrSet"
@@ -42223,6 +42236,10 @@
4222342236
"shape":"TagList",
4222442237
"locationName":"tagSet"
4222542238
},
42239+
"AvailabilityZoneId":{
42240+
"shape":"String",
42241+
"locationName":"availabilityZoneId"
42242+
},
4222642243
"ReservedInstancesId":{
4222742244
"shape":"String",
4222842245
"locationName":"reservedInstancesId"
@@ -42291,6 +42308,10 @@
4229142308
"Scope":{
4229242309
"shape":"scope",
4229342310
"locationName":"scope"
42311+
},
42312+
"AvailabilityZoneId":{
42313+
"shape":"String",
42314+
"locationName":"availabilityZoneId"
4229442315
}
4229542316
}
4229642317
},
@@ -42488,6 +42509,10 @@
4248842509
"shape":"scope",
4248942510
"locationName":"scope"
4249042511
},
42512+
"AvailabilityZoneId":{
42513+
"shape":"AvailabilityZoneId",
42514+
"locationName":"availabilityZoneId"
42515+
},
4249142516
"ReservedInstancesOfferingId":{
4249242517
"shape":"String",
4249342518
"locationName":"reservedInstancesOfferingId"
@@ -51163,6 +51188,10 @@
5116351188
"AttachmentStatuses":{
5116451189
"shape":"VolumeStatusAttachmentStatusList",
5116551190
"locationName":"attachmentStatuses"
51191+
},
51192+
"AvailabilityZoneId":{
51193+
"shape":"String",
51194+
"locationName":"availabilityZoneId"
5116651195
}
5116751196
}
5116851197
},

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

Lines changed: 16 additions & 7 deletions
Large diffs are not rendered by default.

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

Lines changed: 49 additions & 7 deletions
Large diffs are not rendered by default.

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public partial class AllocateHostsRequest : AmazonEC2Request
4040
private List<string> _assetIds = AWSConfigs.InitializeCollections ? new List<string>() : null;
4141
private AutoPlacement _autoPlacement;
4242
private string _availabilityZone;
43+
private string _availabilityZoneId;
4344
private string _clientToken;
4445
private HostMaintenance _hostMaintenance;
4546
private HostRecovery _hostRecovery;
@@ -112,7 +113,6 @@ internal bool IsSetAutoPlacement()
112113
/// The Availability Zone in which to allocate the Dedicated Host.
113114
/// </para>
114115
/// </summary>
115-
[AWSProperty(Required=true)]
116116
public string AvailabilityZone
117117
{
118118
get { return this._availabilityZone; }
@@ -125,6 +125,24 @@ internal bool IsSetAvailabilityZone()
125125
return this._availabilityZone != null;
126126
}
127127

128+
/// <summary>
129+
/// Gets and sets the property AvailabilityZoneId.
130+
/// <para>
131+
/// The ID of the Availability Zone.
132+
/// </para>
133+
/// </summary>
134+
public string AvailabilityZoneId
135+
{
136+
get { return this._availabilityZoneId; }
137+
set { this._availabilityZoneId = value; }
138+
}
139+
140+
// Check to see if AvailabilityZoneId property is set
141+
internal bool IsSetAvailabilityZoneId()
142+
{
143+
return this._availabilityZoneId != null;
144+
}
145+
128146
/// <summary>
129147
/// Gets and sets the property ClientToken.
130148
/// <para>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public partial class AnalysisLoadBalancerTarget
3636
{
3737
private string _address;
3838
private string _availabilityZone;
39+
private string _availabilityZoneId;
3940
private AnalysisComponent _instance;
4041
private int? _port;
4142

@@ -76,6 +77,24 @@ internal bool IsSetAvailabilityZone()
7677
return this._availabilityZone != null;
7778
}
7879

80+
/// <summary>
81+
/// Gets and sets the property AvailabilityZoneId.
82+
/// <para>
83+
/// The ID of the Availability Zone.
84+
/// </para>
85+
/// </summary>
86+
public string AvailabilityZoneId
87+
{
88+
get { return this._availabilityZoneId; }
89+
set { this._availabilityZoneId = value; }
90+
}
91+
92+
// Check to see if AvailabilityZoneId property is set
93+
internal bool IsSetAvailabilityZoneId()
94+
{
95+
return this._availabilityZoneId != null;
96+
}
97+
7998
/// <summary>
8099
/// Gets and sets the property Instance.
81100
/// <para>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ namespace Amazon.EC2.Model
3535
public partial class CapacityReservationInfo
3636
{
3737
private string _availabilityZone;
38+
private string _availabilityZoneId;
3839
private string _instanceType;
3940
private CapacityReservationTenancy _tenancy;
4041

@@ -56,6 +57,24 @@ internal bool IsSetAvailabilityZone()
5657
return this._availabilityZone != null;
5758
}
5859

60+
/// <summary>
61+
/// Gets and sets the property AvailabilityZoneId.
62+
/// <para>
63+
/// The ID of the Availability Zone.
64+
/// </para>
65+
/// </summary>
66+
public string AvailabilityZoneId
67+
{
68+
get { return this._availabilityZoneId; }
69+
set { this._availabilityZoneId = value; }
70+
}
71+
72+
// Check to see if AvailabilityZoneId property is set
73+
internal bool IsSetAvailabilityZoneId()
74+
{
75+
return this._availabilityZoneId != null;
76+
}
77+
5978
/// <summary>
6079
/// Gets and sets the property InstanceType.
6180
/// <para>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,15 @@ namespace Amazon.EC2.Model
5959
/// them through their termination. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html">Instance
6060
/// lifecycle</a> in the <i>Amazon EC2 User Guide</i>.
6161
/// </para>
62-
/// </li> </ul> <note>
62+
/// </li> </ul>
63+
/// <para>
64+
/// The Amazon EC2 API follows an eventual consistency model. This means that the result
65+
/// of an API command you run that creates or modifies resources might not be immediately
66+
/// available to all subsequent commands you run. For guidance on how to manage eventual
67+
/// consistency, see <a href="https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html">Eventual
68+
/// consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer Guide</i>.
69+
/// </para>
70+
/// <note>
6371
/// <para>
6472
/// The order of the elements in the response, including those within nested structures,
6573
/// might vary. Applications should not assume the elements appear in a particular order.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ namespace Amazon.EC2.Model
5959
/// do not specify any instance IDs at all, the call fails. If you describe instances
6060
/// and specify only instance IDs that are in an unaffected zone, the call works normally.
6161
/// </para>
62+
///
63+
/// <para>
64+
/// The Amazon EC2 API follows an eventual consistency model. This means that the result
65+
/// of an API command you run that creates or modifies resources might not be immediately
66+
/// available to all subsequent commands you run. For guidance on how to manage eventual
67+
/// consistency, see <a href="https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html">Eventual
68+
/// consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer Guide</i>.
69+
/// </para>
6270
/// <important>
6371
/// <para>
6472
/// We strongly recommend using only paginated requests. Unpaginated requests are susceptible

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ public partial class DescribeReservedInstancesModificationsRequest : AmazonEC2Re
8484
/// </para>
8585
/// </li> <li>
8686
/// <para>
87+
/// <c>modification-result.target-configuration.availability-zone-id</c> - The ID of
88+
/// the Availability Zone for the new Reserved Instances.
89+
/// </para>
90+
/// </li> <li>
91+
/// <para>
8792
/// <c>modification-result.target-configuration.instance-count </c> - The number of new
8893
/// Reserved Instances.
8994
/// </para>

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ namespace Amazon.EC2.Model
5757
public partial class DescribeReservedInstancesOfferingsRequest : AmazonEC2Request
5858
{
5959
private string _availabilityZone;
60+
private string _availabilityZoneId;
6061
private List<Filter> _filters = AWSConfigs.InitializeCollections ? new List<Filter>() : null;
6162
private bool? _includeMarketplace;
6263
private Tenancy _instanceTenancy;
@@ -76,6 +77,11 @@ public partial class DescribeReservedInstancesOfferingsRequest : AmazonEC2Reques
7677
/// <para>
7778
/// The Availability Zone in which the Reserved Instance can be used.
7879
/// </para>
80+
///
81+
/// <para>
82+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> can be specified, but
83+
/// not both.
84+
/// </para>
7985
/// </summary>
8086
public string AvailabilityZone
8187
{
@@ -89,6 +95,29 @@ internal bool IsSetAvailabilityZone()
8995
return this._availabilityZone != null;
9096
}
9197

98+
/// <summary>
99+
/// Gets and sets the property AvailabilityZoneId.
100+
/// <para>
101+
/// The ID of the Availability Zone.
102+
/// </para>
103+
///
104+
/// <para>
105+
/// Either <c>AvailabilityZone</c> or <c>AvailabilityZoneId</c> can be specified, but
106+
/// not both.
107+
/// </para>
108+
/// </summary>
109+
public string AvailabilityZoneId
110+
{
111+
get { return this._availabilityZoneId; }
112+
set { this._availabilityZoneId = value; }
113+
}
114+
115+
// Check to see if AvailabilityZoneId property is set
116+
internal bool IsSetAvailabilityZoneId()
117+
{
118+
return this._availabilityZoneId != null;
119+
}
120+
92121
/// <summary>
93122
/// Gets and sets the property Filters.
94123
/// <para>
@@ -101,6 +130,11 @@ internal bool IsSetAvailabilityZone()
101130
/// </para>
102131
/// </li> <li>
103132
/// <para>
133+
/// <c>availability-zone-id</c> - The ID of the Availability Zone where the Reserved
134+
/// Instance can be used.
135+
/// </para>
136+
/// </li> <li>
137+
/// <para>
104138
/// <c>duration</c> - The duration of the Reserved Instance (for example, one year or
105139
/// three years), in seconds (<c>31536000</c> | <c>94608000</c>).
106140
/// </para>

0 commit comments

Comments
 (0)