Skip to content

Commit 83bc8ab

Browse files
Adds PrivateDnsPreference and PrivateDnsSpecifiedDomains to control private DNS resolution for resource and service network VPC endpoints and IpamScopeExternalAuthorityConfiguration to integrate Amazon VPC IPAM with a third-party IPAM service
1 parent c926f92 commit 83bc8ab

19 files changed

+828
-7
lines changed

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

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13225,7 +13225,8 @@
1322513225
"ClientToken":{
1322613226
"shape":"String",
1322713227
"idempotencyToken":true
13228-
}
13228+
},
13229+
"ExternalAuthorityConfiguration":{"shape":"ExternalAuthorityConfiguration"}
1322913230
}
1323013231
},
1323113232
"CreateIpamScopeResult":{
@@ -24484,14 +24485,27 @@
2448424485
"PrivateDnsOnlyForInboundResolverEndpoint":{
2448524486
"shape":"Boolean",
2448624487
"locationName":"privateDnsOnlyForInboundResolverEndpoint"
24488+
},
24489+
"PrivateDnsPreference":{
24490+
"shape":"String",
24491+
"locationName":"privateDnsPreference"
24492+
},
24493+
"PrivateDnsSpecifiedDomains":{
24494+
"shape":"PrivateDnsSpecifiedDomainSet",
24495+
"locationName":"privateDnsSpecifiedDomainSet"
2448724496
}
2448824497
}
2448924498
},
2449024499
"DnsOptionsSpecification":{
2449124500
"type":"structure",
2449224501
"members":{
2449324502
"DnsRecordIpType":{"shape":"DnsRecordIpType"},
24494-
"PrivateDnsOnlyForInboundResolverEndpoint":{"shape":"Boolean"}
24503+
"PrivateDnsOnlyForInboundResolverEndpoint":{"shape":"Boolean"},
24504+
"PrivateDnsPreference":{"shape":"String"},
24505+
"PrivateDnsSpecifiedDomains":{
24506+
"shape":"PrivateDnsSpecifiedDomainSet",
24507+
"locationName":"PrivateDnsSpecifiedDomain"
24508+
}
2449524509
}
2449624510
},
2449724511
"DnsRecordIpType":{
@@ -26396,6 +26410,13 @@
2639626410
}
2639726411
},
2639826412
"ExportVmTaskId":{"type":"string"},
26413+
"ExternalAuthorityConfiguration":{
26414+
"type":"structure",
26415+
"members":{
26416+
"Type":{"shape":"IpamScopeExternalAuthorityType"},
26417+
"ExternalResourceIdentifier":{"shape":"String"}
26418+
}
26419+
},
2639926420
"FailedCapacityReservationFleetCancellationResult":{
2640026421
"type":"structure",
2640126422
"members":{
@@ -36011,9 +36032,30 @@
3601136032
"Tags":{
3601236033
"shape":"TagList",
3601336034
"locationName":"tagSet"
36035+
},
36036+
"ExternalAuthorityConfiguration":{
36037+
"shape":"IpamScopeExternalAuthorityConfiguration",
36038+
"locationName":"externalAuthorityConfiguration"
36039+
}
36040+
}
36041+
},
36042+
"IpamScopeExternalAuthorityConfiguration":{
36043+
"type":"structure",
36044+
"members":{
36045+
"Type":{
36046+
"shape":"IpamScopeExternalAuthorityType",
36047+
"locationName":"type"
36048+
},
36049+
"ExternalResourceIdentifier":{
36050+
"shape":"String",
36051+
"locationName":"externalResourceIdentifier"
3601436052
}
3601536053
}
3601636054
},
36055+
"IpamScopeExternalAuthorityType":{
36056+
"type":"string",
36057+
"enum":["infoblox"]
36058+
},
3601736059
"IpamScopeId":{"type":"string"},
3601836060
"IpamScopeSet":{
3601936061
"type":"list",
@@ -39584,7 +39626,9 @@
3958439626
"members":{
3958539627
"DryRun":{"shape":"Boolean"},
3958639628
"IpamScopeId":{"shape":"IpamScopeId"},
39587-
"Description":{"shape":"String"}
39629+
"Description":{"shape":"String"},
39630+
"ExternalAuthorityConfiguration":{"shape":"ExternalAuthorityConfiguration"},
39631+
"RemoveExternalAuthorityConfiguration":{"shape":"Boolean"}
3958839632
}
3958939633
},
3959039634
"ModifyIpamScopeResult":{
@@ -43508,6 +43552,15 @@
4350843552
}
4350943553
}
4351043554
},
43555+
"PrivateDnsSpecifiedDomainSet":{
43556+
"type":"list",
43557+
"member":{
43558+
"shape":"String",
43559+
"locationName":"item"
43560+
},
43561+
"max":10,
43562+
"min":0
43563+
},
4351143564
"PrivateIpAddressConfigSet":{
4351243565
"type":"list",
4351343566
"member":{

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3054,6 +3054,7 @@
30543054
"ModifyIpamResourceCidrRequest$Monitored": "<p>Determines if the resource is monitored by IPAM. If a resource is monitored, the resource is discovered by IPAM and you can view details about the resource’s CIDR.</p>",
30553055
"ModifyIpamResourceDiscoveryRequest$DryRun": "<p>A check for 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>",
30563056
"ModifyIpamScopeRequest$DryRun": "<p>A check for 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>",
3057+
"ModifyIpamScopeRequest$RemoveExternalAuthorityConfiguration": "<p>Remove the external authority configuration. <code>true</code> to remove.</p>",
30573058
"ModifyLaunchTemplateRequest$DryRun": "<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>",
30583059
"ModifyLocalGatewayRouteRequest$DryRun": "<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>",
30593060
"ModifyManagedPrefixListRequest$DryRun": "<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>",
@@ -10066,7 +10067,7 @@
1006610067
"DnsNameState": {
1006710068
"base": null,
1006810069
"refs": {
10069-
"PrivateDnsNameConfiguration$State": "<p>The verification state of the VPC endpoint service.</p> <p>&gt;Consumers of the endpoint service can use the private name only when the state is <code>verified</code>.</p>",
10070+
"PrivateDnsNameConfiguration$State": "<p>The verification state of the VPC endpoint service.</p> <p>Consumers of the endpoint service can use the private name only when the state is <code>verified</code>.</p>",
1007010071
"ServiceDetail$PrivateDnsNameVerificationState": "<p>The verification state of the VPC endpoint service.</p> <p>Consumers of the endpoint service cannot use the private name when the state is not <code>verified</code>.</p>"
1007110072
}
1007210073
},
@@ -10993,6 +10994,13 @@
1099310994
"CancelExportTaskRequest$ExportTaskId": "<p>The ID of the export task. This is the ID returned by the <code>CreateInstanceExportTask</code> and <code>ExportImage</code> operations.</p>"
1099410995
}
1099510996
},
10997+
"ExternalAuthorityConfiguration": {
10998+
"base": "<p>The configuration that links an Amazon VPC IPAM scope to an external authority system. It specifies the type of external system and the external resource identifier that identifies your account or instance in that system.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/ipam/integrate-infoblox-ipam.html\">Integrate VPC IPAM with Infoblox infrastructure</a> in the <i>Amazon VPC IPAM User Guide</i>..</p>",
10999+
"refs": {
11000+
"CreateIpamScopeRequest$ExternalAuthorityConfiguration": "<p>The configuration that links an Amazon VPC IPAM scope to an external authority system. It specifies the type of external system and the external resource identifier that identifies your account or instance in that system.</p> <p>In IPAM, an external authority is a third-party IP address management system that provides CIDR blocks when you provision address space for top-level IPAM pools. This allows you to use your existing IP management system to control which address ranges are allocated to Amazon Web Services while using Amazon VPC IPAM to manage subnets within those ranges.</p>",
11001+
"ModifyIpamScopeRequest$ExternalAuthorityConfiguration": "<p>The configuration that links an Amazon VPC IPAM scope to an external authority system. It specifies the type of external system and the external resource identifier that identifies your account or instance in that system.</p> <p>In IPAM, an external authority is a third-party IP address management system that provides CIDR blocks when you provision address space for top-level IPAM pools. This allows you to use your existing IP management system to control which address ranges are allocated to Amazon Web Services while using Amazon VPC IPAM to manage subnets within those ranges.</p>"
11002+
}
11003+
},
1099611004
"FailedCapacityReservationFleetCancellationResult": {
1099711005
"base": "<p>Describes a Capacity Reservation Fleet that could not be cancelled.</p>",
1099811006
"refs": {
@@ -15605,6 +15613,19 @@
1560515613
"ModifyIpamScopeResult$IpamScope": "<p>The results of the modification.</p>"
1560615614
}
1560715615
},
15616+
"IpamScopeExternalAuthorityConfiguration": {
15617+
"base": "<p>The configuration that links an Amazon VPC IPAM scope to an external authority system. It specifies the type of external system and the external resource identifier that identifies your account or instance in that system.</p> <p>In IPAM, an external authority is a third-party IP address management system that provides CIDR blocks when you provision address space for top-level IPAM pools. This allows you to use your existing IP management system to control which address ranges are allocated to Amazon Web Services while using Amazon VPC IPAM to manage subnets within those ranges.</p>",
15618+
"refs": {
15619+
"IpamScope$ExternalAuthorityConfiguration": "<p>The external authority configuration for this IPAM scope, if configured.</p> <p>The configuration that links an Amazon VPC IPAM scope to an external authority system. It specifies the type of external system and the external resource identifier that identifies your account or instance in that system.</p> <p>In IPAM, an external authority is a third-party IP address management system that provides CIDR blocks when you provision address space for top-level IPAM pools. This allows you to use your existing IP management system to control which address ranges are allocated to Amazon Web Services while using Amazon VPC IPAM to manage subnets within those ranges.</p>"
15620+
}
15621+
},
15622+
"IpamScopeExternalAuthorityType": {
15623+
"base": null,
15624+
"refs": {
15625+
"ExternalAuthorityConfiguration$Type": "<p>The type of external authority.</p>",
15626+
"IpamScopeExternalAuthorityConfiguration$Type": "<p>The type of external authority managing this scope. Currently supports <code>Infoblox</code> for integration with Infoblox Universal DDI.</p>"
15627+
}
15628+
},
1560815629
"IpamScopeId": {
1560915630
"base": null,
1561015631
"refs": {
@@ -19977,6 +19998,13 @@
1997719998
"Instance$PrivateDnsNameOptions": "<p>The options for the instance hostname.</p>"
1997819999
}
1997920000
},
20001+
"PrivateDnsSpecifiedDomainSet": {
20002+
"base": null,
20003+
"refs": {
20004+
"DnsOptions$PrivateDnsSpecifiedDomains": "<p> Indicates which of the private domains to create private hosted zones for and associate with the specified VPC. Only supported when private DNS is enabled and the private DNS preference is <code>VERIFIED_DOMAINS_AND_SPECIFIED_DOMAINS</code> or <code>SPECIFIED_DOMAINS_ONLY</code>. </p>",
20005+
"DnsOptionsSpecification$PrivateDnsSpecifiedDomains": "<p> Indicates which of the private domains to create private hosted zones for and associate with the specified VPC. Only supported when private DNS is enabled and the private DNS preference is verified-domains-and-specified-domains or specified-domains-only. </p>"
20006+
}
20007+
},
1998020008
"PrivateIpAddressConfigSet": {
1998120009
"base": null,
1998220010
"refs": {
@@ -23836,6 +23864,8 @@
2383623864
"DiskImageVolumeDescription$Id": "<p>The volume identifier.</p>",
2383723865
"DnsEntry$DnsName": "<p>The DNS name.</p>",
2383823866
"DnsEntry$HostedZoneId": "<p>The ID of the private hosted zone.</p>",
23867+
"DnsOptions$PrivateDnsPreference": "<p> The preference for which private domains have a private hosted zone created for and associated with the specified VPC. Only supported when private DNS is enabled and when the VPC endpoint type is ServiceNetwork or Resource. </p> <ul> <li> <p> <code>ALL_DOMAINS</code> - VPC Lattice provisions private hosted zones for all custom domain names.</p> </li> <li> <p> <code>VERIFIED_DOMAINS_ONLY</code> - VPC Lattice provisions a private hosted zone only if custom domain name has been verified by the provider.</p> </li> <li> <p> <code>VERIFIED_DOMAINS_AND_SPECIFIED_DOMAINS</code> - VPC Lattice provisions private hosted zones for all verified custom domain names and other domain names that the resource consumer specifies. The resource consumer specifies the domain names in the PrivateDnsSpecifiedDomains parameter.</p> </li> <li> <p> <code>SPECIFIED_DOMAINS_ONLY</code> - VPC Lattice provisions a private hosted zone for domain names specified by the resource consumer. The resource consumer specifies the domain names in the PrivateDnsSpecifiedDomains parameter.</p> </li> </ul>",
23868+
"DnsOptionsSpecification$PrivateDnsPreference": "<p> The preference for which private domains have a private hosted zone created for and associated with the specified VPC. Only supported when private DNS is enabled and when the VPC endpoint type is ServiceNetwork or Resource. </p> <ul> <li> <p> <code>ALL_DOMAINS</code> - VPC Lattice provisions private hosted zones for all custom domain names.</p> </li> <li> <p> <code>VERIFIED_DOMAINS_ONLY</code> - VPC Lattice provisions a private hosted zone only if custom domain name has been verified by the provider.</p> </li> <li> <p> <code>VERIFIED_DOMAINS_AND_SPECIFIED_DOMAINS</code> - VPC Lattice provisions private hosted zones for all verified custom domain names and other domain names that the resource consumer specifies. The resource consumer specifies the domain names in the PrivateDnsSpecifiedDomains parameter.</p> </li> <li> <p> <code>SPECIFIED_DOMAINS_ONLY</code> - VPC Lattice provisions a private hosted zone for domain names specified by the resource consumer. The resource consumer specifies the domain names in the PrivateDnsSpecifiedDomains parameter.</p> </li> </ul>",
2383923869
"EbsBlockDevice$KmsKeyId": "<p>Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.</p> <p>This parameter is only supported on <code>BlockDeviceMapping</code> objects called by <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html\">RequestSpotFleet</a>, and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html\">RequestSpotInstances</a>.</p>",
2384023870
"EbsBlockDevice$OutpostArn": "<p>The ARN of the Outpost on which the snapshot is stored.</p> <p>This parameter is not supported when using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html\">CreateImage</a>.</p>",
2384123871
"EbsBlockDevice$AvailabilityZone": "<p>The Availability Zone where the EBS volume will be created (for example, <code>us-east-1a</code>).</p> <p>Either <code>AvailabilityZone</code> or <code>AvailabilityZoneId</code> can be specified, but not both. If neither is specified, Amazon EC2 automatically selects an Availability Zone within the Region.</p> <p>This parameter is not supported when using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet.html\">CreateFleet</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html\">CreateImage</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html\">DescribeImages</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html\">RequestSpotFleet</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html\">RequestSpotInstances</a>, and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>.</p>",
@@ -23924,6 +23954,7 @@
2392423954
"ExportVerifiedAccessInstanceClientConfigurationResult$Version": "<p>The version.</p>",
2392523955
"ExportVerifiedAccessInstanceClientConfigurationResult$VerifiedAccessInstanceId": "<p>The ID of the Verified Access instance.</p>",
2392623956
"ExportVerifiedAccessInstanceClientConfigurationResult$Region": "<p>The Region.</p>",
23957+
"ExternalAuthorityConfiguration$ExternalResourceIdentifier": "<p>The identifier for the external resource managing this scope. For Infoblox integrations, this is the Infoblox resource identifier in the format <code>&lt;version&gt;.identity.account.&lt;entity_realm&gt;.&lt;entity_id&gt;</code>.</p>",
2392723958
"FailedQueuedPurchaseDeletion$ReservedInstancesId": "<p>The ID of the Reserved Instance.</p>",
2392823959
"FastLaunchLaunchTemplateSpecificationRequest$LaunchTemplateName": "<p>Specify the name of the launch template that the AMI should use for Windows fast launch.</p>",
2392923960
"FastLaunchLaunchTemplateSpecificationRequest$Version": "<p>Specify the version of the launch template that the AMI should use for Windows fast launch.</p>",
@@ -24367,6 +24398,7 @@
2436724398
"IpamScope$OwnerId": "<p>The Amazon Web Services account ID of the owner of the scope.</p>",
2436824399
"IpamScope$IpamRegion": "<p>The Amazon Web Services Region of the IPAM scope.</p>",
2436924400
"IpamScope$Description": "<p>The description of the scope.</p>",
24401+
"IpamScopeExternalAuthorityConfiguration$ExternalResourceIdentifier": "<p>The identifier for the external resource managing this scope. For Infoblox integrations, this is the Infoblox resource identifier in the format <code>&lt;version&gt;.identity.account.&lt;entity_realm&gt;.&lt;entity_id&gt;</code>.</p>",
2437024402
"Ipv4PrefixSpecification$Ipv4Prefix": "<p>The IPv4 prefix. For information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html\"> Assigning prefixes to network interfaces</a> in the <i>Amazon EC2 User Guide</i>.</p>",
2437124403
"Ipv4PrefixSpecificationRequest$Ipv4Prefix": "<p>The IPv4 prefix. For information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html\"> Assigning prefixes to network interfaces</a> in the <i>Amazon EC2 User Guide</i>.</p>",
2437224404
"Ipv4PrefixSpecificationResponse$Ipv4Prefix": "<p>The IPv4 delegated prefixes assigned to the network interface.</p>",
@@ -24709,6 +24741,7 @@
2470924741
"PrivateDnsNameConfiguration$Type": "<p>The endpoint service verification type, for example TXT.</p>",
2471024742
"PrivateDnsNameConfiguration$Value": "<p>The value the service provider adds to the private DNS name domain record before verification.</p>",
2471124743
"PrivateDnsNameConfiguration$Name": "<p>The name of the record subdomain the service provider needs to create. The service provider adds the <code>value</code> text to the <code>name</code>.</p>",
24744+
"PrivateDnsSpecifiedDomainSet$member": null,
2471224745
"PrivateIpAddressSpecification$PrivateIpAddress": "<p>The private IPv4 address.</p>",
2471324746
"PrivateIpAddressStringList$member": null,
2471424747
"ProductCode$ProductCodeId": "<p>The product code.</p>",

0 commit comments

Comments
 (0)