aws-sdk-ec2 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 385ecdae6c5618f1c5c453082b21123a4f56c4e1
-  data.tar.gz: 6fbdaadfa0143893dd944b97b625295ad5722b33
+  metadata.gz: d026bd05ec2b566cd48c80e9ef6df07a76ee7f94
+  data.tar.gz: 87d99827d56bff34bb21a8784afa8cf80e051eba
 SHA512:
-  metadata.gz: 5846bcc77d4b51873d4012fff584f75088c9ed872da4a6de6252da112f55d5fec111fa12cdfbeac0473fbe52bf1cb53b11c4bca0202cbdcc057a7d86df6c83ba
-  data.tar.gz: 9a64c660c13a5d5b52eb6bc600a7c3a53e932461059ab87b4a34ec80ded7951b122afabcea6c6421e9cc60fc66d2eb99833f42952b666438dfb5508f2f4c4337
+  metadata.gz: 1e21e5d5734bf41d2bcee057d6a0d588f99f8c8592f508c2549bc653d755cb5987f4bfd7ba98c2d0aeb3b414fe3615590047764ad92d629129e3214344e09b57
+  data.tar.gz: e1fd28e1d61a5d4cc269675502aa48d0f53ba9694a69197b91b0bd51f4a478aeec268951ebc3bb948be0da24f09864fb194b986d379268e507440ea855dba6ff

data/lib/aws-sdk-ec2.rb

@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @service
 module Aws::EC2
 
-  GEM_VERSION = '1.25.0'
+  GEM_VERSION = '1.26.0'
 
 end

data/lib/aws-sdk-ec2/client.rb

@@ -4716,7 +4716,7 @@ module Aws::EC2
     # @option params [required, String] :group_name
     #   The name of the security group.
     #
-    #   Constraints: Up to 255 characters in length
+    #   Constraints: Up to 255 characters in length. Cannot start with `sg-`.
     #
     #   Constraints for EC2-Classic: ASCII characters
     #
@@ -7785,6 +7785,58 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Describes the longer ID format settings for all resource types in a
+    # specific region. This request is useful for performing a quick audit
+    # to determine whether a specific region is fully opted in for longer
+    # IDs (17-character IDs).
+    #
+    # This request only returns information about resource types that
+    # support longer IDs.
+    #
+    # The following resource types support longer IDs: `bundle` \|
+    # `conversion-task` \| `dhcp-options` \| `elastic-ip-allocation` \|
+    # `elastic-ip-association` \| `export-task` \| `flow-log` \| `image` \|
+    # `import-task` \| `instance` \| `internet-gateway` \| `network-acl` \|
+    # `network-acl-association` \| `network-interface` \|
+    # `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    # `route-table` \| `route-table-association` \| `security-group` \|
+    # `snapshot` \| `subnet` \| `subnet-cidr-block-association` \| `volume`
+    # \| `vpc` \| `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    # @option params [Boolean] :dry_run
+    #   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
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @return [Types::DescribeAggregateIdFormatResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeAggregateIdFormatResult#use_long_ids_aggregated #use_long_ids_aggregated} => Boolean
+    #   * {Types::DescribeAggregateIdFormatResult#statuses #statuses} => Array<Types::IdFormat>
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_aggregate_id_format({
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.use_long_ids_aggregated #=> Boolean
+    #   resp.statuses #=> Array
+    #   resp.statuses[0].deadline #=> Time
+    #   resp.statuses[0].resource #=> String
+    #   resp.statuses[0].use_long_ids #=> Boolean
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAggregateIdFormat AWS API Documentation
+    #
+    # @overload describe_aggregate_id_format(params = {})
+    # @param [Hash] params ({})
+    def describe_aggregate_id_format(params = {}, options = {})
+      req = build_request(:describe_aggregate_id_format, params)
+      req.send_request(options)
+    end
+
     # Describes one or more of the Availability Zones that are available to
     # you. The results include zones only for the region you're currently
     # using. If there is an event impacting an Availability Zone, you can
@@ -9136,8 +9188,15 @@ module Aws::EC2
     # whose ID formats can be modified; it does not return information about
     # other resource types.
     #
-    # The following resource types support longer IDs: `instance` \|
-    # `reservation` \| `snapshot` \| `volume`.
+    # The following resource types support longer IDs: `bundle` \|
+    # `conversion-task` \| `dhcp-options` \| `elastic-ip-allocation` \|
+    # `elastic-ip-association` \| `export-task` \| `flow-log` \| `image` \|
+    # `import-task` \| `instance` \| `internet-gateway` \| `network-acl` \|
+    # `network-acl-association` \| `network-interface` \|
+    # `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    # `route-table` \| `route-table-association` \| `security-group` \|
+    # `snapshot` \| `subnet` \| `subnet-cidr-block-association` \| `volume`
+    # \| `vpc` \| `vpc-cidr-block-association` \| `vpc-peering-connection`.
     #
     # These settings apply to the IAM user who makes the request; they do
     # not apply to the entire AWS account. By default, an IAM user defaults
@@ -9148,8 +9207,15 @@ module Aws::EC2
     # `Describe` command for the resource type.
     #
     # @option params [String] :resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \| `dhcp-options`
+    #   \| `elastic-ip-allocation` \| `elastic-ip-association` \|
+    #   `export-task` \| `flow-log` \| `image` \| `import-task` \| `instance`
+    #   \| `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    #   `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    #   \| `reservation` \| `route-table` \| `route-table-association` \|
+    #   `security-group` \| `snapshot` \| `subnet` \|
+    #   `subnet-cidr-block-association` \| `volume` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`
     #
     # @return [Types::DescribeIdFormatResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -9185,8 +9251,15 @@ module Aws::EC2
     # information, see [Resource IDs][1] in the *Amazon Elastic Compute
     # Cloud User Guide*.
     #
-    # The following resource types support longer IDs: `instance` \|
-    # `reservation` \| `snapshot` \| `volume`.
+    # The following resource types support longer IDs: `bundle` \|
+    # `conversion-task` \| `dhcp-options` \| `elastic-ip-allocation` \|
+    # `elastic-ip-association` \| `export-task` \| `flow-log` \| `image` \|
+    # `import-task` \| `instance` \| `internet-gateway` \| `network-acl` \|
+    # `network-acl-association` \| `network-interface` \|
+    # `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    # `route-table` \| `route-table-association` \| `security-group` \|
+    # `snapshot` \| `subnet` \| `subnet-cidr-block-association` \| `volume`
+    # \| `vpc` \| `vpc-cidr-block-association` \| `vpc-peering-connection`.
     #
     # These settings apply to the principal specified in the request. They
     # do not apply to the principal that makes the request.
@@ -9200,8 +9273,15 @@ module Aws::EC2
     #   root user.
     #
     # @option params [String] :resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \| `dhcp-options`
+    #   \| `elastic-ip-allocation` \| `elastic-ip-association` \|
+    #   `export-task` \| `flow-log` \| `image` \| `import-task` \| `instance`
+    #   \| `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    #   `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    #   \| `reservation` \| `route-table` \| `route-table-association` \|
+    #   `security-group` \| `snapshot` \| `subnet` \|
+    #   `subnet-cidr-block-association` \| `volume` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`
     #
     # @return [Types::DescribeIdentityIdFormatResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -11948,6 +12028,83 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Describes the ID format settings for the root user and all IAM roles
+    # and IAM users that have explicitly specified a longer ID (17-character
+    # ID) preference.
+    #
+    # By default, all IAM roles and IAM users default to the same ID
+    # settings as the root user, unless they explicitly override the
+    # settings. This request is useful for identifying those IAM users and
+    # IAM roles that have overridden the default ID settings.
+    #
+    # The following resource types support longer IDs: `bundle` \|
+    # `conversion-task` \| `dhcp-options` \| `elastic-ip-allocation` \|
+    # `elastic-ip-association` \| `export-task` \| `flow-log` \| `image` \|
+    # `import-task` \| `instance` \| `internet-gateway` \| `network-acl` \|
+    # `network-acl-association` \| `network-interface` \|
+    # `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    # `route-table` \| `route-table-association` \| `security-group` \|
+    # `snapshot` \| `subnet` \| `subnet-cidr-block-association` \| `volume`
+    # \| `vpc` \| `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    # @option params [Boolean] :dry_run
+    #   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
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [Array<String>] :resources
+    #   The type of resource: `bundle` \| `conversion-task` \| `dhcp-options`
+    #   \| `elastic-ip-allocation` \| `elastic-ip-association` \|
+    #   `export-task` \| `flow-log` \| `image` \| `import-task` \| `instance`
+    #   \| `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    #   `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    #   \| `reservation` \| `route-table` \| `route-table-association` \|
+    #   `security-group` \| `snapshot` \| `subnet` \|
+    #   `subnet-cidr-block-association` \| `volume` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in a single call. To retrieve
+    #   the remaining results, make another call with the returned NextToken
+    #   value.
+    #
+    # @option params [String] :next_token
+    #   The token to request the next page of results.
+    #
+    # @return [Types::DescribePrincipalIdFormatResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribePrincipalIdFormatResult#principals #principals} => Array&lt;Types::PrincipalIdFormat&gt;
+    #   * {Types::DescribePrincipalIdFormatResult#next_token #next_token} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_principal_id_format({
+    #     dry_run: false,
+    #     resources: ["String"],
+    #     max_results: 1,
+    #     next_token: "String",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.principals #=> Array
+    #   resp.principals[0].arn #=> String
+    #   resp.principals[0].statuses #=> Array
+    #   resp.principals[0].statuses[0].deadline #=> Time
+    #   resp.principals[0].statuses[0].resource #=> String
+    #   resp.principals[0].statuses[0].use_long_ids #=> Boolean
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePrincipalIdFormat AWS API Documentation
+    #
+    # @overload describe_principal_id_format(params = {})
+    # @param [Hash] params ({})
+    def describe_principal_id_format(params = {}, options = {})
+      req = build_request(:describe_principal_id_format, params)
+      req.send_request(options)
+    end
+
     # Describes one or more regions that are currently available to you.
     #
     # For a list of the regions supported by Amazon EC2, see [Regions and
@@ -13254,7 +13411,8 @@ module Aws::EC2
     # @option params [Integer] :max_results
     #   The maximum number of results to return in a single call. To retrieve
     #   the remaining results, make another request with the returned
-    #   `NextToken` value. This value can be between 5 and 1000.
+    #   `NextToken` value. This value can be between 5 and 1000. If this
+    #   parameter is not specified, then all results are returned.
     #
     # @return [Types::DescribeSecurityGroupsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -18473,9 +18631,18 @@ module Aws::EC2
 
     # Modifies the ID format for the specified resource on a per-region
     # basis. You can specify that resources should receive longer IDs
-    # (17-character IDs) when they are created. The following resource types
-    # support longer IDs: `instance` \| `reservation` \| `snapshot` \|
-    # `volume`.
+    # (17-character IDs) when they are created.
+    #
+    # This request can only be used to modify longer ID settings for
+    # resource types that are within the opt-in period. Resources currently
+    # in their opt-in period include: `bundle` \| `conversion-task` \|
+    # `dhcp-options` \| `elastic-ip-allocation` \| `elastic-ip-association`
+    # \| `export-task` \| `flow-log` \| `image` \| `import-task` \|
+    # `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    # `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    # \| `route-table` \| `route-table-association` \| `security-group` \|
+    # `subnet` \| `subnet-cidr-block-association` \| `vpc` \|
+    # `vpc-cidr-block-association` \| `vpc-peering-connection`.
     #
     # This setting applies to the IAM user who makes the request; it does
     # not apply to the entire AWS account. By default, an IAM user defaults
@@ -18495,8 +18662,17 @@ module Aws::EC2
     # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/resource-ids.html
     #
     # @option params [required, String] :resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \| `dhcp-options`
+    #   \| `elastic-ip-allocation` \| `elastic-ip-association` \|
+    #   `export-task` \| `flow-log` \| `image` \| `import-task` \|
+    #   `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    #   `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    #   \| `route-table` \| `route-table-association` \| `security-group` \|
+    #   `subnet` \| `subnet-cidr-block-association` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    #   Alternatively, use the `all-current` option to include all resource
+    #   types that are currently within their opt-in period for longer IDs.
     #
     # @option params [required, Boolean] :use_long_ids
     #   Indicate whether the resource should use longer IDs (17-character
@@ -18525,9 +18701,19 @@ module Aws::EC2
     # and the root user for an account. You can specify that resources
     # should receive longer IDs (17-character IDs) when they are created.
     #
-    # The following resource types support longer IDs: `instance` \|
-    # `reservation` \| `snapshot` \| `volume`. For more information, see
-    # [Resource IDs][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    # This request can only be used to modify longer ID settings for
+    # resource types that are within the opt-in period. Resources currently
+    # in their opt-in period include: `bundle` \| `conversion-task` \|
+    # `dhcp-options` \| `elastic-ip-allocation` \| `elastic-ip-association`
+    # \| `export-task` \| `flow-log` \| `image` \| `import-task` \|
+    # `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    # `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    # \| `route-table` \| `route-table-association` \| `security-group` \|
+    # `subnet` \| `subnet-cidr-block-association` \| `vpc` \|
+    # `vpc-cidr-block-association` \| `vpc-peering-connection`..
+    #
+    # For more information, see [Resource IDs][1] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
     #
     # This setting applies to the principal specified in the request; it
     # does not apply to the principal that makes the request.
@@ -18547,8 +18733,17 @@ module Aws::EC2
     #   IAM roles, and the root user of the account.
     #
     # @option params [required, String] :resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \| `dhcp-options`
+    #   \| `elastic-ip-allocation` \| `elastic-ip-association` \|
+    #   `export-task` \| `flow-log` \| `image` \| `import-task` \|
+    #   `internet-gateway` \| `network-acl` \| `network-acl-association` \|
+    #   `network-interface` \| `network-interface-attachment` \| `prefix-list`
+    #   \| `route-table` \| `route-table-association` \| `security-group` \|
+    #   `subnet` \| `subnet-cidr-block-association` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    #   Alternatively, use the `all-current` option to include all resource
+    #   types that are currently within their opt-in period for longer IDs.
     #
     # @option params [required, Boolean] :use_long_ids
     #   Indicates whether the resource should use longer IDs (17-character
@@ -23782,7 +23977,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.25.0'
+      context[:gem_version] = '1.26.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-ec2/client_api.rb

@@ -264,6 +264,8 @@ module Aws::EC2
     DescribeAccountAttributesResult = Shapes::StructureShape.new(name: 'DescribeAccountAttributesResult')
     DescribeAddressesRequest = Shapes::StructureShape.new(name: 'DescribeAddressesRequest')
     DescribeAddressesResult = Shapes::StructureShape.new(name: 'DescribeAddressesResult')
+    DescribeAggregateIdFormatRequest = Shapes::StructureShape.new(name: 'DescribeAggregateIdFormatRequest')
+    DescribeAggregateIdFormatResult = Shapes::StructureShape.new(name: 'DescribeAggregateIdFormatResult')
     DescribeAvailabilityZonesRequest = Shapes::StructureShape.new(name: 'DescribeAvailabilityZonesRequest')
     DescribeAvailabilityZonesResult = Shapes::StructureShape.new(name: 'DescribeAvailabilityZonesResult')
     DescribeBundleTasksRequest = Shapes::StructureShape.new(name: 'DescribeBundleTasksRequest')
@@ -339,6 +341,8 @@ module Aws::EC2
     DescribePlacementGroupsResult = Shapes::StructureShape.new(name: 'DescribePlacementGroupsResult')
     DescribePrefixListsRequest = Shapes::StructureShape.new(name: 'DescribePrefixListsRequest')
     DescribePrefixListsResult = Shapes::StructureShape.new(name: 'DescribePrefixListsResult')
+    DescribePrincipalIdFormatRequest = Shapes::StructureShape.new(name: 'DescribePrincipalIdFormatRequest')
+    DescribePrincipalIdFormatResult = Shapes::StructureShape.new(name: 'DescribePrincipalIdFormatResult')
     DescribeRegionsRequest = Shapes::StructureShape.new(name: 'DescribeRegionsRequest')
     DescribeRegionsResult = Shapes::StructureShape.new(name: 'DescribeRegionsResult')
     DescribeReservedInstancesListingsRequest = Shapes::StructureShape.new(name: 'DescribeReservedInstancesListingsRequest')
@@ -804,6 +808,8 @@ module Aws::EC2
     PriceScheduleSpecificationList = Shapes::ListShape.new(name: 'PriceScheduleSpecificationList')
     PricingDetail = Shapes::StructureShape.new(name: 'PricingDetail')
     PricingDetailsList = Shapes::ListShape.new(name: 'PricingDetailsList')
+    PrincipalIdFormat = Shapes::StructureShape.new(name: 'PrincipalIdFormat')
+    PrincipalIdFormatList = Shapes::ListShape.new(name: 'PrincipalIdFormatList')
     PrincipalType = Shapes::StringShape.new(name: 'PrincipalType')
     PrivateIpAddressConfigSet = Shapes::ListShape.new(name: 'PrivateIpAddressConfigSet')
     PrivateIpAddressSpecification = Shapes::StructureShape.new(name: 'PrivateIpAddressSpecification')
@@ -901,6 +907,7 @@ module Aws::EC2
     ResetNetworkInterfaceAttributeRequest = Shapes::StructureShape.new(name: 'ResetNetworkInterfaceAttributeRequest')
     ResetSnapshotAttributeRequest = Shapes::StructureShape.new(name: 'ResetSnapshotAttributeRequest')
     ResourceIdList = Shapes::ListShape.new(name: 'ResourceIdList')
+    ResourceList = Shapes::ListShape.new(name: 'ResourceList')
     ResourceType = Shapes::StringShape.new(name: 'ResourceType')
     ResponseError = Shapes::StructureShape.new(name: 'ResponseError')
     ResponseHostIdList = Shapes::ListShape.new(name: 'ResponseHostIdList')
@@ -2145,6 +2152,13 @@ module Aws::EC2
     DescribeAddressesResult.add_member(:addresses, Shapes::ShapeRef.new(shape: AddressList, location_name: "addressesSet"))
     DescribeAddressesResult.struct_class = Types::DescribeAddressesResult
 
+    DescribeAggregateIdFormatRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeAggregateIdFormatRequest.struct_class = Types::DescribeAggregateIdFormatRequest
+
+    DescribeAggregateIdFormatResult.add_member(:use_long_ids_aggregated, Shapes::ShapeRef.new(shape: Boolean, location_name: "useLongIdsAggregated"))
+    DescribeAggregateIdFormatResult.add_member(:statuses, Shapes::ShapeRef.new(shape: IdFormatList, location_name: "statusSet"))
+    DescribeAggregateIdFormatResult.struct_class = Types::DescribeAggregateIdFormatResult
+
     DescribeAvailabilityZonesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeAvailabilityZonesRequest.add_member(:zone_names, Shapes::ShapeRef.new(shape: ZoneNameStringList, location_name: "ZoneName"))
     DescribeAvailabilityZonesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -2507,6 +2521,16 @@ module Aws::EC2
     DescribePrefixListsResult.add_member(:prefix_lists, Shapes::ShapeRef.new(shape: PrefixListSet, location_name: "prefixListSet"))
     DescribePrefixListsResult.struct_class = Types::DescribePrefixListsResult
 
+    DescribePrincipalIdFormatRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribePrincipalIdFormatRequest.add_member(:resources, Shapes::ShapeRef.new(shape: ResourceList, location_name: "Resource"))
+    DescribePrincipalIdFormatRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxResults"))
+    DescribePrincipalIdFormatRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribePrincipalIdFormatRequest.struct_class = Types::DescribePrincipalIdFormatRequest
+
+    DescribePrincipalIdFormatResult.add_member(:principals, Shapes::ShapeRef.new(shape: PrincipalIdFormatList, location_name: "principalSet"))
+    DescribePrincipalIdFormatResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribePrincipalIdFormatResult.struct_class = Types::DescribePrincipalIdFormatResult
+
     DescribeRegionsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeRegionsRequest.add_member(:region_names, Shapes::ShapeRef.new(shape: RegionNameStringList, location_name: "RegionName"))
     DescribeRegionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -4213,8 +4237,8 @@ module Aws::EC2
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:service_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ServiceId"))
     ModifyVpcEndpointServiceConfigurationRequest.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "AcceptanceRequired"))
-    ModifyVpcEndpointServiceConfigurationRequest.add_member(:add_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "addNetworkLoadBalancerArn"))
-    ModifyVpcEndpointServiceConfigurationRequest.add_member(:remove_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "removeNetworkLoadBalancerArn"))
+    ModifyVpcEndpointServiceConfigurationRequest.add_member(:add_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "AddNetworkLoadBalancerArn"))
+    ModifyVpcEndpointServiceConfigurationRequest.add_member(:remove_network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "RemoveNetworkLoadBalancerArn"))
     ModifyVpcEndpointServiceConfigurationRequest.struct_class = Types::ModifyVpcEndpointServiceConfigurationRequest
 
     ModifyVpcEndpointServiceConfigurationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -4483,6 +4507,12 @@ module Aws::EC2
 
     PricingDetailsList.member = Shapes::ShapeRef.new(shape: PricingDetail, location_name: "item")
 
+    PrincipalIdFormat.add_member(:arn, Shapes::ShapeRef.new(shape: String, location_name: "arn"))
+    PrincipalIdFormat.add_member(:statuses, Shapes::ShapeRef.new(shape: IdFormatList, location_name: "statusSet"))
+    PrincipalIdFormat.struct_class = Types::PrincipalIdFormat
+
+    PrincipalIdFormatList.member = Shapes::ShapeRef.new(shape: PrincipalIdFormat, location_name: "item")
+
     PrivateIpAddressConfigSet.member = Shapes::ShapeRef.new(shape: ScheduledInstancesPrivateIpAddressConfig, location_name: "PrivateIpAddressConfigSet")
 
     PrivateIpAddressSpecification.add_member(:primary, Shapes::ShapeRef.new(shape: Boolean, location_name: "primary"))
@@ -4907,6 +4937,8 @@ module Aws::EC2
 
     ResourceIdList.member = Shapes::ShapeRef.new(shape: String)
 
+    ResourceList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+
     ResponseError.add_member(:code, Shapes::ShapeRef.new(shape: LaunchTemplateErrorCode, location_name: "code"))
     ResponseError.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     ResponseError.struct_class = Types::ResponseError
@@ -6710,6 +6742,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribeAddressesResult)
       end)
 
+      api.add_operation(:describe_aggregate_id_format, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeAggregateIdFormat"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeAggregateIdFormatRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeAggregateIdFormatResult)
+      end)
+
       api.add_operation(:describe_availability_zones, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeAvailabilityZones"
         o.http_method = "POST"
@@ -7032,6 +7072,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribePrefixListsResult)
       end)
 
+      api.add_operation(:describe_principal_id_format, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribePrincipalIdFormat"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribePrincipalIdFormatRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribePrincipalIdFormatResult)
+      end)
+
       api.add_operation(:describe_regions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeRegions"
         o.http_method = "POST"

data/lib/aws-sdk-ec2/resource.rb

@@ -595,7 +595,7 @@ module Aws::EC2
     # @option options [required, String] :group_name
     #   The name of the security group.
     #
-    #   Constraints: Up to 255 characters in length
+    #   Constraints: Up to 255 characters in length. Cannot start with `sg-`.
     #
     #   Constraints for EC2-Classic: ASCII characters
     #
@@ -2368,7 +2368,8 @@ module Aws::EC2
     # @option options [Integer] :max_results
     #   The maximum number of results to return in a single call. To retrieve
     #   the remaining results, make another request with the returned
-    #   `NextToken` value. This value can be between 5 and 1000.
+    #   `NextToken` value. This value can be between 5 and 1000. If this
+    #   parameter is not specified, then all results are returned.
     # @return [SecurityGroup::Collection]
     def security_groups(options = {})
       batches = Enumerator.new do |y|

data/lib/aws-sdk-ec2/types.rb

@@ -4171,7 +4171,8 @@ module Aws::EC2
     # @!attribute [rw] group_name
     #   The name of the security group.
     #
-    #   Constraints: Up to 255 characters in length
+    #   Constraints: Up to 255 characters in length. Cannot start with
+    #   `sg-`.
     #
     #   Constraints for EC2-Classic: ASCII characters
     #
@@ -6520,6 +6521,45 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeAggregateIdFormatRequest
+    #   data as a hash:
+    #
+    #       {
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] dry_run
+    #   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
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAggregateIdFormatRequest AWS API Documentation
+    #
+    class DescribeAggregateIdFormatRequest < Struct.new(
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] use_long_ids_aggregated
+    #   Indicates whether all resrouces types in the region are configured
+    #   to use longer IDs. This value will only be `true` if all users are
+    #   configured to use longer IDs for all resources types in the region.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] statuses
+    #   Information about each resource's ID format.
+    #   @return [Array<Types::IdFormat>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAggregateIdFormatResult AWS API Documentation
+    #
+    class DescribeAggregateIdFormatResult < Struct.new(
+      :use_long_ids_aggregated,
+      :statuses)
+      include Aws::Structure
+    end
+
     # Contains the parameters for DescribeAvailabilityZones.
     #
     # @note When making an API call, you may pass DescribeAvailabilityZonesRequest
@@ -7715,8 +7755,16 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \|
+    #   `dhcp-options` \| `elastic-ip-allocation` \|
+    #   `elastic-ip-association` \| `export-task` \| `flow-log` \| `image`
+    #   \| `import-task` \| `instance` \| `internet-gateway` \|
+    #   `network-acl` \| `network-acl-association` \| `network-interface` \|
+    #   `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    #   `route-table` \| `route-table-association` \| `security-group` \|
+    #   `snapshot` \| `subnet` \| `subnet-cidr-block-association` \|
+    #   `volume` \| `vpc` \| `vpc-cidr-block-association` \|
+    #   `vpc-peering-connection`
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeIdFormatRequest AWS API Documentation
@@ -7755,8 +7803,16 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \|
+    #   `dhcp-options` \| `elastic-ip-allocation` \|
+    #   `elastic-ip-association` \| `export-task` \| `flow-log` \| `image`
+    #   \| `import-task` \| `instance` \| `internet-gateway` \|
+    #   `network-acl` \| `network-acl-association` \| `network-interface` \|
+    #   `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    #   `route-table` \| `route-table-association` \| `security-group` \|
+    #   `snapshot` \| `subnet` \| `subnet-cidr-block-association` \|
+    #   `volume` \| `vpc` \| `vpc-cidr-block-association` \|
+    #   `vpc-peering-connection`
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeIdentityIdFormatRequest AWS API Documentation
@@ -9827,6 +9883,73 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribePrincipalIdFormatRequest
+    #   data as a hash:
+    #
+    #       {
+    #         dry_run: false,
+    #         resources: ["String"],
+    #         max_results: 1,
+    #         next_token: "String",
+    #       }
+    #
+    # @!attribute [rw] dry_run
+    #   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
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] resources
+    #   The type of resource: `bundle` \| `conversion-task` \|
+    #   `dhcp-options` \| `elastic-ip-allocation` \|
+    #   `elastic-ip-association` \| `export-task` \| `flow-log` \| `image`
+    #   \| `import-task` \| `instance` \| `internet-gateway` \|
+    #   `network-acl` \| `network-acl-association` \| `network-interface` \|
+    #   `network-interface-attachment` \| `prefix-list` \| `reservation` \|
+    #   `route-table` \| `route-table-association` \| `security-group` \|
+    #   `snapshot` \| `subnet` \| `subnet-cidr-block-association` \|
+    #   `volume` \| `vpc` \| `vpc-cidr-block-association` \|
+    #   `vpc-peering-connection`
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return in a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   NextToken value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] next_token
+    #   The token to request the next page of results.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePrincipalIdFormatRequest AWS API Documentation
+    #
+    class DescribePrincipalIdFormatRequest < Struct.new(
+      :dry_run,
+      :resources,
+      :max_results,
+      :next_token)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] principals
+    #   Information about the ID format settings for the ARN.
+    #   @return [Array<Types::PrincipalIdFormat>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   null when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribePrincipalIdFormatResult AWS API Documentation
+    #
+    class DescribePrincipalIdFormatResult < Struct.new(
+      :principals,
+      :next_token)
+      include Aws::Structure
+    end
+
     # Contains the parameters for DescribeRegions.
     #
     # @note When making an API call, you may pass DescribeRegionsRequest
@@ -10871,7 +10994,8 @@ module Aws::EC2
     # @!attribute [rw] max_results
     #   The maximum number of results to return in a single call. To
     #   retrieve the remaining results, make another request with the
-    #   returned `NextToken` value. This value can be between 5 and 1000.
+    #   returned `NextToken` value. This value can be between 5 and 1000. If
+    #   this parameter is not specified, then all results are returned.
     #   @return [Integer]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeSecurityGroupsRequest AWS API Documentation
@@ -11658,7 +11782,7 @@ module Aws::EC2
     #
     # @!attribute [rw] next_token
     #   The token required to retrieve the next set of results. This value
-    #   is `null` when there are no more results to return.
+    #   is an empty string when there are no more results to return.
     #   @return [String]
     #
     # @!attribute [rw] spot_price_history
@@ -15924,7 +16048,7 @@ module Aws::EC2
     # @!attribute [rw] format
     #   The format of the disk image being imported.
     #
-    #   Valid values: `RAW` \| `VHD` \| `VMDK` \| `OVA`
+    #   Valid values: `VHD` \| `VMDK` \| `OVA`
     #   @return [String]
     #
     # @!attribute [rw] snapshot_id
@@ -16274,10 +16398,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instance. If you are using an
-    #   AWS SDK or command line tool, Base64-encoding is performed for you,
-    #   and you can load the text from a file. Otherwise, you must provide
-    #   Base64-encoded text.
+    #   The Base64-encoded user data to make available to the instance.
     #   @return [Types::UserData]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportInstanceLaunchSpecification AWS API Documentation
@@ -18120,10 +18241,7 @@ module Aws::EC2
     # Describes the launch specification for an instance.
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instances. If you are using
-    #   an AWS SDK or command line tool, Base64-encoding is performed for
-    #   you, and you can load the text from a file. Otherwise, you must
-    #   provide Base64-encoded text.
+    #   The Base64-encoded user data for the instance.
     #   @return [String]
     #
     # @!attribute [rw] security_groups
@@ -19441,8 +19559,18 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \|
+    #   `dhcp-options` \| `elastic-ip-allocation` \|
+    #   `elastic-ip-association` \| `export-task` \| `flow-log` \| `image`
+    #   \| `import-task` \| `internet-gateway` \| `network-acl` \|
+    #   `network-acl-association` \| `network-interface` \|
+    #   `network-interface-attachment` \| `prefix-list` \| `route-table` \|
+    #   `route-table-association` \| `security-group` \| `subnet` \|
+    #   `subnet-cidr-block-association` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    #   Alternatively, use the `all-current` option to include all resource
+    #   types that are currently within their opt-in period for longer IDs.
     #   @return [String]
     #
     # @!attribute [rw] use_long_ids
@@ -19476,8 +19604,18 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource
-    #   The type of resource: `instance` \| `reservation` \| `snapshot` \|
-    #   `volume`
+    #   The type of resource: `bundle` \| `conversion-task` \|
+    #   `dhcp-options` \| `elastic-ip-allocation` \|
+    #   `elastic-ip-association` \| `export-task` \| `flow-log` \| `image`
+    #   \| `import-task` \| `internet-gateway` \| `network-acl` \|
+    #   `network-acl-association` \| `network-interface` \|
+    #   `network-interface-attachment` \| `prefix-list` \| `route-table` \|
+    #   `route-table-association` \| `security-group` \| `subnet` \|
+    #   `subnet-cidr-block-association` \| `vpc` \|
+    #   `vpc-cidr-block-association` \| `vpc-peering-connection`.
+    #
+    #   Alternatively, use the `all-current` option to include all resource
+    #   types that are currently within their opt-in period for longer IDs.
     #   @return [String]
     #
     # @!attribute [rw] use_long_ids
@@ -21875,6 +22013,24 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # PrincipalIdFormat description
+    #
+    # @!attribute [rw] arn
+    #   PrincipalIdFormatARN description
+    #   @return [String]
+    #
+    # @!attribute [rw] statuses
+    #   PrincipalIdFormatStatuses description
+    #   @return [Array<Types::IdFormat>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PrincipalIdFormat AWS API Documentation
+    #
+    class PrincipalIdFormat < Struct.new(
+      :arn,
+      :statuses)
+      include Aws::Structure
+    end
+
     # Describes a secondary private IPv4 address for a network interface.
     #
     # @note When making an API call, you may pass PrivateIpAddressSpecification
@@ -23268,12 +23424,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instance. For more
-    #   information, see [Running Commands on Your Linux Instance at
-    #   Launch][1] (Linux) and [Adding User Data][2] (Windows). If you are
-    #   using a command line tool, base64-encoding is performed for you and
-    #   you can load the text from a file. Otherwise, you must provide
-    #   base64-encoded text.
+    #   The Base64-encoded user data to make available to the instance. For
+    #   more information, see [Running Commands on Your Linux Instance at
+    #   Launch][1] (Linux) and [Adding User Data][2] (Windows).
     #
     #
     #
@@ -23889,10 +24042,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instances. If you are using
-    #   an AWS SDK or command line tool, Base64-encoding is performed for
-    #   you, and you can load the text from a file. Otherwise, you must
-    #   provide Base64-encoded text.
+    #   The Base64-encoded user data for the instance.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/RequestSpotLaunchSpecification AWS API Documentation
@@ -27005,7 +27155,7 @@ module Aws::EC2
     # @!attribute [rw] format
     #   The format of the disk image being imported.
     #
-    #   Valid values: `RAW` \| `VHD` \| `VMDK` \| `OVA`
+    #   Valid values: `VHD` \| `VMDK` \| `OVA`
     #   @return [String]
     #
     # @!attribute [rw] url
@@ -27284,10 +27434,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instances. If you are using
-    #   an AWS SDK or command line tool, Base64-encoding is performed for
-    #   you, and you can load the text from a file. Otherwise, you must
-    #   provide Base64-encoded text.
+    #   The Base64-encoded user data to make available to the instances.
     #   @return [String]
     #
     # @!attribute [rw] weighted_capacity
@@ -30058,7 +30205,8 @@ module Aws::EC2
     # @!attribute [rw] static_routes_only
     #   Indicate whether the VPN connection uses static routes only. If you
     #   are creating a VPN connection for a device that does not support
-    #   BGP, you must specify `true`.
+    #   BGP, you must specify `true`. Use CreateVpnConnectionRoute to create
+    #   a static route.
     #
     #   Default: `false`
     #   @return [Boolean]

data/lib/aws-sdk-ec2/vpc.rb

@@ -393,7 +393,7 @@ module Aws::EC2
     # @option options [required, String] :group_name
     #   The name of the security group.
     #
-    #   Constraints: Up to 255 characters in length
+    #   Constraints: Up to 255 characters in length. Cannot start with `sg-`.
     #
     #   Constraints for EC2-Classic: ASCII characters
     #
@@ -1743,7 +1743,8 @@ module Aws::EC2
     # @option options [Integer] :max_results
     #   The maximum number of results to return in a single call. To retrieve
     #   the remaining results, make another request with the returned
-    #   `NextToken` value. This value can be between 5 and 1000.
+    #   `NextToken` value. This value can be between 5 and 1000. If this
+    #   parameter is not specified, then all results are returned.
     # @return [SecurityGroup::Collection]
     def security_groups(options = {})
       batches = Enumerator.new do |y|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4