aws-sdk-ec2 1.101.0 → 1.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d5c66b78846324406c47d9f33a7673d4a68e56
-  data.tar.gz: b59f6f7cefc6fe3ac3009fd0e6d7eb468680ed06
+  metadata.gz: 4e4583627a9a1978a99518ab8d486a42b3312f2f
+  data.tar.gz: 1f89d814c20b6b3bb2fa94e36ae2fe9099f88261
 SHA512:
-  metadata.gz: 7792bb11f22723ce8028030dc23847c372a32410aadd928a8eca7e41f78b6a5889300ab932ac62a6c8b239cece2984d6ea6f8294c0d652fc36db9d0c9b859a96
-  data.tar.gz: ff39e1b692c761498a9153ef0e7f2d3974450ed003c82a37ac2dcafb0b2f13c5252e14eea200c5c7911b87e6f3a143adca06736068d60232eb7e5c9618e1394e
+  metadata.gz: '09723cd4b5905174daf2002a1c266e118a8f53d126859b6d6e3bf50849328b22361cbc93367b5fa490ff8c51df6e802ca43f4c52df2fc96065b6874bb519bfb9'
+  data.tar.gz: 48e9e0dfd61dc79e5f28b31f1b1c8a09604647b27ce6191471c4a95b4052872830f8b0cae624a11ab6f3b773a423bf45d8bba3000d938b2c4000681c70b1fe74

data/lib/aws-sdk-ec2.rb

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

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

@@ -3249,9 +3249,11 @@ module Aws::EC2
     # @option params [required, String] :instance_platform
     #   The type of operating system for which to reserve capacity.
     #
-    # @option params [required, String] :availability_zone
+    # @option params [String] :availability_zone
     #   The Availability Zone in which to create the Capacity Reservation.
     #
+    # @option params [String] :availability_zone_id
+    #
     # @option params [String] :tenancy
     #   Indicates the tenancy of the Capacity Reservation. A Capacity
     #   Reservation can have one of the following tenancy settings:
@@ -3340,7 +3342,8 @@ module Aws::EC2
     #     client_token: "String",
     #     instance_type: "String", # required
     #     instance_platform: "Linux/UNIX", # required, accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise
-    #     availability_zone: "String", # required
+    #     availability_zone: "String",
+    #     availability_zone_id: "String",
     #     tenancy: "default", # accepts default, dedicated
     #     instance_count: 1, # required
     #     ebs_optimized: false,
@@ -3365,6 +3368,9 @@ module Aws::EC2
     # @example Response structure
     #
     #   resp.capacity_reservation.capacity_reservation_id #=> String
+    #   resp.capacity_reservation.owner_id #=> String
+    #   resp.capacity_reservation.capacity_reservation_arn #=> String
+    #   resp.capacity_reservation.availability_zone_id #=> String
     #   resp.capacity_reservation.instance_type #=> String
     #   resp.capacity_reservation.instance_platform #=> String, one of "Linux/UNIX", "Red Hat Enterprise Linux", "SUSE Linux", "Windows", "Windows with SQL Server", "Windows with SQL Server Enterprise", "Windows with SQL Server Standard", "Windows with SQL Server Web", "Linux with SQL Server Standard", "Linux with SQL Server Web", "Linux with SQL Server Enterprise"
     #   resp.capacity_reservation.availability_zone #=> String
@@ -11314,6 +11320,9 @@ module Aws::EC2
     #   resp.next_token #=> String
     #   resp.capacity_reservations #=> Array
     #   resp.capacity_reservations[0].capacity_reservation_id #=> String
+    #   resp.capacity_reservations[0].owner_id #=> String
+    #   resp.capacity_reservations[0].capacity_reservation_arn #=> String
+    #   resp.capacity_reservations[0].availability_zone_id #=> String
     #   resp.capacity_reservations[0].instance_type #=> String
     #   resp.capacity_reservations[0].instance_platform #=> String, one of "Linux/UNIX", "Red Hat Enterprise Linux", "SUSE Linux", "Windows", "Windows with SQL Server", "Windows with SQL Server Enterprise", "Windows with SQL Server Standard", "Windows with SQL Server Web", "Linux with SQL Server Standard", "Linux with SQL Server Web", "Linux with SQL Server Enterprise"
     #   resp.capacity_reservations[0].availability_zone #=> String
@@ -23192,6 +23201,54 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # @option params [required, String] :capacity_reservation_id
+    #
+    # @option params [String] :next_token
+    #
+    # @option params [Integer] :max_results
+    #
+    # @option params [Boolean] :dry_run
+    #
+    # @return [Types::GetCapacityReservationUsageResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetCapacityReservationUsageResult#next_token #next_token} => String
+    #   * {Types::GetCapacityReservationUsageResult#capacity_reservation_id #capacity_reservation_id} => String
+    #   * {Types::GetCapacityReservationUsageResult#instance_type #instance_type} => String
+    #   * {Types::GetCapacityReservationUsageResult#total_instance_count #total_instance_count} => Integer
+    #   * {Types::GetCapacityReservationUsageResult#available_instance_count #available_instance_count} => Integer
+    #   * {Types::GetCapacityReservationUsageResult#state #state} => String
+    #   * {Types::GetCapacityReservationUsageResult#instance_usages #instance_usages} => Array<Types::InstanceUsage>
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_capacity_reservation_usage({
+    #     capacity_reservation_id: "String", # required
+    #     next_token: "String",
+    #     max_results: 1,
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.next_token #=> String
+    #   resp.capacity_reservation_id #=> String
+    #   resp.instance_type #=> String
+    #   resp.total_instance_count #=> Integer
+    #   resp.available_instance_count #=> Integer
+    #   resp.state #=> String, one of "active", "expired", "cancelled", "pending", "failed"
+    #   resp.instance_usages #=> Array
+    #   resp.instance_usages[0].account_id #=> String
+    #   resp.instance_usages[0].used_instance_count #=> Integer
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetCapacityReservationUsage AWS API Documentation
+    #
+    # @overload get_capacity_reservation_usage(params = {})
+    # @param [Hash] params ({})
+    def get_capacity_reservation_usage(params = {}, options = {})
+      req = build_request(:get_capacity_reservation_usage, params)
+      req.send_request(options)
+    end
+
     # Gets the console output for the specified instance. For Linux
     # instances, the instance console output displays the exact console
     # output that would normally be displayed on a physical monitor attached
@@ -31929,7 +31986,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.101.0'
+      context[:gem_version] = '1.102.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -762,6 +762,9 @@ module Aws::EC2
     FpgaImageState = Shapes::StructureShape.new(name: 'FpgaImageState')
     FpgaImageStateCode = Shapes::StringShape.new(name: 'FpgaImageStateCode')
     GatewayType = Shapes::StringShape.new(name: 'GatewayType')
+    GetCapacityReservationUsageRequest = Shapes::StructureShape.new(name: 'GetCapacityReservationUsageRequest')
+    GetCapacityReservationUsageRequestMaxResults = Shapes::IntegerShape.new(name: 'GetCapacityReservationUsageRequestMaxResults')
+    GetCapacityReservationUsageResult = Shapes::StructureShape.new(name: 'GetCapacityReservationUsageResult')
     GetConsoleOutputRequest = Shapes::StructureShape.new(name: 'GetConsoleOutputRequest')
     GetConsoleOutputResult = Shapes::StructureShape.new(name: 'GetConsoleOutputResult')
     GetConsoleScreenshotRequest = Shapes::StructureShape.new(name: 'GetConsoleScreenshotRequest')
@@ -903,6 +906,8 @@ module Aws::EC2
     InstanceStatusSummary = Shapes::StructureShape.new(name: 'InstanceStatusSummary')
     InstanceType = Shapes::StringShape.new(name: 'InstanceType')
     InstanceTypeList = Shapes::ListShape.new(name: 'InstanceTypeList')
+    InstanceUsage = Shapes::StructureShape.new(name: 'InstanceUsage')
+    InstanceUsageSet = Shapes::ListShape.new(name: 'InstanceUsageSet')
     Integer = Shapes::IntegerShape.new(name: 'Integer')
     InterfacePermissionType = Shapes::StringShape.new(name: 'InterfacePermissionType')
     InternetGateway = Shapes::StructureShape.new(name: 'InternetGateway')
@@ -2014,6 +2019,9 @@ module Aws::EC2
     CancelledSpotInstanceRequestList.member = Shapes::ShapeRef.new(shape: CancelledSpotInstanceRequest, location_name: "item")
 
     CapacityReservation.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationId"))
+    CapacityReservation.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    CapacityReservation.add_member(:capacity_reservation_arn, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationArn"))
+    CapacityReservation.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     CapacityReservation.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
     CapacityReservation.add_member(:instance_platform, Shapes::ShapeRef.new(shape: CapacityReservationInstancePlatform, location_name: "instancePlatform"))
     CapacityReservation.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -2262,7 +2270,8 @@ module Aws::EC2
     CreateCapacityReservationRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
     CreateCapacityReservationRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "InstanceType"))
     CreateCapacityReservationRequest.add_member(:instance_platform, Shapes::ShapeRef.new(shape: CapacityReservationInstancePlatform, required: true, location_name: "InstancePlatform"))
-    CreateCapacityReservationRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, required: true, location_name: "AvailabilityZone"))
+    CreateCapacityReservationRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZone"))
+    CreateCapacityReservationRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZoneId"))
     CreateCapacityReservationRequest.add_member(:tenancy, Shapes::ShapeRef.new(shape: CapacityReservationTenancy, location_name: "Tenancy"))
     CreateCapacityReservationRequest.add_member(:instance_count, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "InstanceCount"))
     CreateCapacityReservationRequest.add_member(:ebs_optimized, Shapes::ShapeRef.new(shape: Boolean, location_name: "EbsOptimized"))
@@ -4600,6 +4609,21 @@ module Aws::EC2
     FpgaImageState.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     FpgaImageState.struct_class = Types::FpgaImageState
 
+    GetCapacityReservationUsageRequest.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CapacityReservationId"))
+    GetCapacityReservationUsageRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    GetCapacityReservationUsageRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: GetCapacityReservationUsageRequestMaxResults, location_name: "MaxResults"))
+    GetCapacityReservationUsageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetCapacityReservationUsageRequest.struct_class = Types::GetCapacityReservationUsageRequest
+
+    GetCapacityReservationUsageResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetCapacityReservationUsageResult.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationId"))
+    GetCapacityReservationUsageResult.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
+    GetCapacityReservationUsageResult.add_member(:total_instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "totalInstanceCount"))
+    GetCapacityReservationUsageResult.add_member(:available_instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "availableInstanceCount"))
+    GetCapacityReservationUsageResult.add_member(:state, Shapes::ShapeRef.new(shape: CapacityReservationState, location_name: "state"))
+    GetCapacityReservationUsageResult.add_member(:instance_usages, Shapes::ShapeRef.new(shape: InstanceUsageSet, location_name: "instanceUsageSet"))
+    GetCapacityReservationUsageResult.struct_class = Types::GetCapacityReservationUsageResult
+
     GetConsoleOutputRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "InstanceId"))
     GetConsoleOutputRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     GetConsoleOutputRequest.add_member(:latest, Shapes::ShapeRef.new(shape: Boolean, location_name: "Latest"))
@@ -5260,6 +5284,12 @@ module Aws::EC2
 
     InstanceTypeList.member = Shapes::ShapeRef.new(shape: InstanceType)
 
+    InstanceUsage.add_member(:account_id, Shapes::ShapeRef.new(shape: String, location_name: "accountId"))
+    InstanceUsage.add_member(:used_instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "usedInstanceCount"))
+    InstanceUsage.struct_class = Types::InstanceUsage
+
+    InstanceUsageSet.member = Shapes::ShapeRef.new(shape: InstanceUsage, location_name: "item")
+
     InternetGateway.add_member(:attachments, Shapes::ShapeRef.new(shape: InternetGatewayAttachmentList, location_name: "attachmentSet"))
     InternetGateway.add_member(:internet_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "internetGatewayId"))
     InternetGateway.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
@@ -10434,6 +10464,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ExportTransitGatewayRoutesResult)
       end)
 
+      api.add_operation(:get_capacity_reservation_usage, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetCapacityReservationUsage"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetCapacityReservationUsageRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetCapacityReservationUsageResult)
+      end)
+
       api.add_operation(:get_console_output, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetConsoleOutput"
         o.http_method = "POST"

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

@@ -2530,6 +2530,15 @@ module Aws::EC2
     #   The ID of the Capacity Reservation.
     #   @return [String]
     #
+    # @!attribute [rw] owner_id
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_arn
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   @return [String]
+    #
     # @!attribute [rw] instance_type
     #   The type of instance for which the Capacity Reservation reserves
     #   capacity.
@@ -2650,6 +2659,9 @@ module Aws::EC2
     #
     class CapacityReservation < Struct.new(
       :capacity_reservation_id,
+      :owner_id,
+      :capacity_reservation_arn,
+      :availability_zone_id,
       :instance_type,
       :instance_platform,
       :availability_zone,
@@ -3982,7 +3994,8 @@ module Aws::EC2
     #         client_token: "String",
     #         instance_type: "String", # required
     #         instance_platform: "Linux/UNIX", # required, accepts Linux/UNIX, Red Hat Enterprise Linux, SUSE Linux, Windows, Windows with SQL Server, Windows with SQL Server Enterprise, Windows with SQL Server Standard, Windows with SQL Server Web, Linux with SQL Server Standard, Linux with SQL Server Web, Linux with SQL Server Enterprise
-    #         availability_zone: "String", # required
+    #         availability_zone: "String",
+    #         availability_zone_id: "String",
     #         tenancy: "default", # accepts default, dedicated
     #         instance_count: 1, # required
     #         ebs_optimized: false,
@@ -4034,6 +4047,9 @@ module Aws::EC2
     #   The Availability Zone in which to create the Capacity Reservation.
     #   @return [String]
     #
+    # @!attribute [rw] availability_zone_id
+    #   @return [String]
+    #
     # @!attribute [rw] tenancy
     #   Indicates the tenancy of the Capacity Reservation. A Capacity
     #   Reservation can have one of the following tenancy settings:
@@ -4129,6 +4145,7 @@ module Aws::EC2
       :instance_type,
       :instance_platform,
       :availability_zone,
+      :availability_zone_id,
       :tenancy,
       :instance_count,
       :ebs_optimized,
@@ -21062,6 +21079,72 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetCapacityReservationUsageRequest
+    #   data as a hash:
+    #
+    #       {
+    #         capacity_reservation_id: "String", # required
+    #         next_token: "String",
+    #         max_results: 1,
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] capacity_reservation_id
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   @return [Integer]
+    #
+    # @!attribute [rw] dry_run
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetCapacityReservationUsageRequest AWS API Documentation
+    #
+    class GetCapacityReservationUsageRequest < Struct.new(
+      :capacity_reservation_id,
+      :next_token,
+      :max_results,
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] next_token
+    #   @return [String]
+    #
+    # @!attribute [rw] capacity_reservation_id
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_type
+    #   @return [String]
+    #
+    # @!attribute [rw] total_instance_count
+    #   @return [Integer]
+    #
+    # @!attribute [rw] available_instance_count
+    #   @return [Integer]
+    #
+    # @!attribute [rw] state
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_usages
+    #   @return [Array<Types::InstanceUsage>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetCapacityReservationUsageResult AWS API Documentation
+    #
+    class GetCapacityReservationUsageResult < Struct.new(
+      :next_token,
+      :capacity_reservation_id,
+      :instance_type,
+      :total_instance_count,
+      :available_instance_count,
+      :state,
+      :instance_usages)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetConsoleOutputRequest
     #   data as a hash:
     #
@@ -24573,6 +24656,20 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] account_id
+    #   @return [String]
+    #
+    # @!attribute [rw] used_instance_count
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceUsage AWS API Documentation
+    #
+    class InstanceUsage < Struct.new(
+      :account_id,
+      :used_instance_count)
+      include Aws::Structure
+    end
+
     # Describes an internet gateway.
     #
     # @!attribute [rw] attachments

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.101.0
+  version: 1.102.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4