Skip to content

Commit a5e89b3

Browse files
QuanzzzzQuanzzzz
authored
Merge pull request #1184 from Quanzzzz/release
Recover the correct model for ec2.
2 parents 6617961 + 22f1f37 commit a5e89b3

File tree

2 files changed

+210
-4
lines changed

2 files changed

+210
-4
lines changed

‎services/ec2/src/main/resources/codegen-resources/paginators-1.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
"DescribeAddresses": {
77
"result_key": "Addresses"
88
},
9+
"DescribeAddressesAttribute": {
10+
"input_token": "NextToken",
11+
"limit_key": "MaxResults",
12+
"output_token": "NextToken",
13+
"result_key": "Addresses"
14+
},
915
"DescribeAvailabilityZones": {
1016
"result_key": "AvailabilityZones"
1117
},

‎services/ec2/src/main/resources/codegen-resources/service-2.json

Lines changed: 204 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,7 @@
15041504
},
15051505
"input":{"shape":"DeleteVpcEndpointsRequest"},
15061506
"output":{"shape":"DeleteVpcEndpointsResult"},
1507-
"documentation":"<p>Deletes one or more specified VPC endpoints. Deleting a gateway endpoint also deletes the endpoint routes in the route tables that were associated with the endpoint. Deleting an interface endpoint or a Gateway Load Balancer endpoint deletes the endpoint network interfaces. Gateway Load Balancer endpoints can only be deleted if the routes that are associated with the endpoint are deleted.</p>"
1507+
"documentation":"<p>Deletes one or more specified VPC endpoints. You can delete any of the following types of VPC endpoints. </p> <ul> <li> <p>Gateway endpoint,</p> </li> <li> <p>Gateway Load Balancer endpoint,</p> </li> <li> <p>Interface endpoint</p> </li> </ul> <p>The following rules apply when you delete a VPC endpoint:</p> <ul> <li> <p>When you delete a gateway endpoint, we delete the endpoint routes in the route tables that are associated with the endpoint.</p> </li> <li> <p>When you delete a Gateway Load Balancer endpoint, we delete the endpoint network interfaces. </p> <p>You can only delete Gateway Load Balancer endpoints when the routes that are associated with the endpoint are deleted.</p> </li> <li> <p>When you delete an interface endpoint, we delete the endpoint network interfaces.</p> </li> </ul>"
15081508
},
15091509
"DeleteVpcPeeringConnection":{
15101510
"name":"DeleteVpcPeeringConnection",
@@ -1612,6 +1612,16 @@
16121612
"output":{"shape":"DescribeAddressesResult"},
16131613
"documentation":"<p>Describes the specified Elastic IP addresses or all of your Elastic IP addresses.</p> <p>An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html\">Elastic IP Addresses</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
16141614
},
1615+
"DescribeAddressesAttribute":{
1616+
"name":"DescribeAddressesAttribute",
1617+
"http":{
1618+
"method":"POST",
1619+
"requestUri":"/"
1620+
},
1621+
"input":{"shape":"DescribeAddressesAttributeRequest"},
1622+
"output":{"shape":"DescribeAddressesAttributeResult"},
1623+
"documentation":"<p>Describes the attributes of the specified Elastic IP addresses. For requirements, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html#Using_Elastic_Addressing_Reverse_DNS\">Using reverse DNS for email applications</a>.</p>"
1624+
},
16151625
"DescribeAggregateIdFormat":{
16161626
"name":"DescribeAggregateIdFormat",
16171627
"http":{
@@ -2730,7 +2740,7 @@
27302740
},
27312741
"input":{"shape":"DescribeVpcEndpointServicesRequest"},
27322742
"output":{"shape":"DescribeVpcEndpointServicesResult"},
2733-
"documentation":"<p>Describes available services to which you can create a VPC endpoint.</p> <p>When the service provider and the consumer have different accounts multiple Availability Zones, and the consumer views the VPC endpoint service information, the response only includes the common Availability Zones. For example, when the service provider account uses <code>us-east-1a</code> and <code>us-east-1c</code> and the consumer uses <code>us-east-1a</code> and us-east-1a and us-east-1b, the response includes the VPC endpoint services in the common Availability Zone, <code>us-east-1a</code>.</p>"
2743+
"documentation":"<p>Describes available services to which you can create a VPC endpoint.</p> <p>When the service provider and the consumer have different accounts in multiple Availability Zones, and the consumer views the VPC endpoint service information, the response only includes the common Availability Zones. For example, when the service provider account uses <code>us-east-1a</code> and <code>us-east-1c</code> and the consumer uses <code>us-east-1a</code> and <code>us-east-1b</code>, the response includes the VPC endpoint services in the common Availability Zone, <code>us-east-1a</code>.</p>"
27342744
},
27352745
"DescribeVpcEndpoints":{
27362746
"name":"DescribeVpcEndpoints",
@@ -3354,6 +3364,16 @@
33543364
"output":{"shape":"ImportVolumeResult"},
33553365
"documentation":"<p>Creates an import volume task using metadata from the specified disk image.For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/importing-your-volumes-into-amazon-ebs.html\">Importing Disks to Amazon EBS</a>.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
33563366
},
3367+
"ModifyAddressAttribute":{
3368+
"name":"ModifyAddressAttribute",
3369+
"http":{
3370+
"method":"POST",
3371+
"requestUri":"/"
3372+
},
3373+
"input":{"shape":"ModifyAddressAttributeRequest"},
3374+
"output":{"shape":"ModifyAddressAttributeResult"},
3375+
"documentation":"<p>Modifies an attribute of the specified Elastic IP address. For requirements, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html#Using_Elastic_Addressing_Reverse_DNS\">Using reverse DNS for email applications</a>.</p>"
3376+
},
33573377
"ModifyAvailabilityZoneGroup":{
33583378
"name":"ModifyAvailabilityZoneGroup",
33593379
"http":{
@@ -4040,6 +4060,16 @@
40404060
"output":{"shape":"RequestSpotInstancesResult"},
40414061
"documentation":"<p>Creates a Spot Instance request.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html\">Spot Instance requests</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
40424062
},
4063+
"ResetAddressAttribute":{
4064+
"name":"ResetAddressAttribute",
4065+
"http":{
4066+
"method":"POST",
4067+
"requestUri":"/"
4068+
},
4069+
"input":{"shape":"ResetAddressAttributeRequest"},
4070+
"output":{"shape":"ResetAddressAttributeResult"},
4071+
"documentation":"<p>Resets the attribute of the specified IP address. For requirements, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html#Using_Elastic_Addressing_Reverse_DNS\">Using reverse DNS for email applications</a>.</p>"
4072+
},
40434073
"ResetEbsDefaultKmsKeyId":{
40444074
"name":"ResetEbsDefaultKmsKeyId",
40454075
"http":{
@@ -4687,13 +4717,55 @@
46874717
},
46884718
"documentation":"<p>Describes an Elastic IP address, or a carrier IP address.</p>"
46894719
},
4720+
"AddressAttribute":{
4721+
"type":"structure",
4722+
"members":{
4723+
"PublicIp":{
4724+
"shape":"PublicIpAddress",
4725+
"documentation":"<p>The public IP address.</p>",
4726+
"locationName":"publicIp"
4727+
},
4728+
"AllocationId":{
4729+
"shape":"AllocationId",
4730+
"documentation":"<p>[EC2-VPC] The allocation ID.</p>",
4731+
"locationName":"allocationId"
4732+
},
4733+
"PtrRecord":{
4734+
"shape":"String",
4735+
"documentation":"<p>The pointer (PTR) record for the IP address.</p>",
4736+
"locationName":"ptrRecord"
4737+
},
4738+
"PtrRecordUpdate":{
4739+
"shape":"PtrUpdateStatus",
4740+
"documentation":"<p>The updated PTR record for the IP address.</p>",
4741+
"locationName":"ptrRecordUpdate"
4742+
}
4743+
},
4744+
"documentation":"<p>The attributes associated with an Elastic IP address.</p>"
4745+
},
4746+
"AddressAttributeName":{
4747+
"type":"string",
4748+
"enum":["domain-name"]
4749+
},
46904750
"AddressList":{
46914751
"type":"list",
46924752
"member":{
46934753
"shape":"Address",
46944754
"locationName":"item"
46954755
}
46964756
},
4757+
"AddressMaxResults":{
4758+
"type":"integer",
4759+
"max":1000,
4760+
"min":1
4761+
},
4762+
"AddressSet":{
4763+
"type":"list",
4764+
"member":{
4765+
"shape":"AddressAttribute",
4766+
"locationName":"item"
4767+
}
4768+
},
46974769
"AdvertiseByoipCidrRequest":{
46984770
"type":"structure",
46994771
"required":["Cidr"],
@@ -4871,6 +4943,13 @@
48714943
"locationName":"AllocationId"
48724944
}
48734945
},
4946+
"AllocationIds":{
4947+
"type":"list",
4948+
"member":{
4949+
"shape":"AllocationId",
4950+
"locationName":"item"
4951+
}
4952+
},
48744953
"AllocationState":{
48754954
"type":"string",
48764955
"enum":[
@@ -11028,7 +11107,7 @@
1102811107
},
1102911108
"PrivateDnsEnabled":{
1103011109
"shape":"Boolean",
11031-
"documentation":"<p>(Interface endpoint) Indicates whether to associate a private hosted zone with the specified VPC. The private hosted zone contains a record set for the default public DNS name for the service for the Region (for example, <code>kinesis.us-east-1.amazonaws.com</code>), which resolves to the private IP addresses of the endpoint network interfaces in the VPC. This enables you to make requests to the default public DNS name for the service instead of the public DNS names that are automatically generated by the VPC endpoint service.</p> <p>To use a private hosted zone, you must set the following VPC attributes to <code>true</code>: <code>enableDnsHostnames</code> and <code>enableDnsSupport</code>. Use <a>ModifyVpcAttribute</a> to set the VPC attributes.</p> <p>Default: <code>true</code> </p>"
11110+
"documentation":"<p>(Interface endpoint) Indicates whether to associate a private hosted zone with the specified VPC. The private hosted zone contains a record set for the default public DNS name for the service for the Region (for example, <code>kinesis.us-east-1.amazonaws.com</code>), which resolves to the private IP addresses of the endpoint network interfaces in the VPC. This enables you to make requests to the default public DNS name for the service instead of the public DNS names that are automatically generated by the VPC endpoint service.</p> <p>To use a private hosted zone, you must set the following VPC attributes to <code>true</code>: <code>enableDnsHostnames</code> and <code>enableDnsSupport</code>. Use <a>ModifyVpcAttribute</a> to set the VPC attributes.</p> <important> <p>Private DNS is not supported for Amazon S3 interface endpoints.</p> </important> <p>Default: <code>true</code> for supported endpoints</p>"
1103211111
},
1103311112
"TagSpecifications":{
1103411113
"shape":"TagSpecificationList",
@@ -13025,6 +13104,47 @@
1302513104
}
1302613105
}
1302713106
},
13107+
"DescribeAddressesAttributeRequest":{
13108+
"type":"structure",
13109+
"members":{
13110+
"AllocationIds":{
13111+
"shape":"AllocationIds",
13112+
"documentation":"<p>[EC2-VPC] The allocation IDs.</p>",
13113+
"locationName":"AllocationId"
13114+
},
13115+
"Attribute":{
13116+
"shape":"AddressAttributeName",
13117+
"documentation":"<p>The attribute of the IP address.</p>"
13118+
},
13119+
"NextToken":{
13120+
"shape":"NextToken",
13121+
"documentation":"<p>The token for the next page of results.</p>"
13122+
},
13123+
"MaxResults":{
13124+
"shape":"AddressMaxResults",
13125+
"documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
13126+
},
13127+
"DryRun":{
13128+
"shape":"Boolean",
13129+
"documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
13130+
}
13131+
}
13132+
},
13133+
"DescribeAddressesAttributeResult":{
13134+
"type":"structure",
13135+
"members":{
13136+
"Addresses":{
13137+
"shape":"AddressSet",
13138+
"documentation":"<p>Information about the IP addresses.</p>",
13139+
"locationName":"addressSet"
13140+
},
13141+
"NextToken":{
13142+
"shape":"NextToken",
13143+
"documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
13144+
"locationName":"nextToken"
13145+
}
13146+
}
13147+
},
1302813148
"DescribeAddressesRequest":{
1302913149
"type":"structure",
1303013150
"members":{
@@ -28038,6 +28158,34 @@
2803828158
},
2803928159
"MemorySize":{"type":"long"},
2804028160
"MillisecondDateTime":{"type":"timestamp"},
28161+
"ModifyAddressAttributeRequest":{
28162+
"type":"structure",
28163+
"required":["AllocationId"],
28164+
"members":{
28165+
"AllocationId":{
28166+
"shape":"AllocationId",
28167+
"documentation":"<p>[EC2-VPC] The allocation ID.</p>"
28168+
},
28169+
"DomainName":{
28170+
"shape":"String",
28171+
"documentation":"<p>The domain name to modify for the IP address.</p>"
28172+
},
28173+
"DryRun":{
28174+
"shape":"Boolean",
28175+
"documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
28176+
}
28177+
}
28178+
},
28179+
"ModifyAddressAttributeResult":{
28180+
"type":"structure",
28181+
"members":{
28182+
"Address":{
28183+
"shape":"AddressAttribute",
28184+
"documentation":"<p>Information about the Elastic IP address.</p>",
28185+
"locationName":"address"
28186+
}
28187+
}
28188+
},
2804128189
"ModifyAvailabilityZoneGroupRequest":{
2804228190
"type":"structure",
2804328191
"required":[
@@ -29483,7 +29631,7 @@
2948329631
},
2948429632
"PrivateDnsEnabled":{
2948529633
"shape":"Boolean",
29486-
"documentation":"<p>(Interface endpoint) Indicates whether a private hosted zone is associated with the VPC.</p>"
29634+
"documentation":"<p>(Interface endpoint) Indicates whether a private hosted zone is associated with the VPC.</p> <important> <p>Private DNS is not supported for Amazon S3 interface endpoints.</p> </important>"
2948729635
}
2948829636
},
2948929637
"documentation":"<p>Contains the parameters for ModifyVpcEndpoint.</p>"
@@ -32114,6 +32262,27 @@
3211432262
},
3211532263
"documentation":"<p>Reserved. If you need to sustain traffic greater than the <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/vpc-nat-gateway.html\">documented limits</a>, contact us through the <a href=\"https://console.aws.amazon.com/support/home?\">Support Center</a>.</p>"
3211632264
},
32265+
"PtrUpdateStatus":{
32266+
"type":"structure",
32267+
"members":{
32268+
"Value":{
32269+
"shape":"String",
32270+
"documentation":"<p>The value for the PTR record update.</p>",
32271+
"locationName":"value"
32272+
},
32273+
"Status":{
32274+
"shape":"String",
32275+
"documentation":"<p>The status of the PTR record update.</p>",
32276+
"locationName":"status"
32277+
},
32278+
"Reason":{
32279+
"shape":"String",
32280+
"documentation":"<p>The reason for the PTR record update.</p>",
32281+
"locationName":"reason"
32282+
}
32283+
},
32284+
"documentation":"<p>The status of an updated pointer (PTR) record for an Elastic IP address.</p>"
32285+
},
3211732286
"PublicIpAddress":{"type":"string"},
3211832287
"PublicIpStringList":{
3211932288
"type":"list",
@@ -34153,6 +34322,37 @@
3415334322
"locationName":"item"
3415434323
}
3415534324
},
34325+
"ResetAddressAttributeRequest":{
34326+
"type":"structure",
34327+
"required":[
34328+
"AllocationId",
34329+
"Attribute"
34330+
],
34331+
"members":{
34332+
"AllocationId":{
34333+
"shape":"AllocationId",
34334+
"documentation":"<p>[EC2-VPC] The allocation ID.</p>"
34335+
},
34336+
"Attribute":{
34337+
"shape":"AddressAttributeName",
34338+
"documentation":"<p>The attribute of the IP address.</p>"
34339+
},
34340+
"DryRun":{
34341+
"shape":"Boolean",
34342+
"documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
34343+
}
34344+
}
34345+
},
34346+
"ResetAddressAttributeResult":{
34347+
"type":"structure",
34348+
"members":{
34349+
"Address":{
34350+
"shape":"AddressAttribute",
34351+
"documentation":"<p>Information about the IP address.</p>",
34352+
"locationName":"address"
34353+
}
34354+
}
34355+
},
3415634356
"ResetEbsDefaultKmsKeyIdRequest":{
3415734357
"type":"structure",
3415834358
"members":{

0 commit comments

Comments
 (0)