aws-sdk-ec2 1.5.0 → 1.6.0

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

@@ -41,49 +41,49 @@ module Aws::EC2
     # The IPv6 CIDR block used for the destination match.
     # @return [String]
     def destination_ipv_6_cidr_block
-      data.destination_ipv_6_cidr_block
+      data[:destination_ipv_6_cidr_block]
     end
 
     # The prefix of the AWS service.
     # @return [String]
     def destination_prefix_list_id
-      data.destination_prefix_list_id
+      data[:destination_prefix_list_id]
     end
 
     # The ID of the egress-only Internet gateway.
     # @return [String]
     def egress_only_internet_gateway_id
-      data.egress_only_internet_gateway_id
+      data[:egress_only_internet_gateway_id]
     end
 
     # The ID of a gateway attached to your VPC.
     # @return [String]
     def gateway_id
-      data.gateway_id
+      data[:gateway_id]
     end
 
     # The ID of a NAT instance in your VPC.
     # @return [String]
     def instance_id
-      data.instance_id
+      data[:instance_id]
     end
 
     # The AWS account ID of the owner of the instance.
     # @return [String]
     def instance_owner_id
-      data.instance_owner_id
+      data[:instance_owner_id]
     end
 
     # The ID of a NAT gateway.
     # @return [String]
     def nat_gateway_id
-      data.nat_gateway_id
+      data[:nat_gateway_id]
     end
 
     # The ID of the network interface.
     # @return [String]
     def network_interface_id
-      data.network_interface_id
+      data[:network_interface_id]
     end
 
     # Describes how the route was created.
@@ -97,7 +97,7 @@ module Aws::EC2
     #   propagation.
     # @return [String]
     def origin
-      data.origin
+      data[:origin]
     end
 
     # The state of the route. The `blackhole` state indicates that the
@@ -106,13 +106,13 @@ module Aws::EC2
     # terminated).
     # @return [String]
     def state
-      data.state
+      data[:state]
     end
 
     # The ID of the VPC peering connection.
     # @return [String]
     def vpc_peering_connection_id
-      data.vpc_peering_connection_id
+      data[:vpc_peering_connection_id]
     end
 
     # @!endgroup
@@ -145,6 +145,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

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

@@ -34,19 +34,19 @@ module Aws::EC2
     # Any virtual private gateway (VGW) propagating routes.
     # @return [Array<Types::PropagatingVgw>]
     def propagating_vgws
-      data.propagating_vgws
+      data[:propagating_vgws]
     end
 
     # Any tags assigned to the route table.
     # @return [Array<Types::Tag>]
     def tags
-      data.tags
+      data[:tags]
     end
 
     # The ID of the VPC.
     # @return [String]
     def vpc_id
-      data.vpc_id
+      data[:vpc_id]
     end
 
     # @!endgroup
@@ -84,6 +84,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
@@ -221,10 +316,10 @@ module Aws::EC2
     # @return [RouteTableAssociation::Collection]
     def associations
       batch = []
-      data.associations.each do |a|
+      data[:associations].each do |d|
         batch << RouteTableAssociation.new(
-          id: a.route_table_association_id,
-          data: a,
+          id: d[:route_table_association_id],
+          data: d,
           client: @client
         )
       end
@@ -234,11 +329,11 @@ module Aws::EC2
     # @return [Route::Collection]
     def routes
       batch = []
-      data.routes.each do |r|
+      data[:routes].each do |d|
         batch << Route.new(
           route_table_id: @id,
-          destination_cidr_block: r.destination_cidr_block,
-          data: r,
+          destination_cidr_block: d[:destination_cidr_block],
+          data: d,
           client: @client
         )
       end
@@ -247,9 +342,9 @@ module Aws::EC2
 
     # @return [Vpc, nil]
     def vpc
-      if data.vpc_id
+      if data[:vpc_id]
         Vpc.new(
-          id: data.vpc_id,
+          id: data[:vpc_id],
           client: @client
         )
       else

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

@@ -34,20 +34,20 @@ module Aws::EC2
     # Indicates whether this is the main route table.
     # @return [Boolean]
     def main
-      data.main
+      data[:main]
     end
 
     # The ID of the route table.
     # @return [String]
     def route_table_id
-      data.route_table_id
+      data[:route_table_id]
     end
 
     # The ID of the subnet. A subnet ID is not returned for an implicit
     # association.
     # @return [String]
     def subnet_id
-      data.subnet_id
+      data[:subnet_id]
     end
 
     # @!endgroup
@@ -80,6 +80,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
@@ -128,9 +223,9 @@ module Aws::EC2
 
     # @return [RouteTable, nil]
     def route_table
-      if data.route_table_id
+      if data[:route_table_id]
         RouteTable.new(
-          id: data.route_table_id,
+          id: data[:route_table_id],
           client: @client
         )
       else
@@ -140,9 +235,9 @@ module Aws::EC2
 
     # @return [Subnet, nil]
     def subnet
-      if data.subnet_id
+      if data[:subnet_id]
         Subnet.new(
-          id: data.subnet_id,
+          id: data[:subnet_id],
           client: @client
         )
       else