aws-sdk-ec2 1.5.0 → 1.6.0

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

@@ -33,45 +33,45 @@ module Aws::EC2
     # The ID of the instance that the address is associated with (if any).
     # @return [String]
     def instance_id
-      data.instance_id
+      data[:instance_id]
     end
 
     # The Elastic IP address.
     # @return [String]
     def public_ip
-      data.public_ip
+      data[:public_ip]
     end
 
     # The ID representing the association of the address with an instance in
     # a VPC.
     # @return [String]
     def association_id
-      data.association_id
+      data[:association_id]
     end
 
     # Indicates whether this Elastic IP address is for use with instances in
     # EC2-Classic (`standard`) or instances in a VPC (`vpc`).
     # @return [String]
     def domain
-      data.domain
+      data[:domain]
     end
 
     # The ID of the network interface.
     # @return [String]
     def network_interface_id
-      data.network_interface_id
+      data[:network_interface_id]
     end
 
     # The ID of the AWS account that owns the network interface.
     # @return [String]
     def network_interface_owner_id
-      data.network_interface_owner_id
+      data[:network_interface_owner_id]
     end
 
     # The private IP address associated with the Elastic IP address.
     # @return [String]
     def private_ip_address
-      data.private_ip_address
+      data[:private_ip_address]
     end
 
     # @!endgroup
@@ -109,6 +109,101 @@ module Aws::EC2
       !!@data
     end
 
+    # @deprecated Use [Aws::EC2::Client] #wait_until instead
+    #
+    # Waiter polls an API operation until a resource enters a desired
+    # state.
+    #
+    # @note The waiting operation is performed on a copy. The original resource remains unchanged
+    #
+    # ## Basic Usage
+    #
+    # Waiter will polls until it is successful, it fails by
+    # entering a terminal state, or until a maximum number of attempts
+    # are made.
+    #
+    #     # polls in a loop until condition is true
+    #     resource.wait_until(options) {|resource| condition}
+    #
+    # ## Example
+    #
+    #     instance.wait_until(max_attempts:10, delay:5) {|instance| instance.state.name == 'running' }
+    #
+    # ## Configuration
+    #
+    # You can configure the maximum number of polling attempts, and the
+    # delay (in seconds) between each polling attempt. The waiting condition is set
+    # by passing a block to {#wait_until}:
+    #
+    #     # poll for ~25 seconds
+    #     resource.wait_until(max_attempts:5,delay:5) {|resource|...}
+    #
+    # ## Callbacks
+    #
+    # You can be notified before each polling attempt and before each
+    # delay. If you throw `:success` or `:failure` from these callbacks,
+    # it will terminate the waiter.
+    #
+    #     started_at = Time.now
+    #     # poll for 1 hour, instead of a number of attempts
+    #     proc = Proc.new do |attempts, response|
+    #       throw :failure if Time.now - started_at > 3600
+    #     end
+    #
+    #       # disable max attempts
+    #     instance.wait_until(before_wait:proc, max_attempts:nil) {...}
+    #
+    # ## Handling Errors
+    #
+    # When a waiter is successful, it returns the Resource. When a waiter
+    # fails, it raises an error.
+    #
+    #     begin
+    #       resource.wait_until(...)
+    #     rescue Aws::Waiters::Errors::WaiterFailed
+    #       # resource did not enter the desired state in time
+    #     end
+    #
+    #
+    # @yield param [Resource] resource to be used in the waiting condition
+    #
+    # @raise [Aws::Waiters::Errors::FailureStateError] Raised when the waiter terminates
+    #   because the waiter has entered a state that it will not transition
+    #   out of, preventing success.
+    #
+    #   yet successful.
+    #
+    # @raise [Aws::Waiters::Errors::UnexpectedError] Raised when an error is encountered
+    #   while polling for a resource that is not expected.
+    #
+    # @raise [NotImplementedError] Raised when the resource does not
+    #
+    # @option options [Integer] :max_attempts (10) Maximum number of
+    # attempts
+    # @option options [Integer] :delay (10) Delay between each
+    # attempt in seconds
+    # @option options [Proc] :before_attempt (nil) Callback
+    # invoked before each attempt
+    # @option options [Proc] :before_wait (nil) Callback
+    # invoked before each wait
+    # @return [Resource] if the waiter was successful
+    def wait_until(options = {}, &block)
+      self_copy = self.dup
+      attempts = 0
+      options[:max_attempts] = 10 unless options.key?(:max_attempts)
+      options[:delay] ||= 10
+      options[:poller] = Proc.new do
+        attempts += 1
+        if block.call(self_copy)
+          [:success, self_copy]
+        else
+          self_copy.reload unless attempts == options[:max_attempts]
+          :retry
+        end
+      end
+      Aws::Waiters::Waiter.new(options).wait({})
+    end
+
     # @!group Actions
 
     # @example Request syntax with placeholder values
@@ -173,7 +268,7 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @return [EmptyStructure]
     def release(options = {})
-      options = options.merge(allocation_id: data.allocation_id)
+      options = options.merge(allocation_id: data[:allocation_id])
       resp = @client.release_address(options)
       resp.data
     end
@@ -182,9 +277,9 @@ module Aws::EC2
 
     # @return [NetworkInterfaceAssociation, nil]
     def association
-      if data.association_id
+      if data[:association_id]
         NetworkInterfaceAssociation.new(
-          id: data.association_id,
+          id: data[:association_id],
           client: @client
         )
       else

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

@@ -35,32 +35,32 @@ module Aws::EC2
     # returned when describing an active VPC peering connection.
     # @return [Types::VpcPeeringConnectionVpcInfo]
     def accepter_vpc_info
-      data.accepter_vpc_info
+      data[:accepter_vpc_info]
     end
 
     # The time that an unaccepted VPC peering connection will expire.
     # @return [Time]
     def expiration_time
-      data.expiration_time
+      data[:expiration_time]
     end
 
     # Information about the requester VPC. CIDR block information is only
     # returned when describing an active VPC peering connection.
     # @return [Types::VpcPeeringConnectionVpcInfo]
     def requester_vpc_info
-      data.requester_vpc_info
+      data[:requester_vpc_info]
     end
 
     # The status of the VPC peering connection.
     # @return [Types::VpcPeeringConnectionStateReason]
     def status
-      data.status
+      data[:status]
     end
 
     # Any tags assigned to the resource.
     # @return [Array<Types::Tag>]
     def tags
-      data.tags
+      data[:tags]
     end
 
     # @!endgroup
@@ -130,6 +130,101 @@ module Aws::EC2
       })
     end
 
+    # @deprecated Use [Aws::EC2::Client] #wait_until instead
+    #
+    # Waiter polls an API operation until a resource enters a desired
+    # state.
+    #
+    # @note The waiting operation is performed on a copy. The original resource remains unchanged
+    #
+    # ## Basic Usage
+    #
+    # Waiter will polls until it is successful, it fails by
+    # entering a terminal state, or until a maximum number of attempts
+    # are made.
+    #
+    #     # polls in a loop until condition is true
+    #     resource.wait_until(options) {|resource| condition}
+    #
+    # ## Example
+    #
+    #     instance.wait_until(max_attempts:10, delay:5) {|instance| instance.state.name == 'running' }
+    #
+    # ## Configuration
+    #
+    # You can configure the maximum number of polling attempts, and the
+    # delay (in seconds) between each polling attempt. The waiting condition is set
+    # by passing a block to {#wait_until}:
+    #
+    #     # poll for ~25 seconds
+    #     resource.wait_until(max_attempts:5,delay:5) {|resource|...}
+    #
+    # ## Callbacks
+    #
+    # You can be notified before each polling attempt and before each
+    # delay. If you throw `:success` or `:failure` from these callbacks,
+    # it will terminate the waiter.
+    #
+    #     started_at = Time.now
+    #     # poll for 1 hour, instead of a number of attempts
+    #     proc = Proc.new do |attempts, response|
+    #       throw :failure if Time.now - started_at > 3600
+    #     end
+    #
+    #       # disable max attempts
+    #     instance.wait_until(before_wait:proc, max_attempts:nil) {...}
+    #
+    # ## Handling Errors
+    #
+    # When a waiter is successful, it returns the Resource. When a waiter
+    # fails, it raises an error.
+    #
+    #     begin
+    #       resource.wait_until(...)
+    #     rescue Aws::Waiters::Errors::WaiterFailed
+    #       # resource did not enter the desired state in time
+    #     end
+    #
+    #
+    # @yield param [Resource] resource to be used in the waiting condition
+    #
+    # @raise [Aws::Waiters::Errors::FailureStateError] Raised when the waiter terminates
+    #   because the waiter has entered a state that it will not transition
+    #   out of, preventing success.
+    #
+    #   yet successful.
+    #
+    # @raise [Aws::Waiters::Errors::UnexpectedError] Raised when an error is encountered
+    #   while polling for a resource that is not expected.
+    #
+    # @raise [NotImplementedError] Raised when the resource does not
+    #
+    # @option options [Integer] :max_attempts (10) Maximum number of
+    # attempts
+    # @option options [Integer] :delay (10) Delay between each
+    # attempt in seconds
+    # @option options [Proc] :before_attempt (nil) Callback
+    # invoked before each attempt
+    # @option options [Proc] :before_wait (nil) Callback
+    # invoked before each wait
+    # @return [Resource] if the waiter was successful
+    def wait_until(options = {}, &block)
+      self_copy = self.dup
+      attempts = 0
+      options[:max_attempts] = 10 unless options.key?(:max_attempts)
+      options[:delay] ||= 10
+      options[:poller] = Proc.new do
+        attempts += 1
+        if block.call(self_copy)
+          [:success, self_copy]
+        else
+          self_copy.reload unless attempts == options[:max_attempts]
+          :retry
+        end
+      end
+      Aws::Waiters::Waiter.new(options).wait({})
+    end
+
     # @!group Actions
 
     # @example Request syntax with placeholder values
@@ -190,9 +285,9 @@ module Aws::EC2
 
     # @return [Vpc, nil]
     def accepter_vpc
-      if data.accepter_vpc_info.vpc_id
+      if data[:accepter_vpc_info][:vpc_id]
         Vpc.new(
-          id: data.accepter_vpc_info.vpc_id,
+          id: data[:accepter_vpc_info][:vpc_id],
           client: @client
         )
       else
@@ -202,9 +297,9 @@ module Aws::EC2
 
     # @return [Vpc, nil]
     def requester_vpc
-      if data.requester_vpc_info.vpc_id
+      if data[:requester_vpc_info][:vpc_id]
         Vpc.new(
-          id: data.requester_vpc_info.vpc_id,
+          id: data[:requester_vpc_info][:vpc_id],
           client: @client
         )
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4