aws-sdk-ec2 1.402.0 → 1.547.0

data/VERSION

@@ -1 +1 @@
-1.402.0
+1.547.0

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

@@ -34,12 +34,6 @@ module Aws::EC2
       @public_ip
     end
 
-    # The ID of the instance that the address is associated with (if any).
-    # @return [String]
-    def instance_id
-      data[:instance_id]
-    end
-
     # The ID representing the allocation of the address.
     # @return [String]
     def allocation_id
@@ -117,6 +111,28 @@ module Aws::EC2
       data[:carrier_ip]
     end
 
+    # The ID of the subnet where the IP address is allocated.
+    # @return [String]
+    def subnet_id
+      data[:subnet_id]
+    end
+
+    # The service that manages the elastic IP address.
+    #
+    # <note markdown="1"> The only option supported today is `alb`.
+    #
+    #  </note>
+    # @return [String]
+    def service_managed
+      data[:service_managed]
+    end
+
+    # The ID of the instance that the address is associated with (if any).
+    # @return [String]
+    def instance_id
+      data[:instance_id]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -131,7 +147,7 @@ module Aws::EC2
     #
     # @return [self]
     def load
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.describe_addresses(public_ips: [@public_ip])
       end
       @data = resp.addresses[0]
@@ -248,7 +264,7 @@ module Aws::EC2
           :retry
         end
       end
-      Aws::Plugins::UserAgent.feature('resource') do
+      Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         Aws::Waiters::Waiter.new(options).wait({})
       end
     end
@@ -260,10 +276,10 @@ module Aws::EC2
     #   classic_address.associate({
     #     allocation_id: "AllocationId",
     #     instance_id: "InstanceId",
-    #     allow_reassociation: false,
     #     dry_run: false,
     #     network_interface_id: "NetworkInterfaceId",
     #     private_ip_address: "String",
+    #     allow_reassociation: false,
     #   })
     # @param [Hash] options ({})
     # @option options [String] :allocation_id
@@ -272,10 +288,6 @@ module Aws::EC2
     #   The ID of the instance. The instance must have exactly one attached
     #   network interface. You can specify either the instance ID or the
     #   network interface ID, but not both.
-    # @option options [Boolean] :allow_reassociation
-    #   Reassociation is automatic, but you can specify false to ensure the
-    #   operation fails if the Elastic IP address is already associated with
-    #   another resource.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -291,10 +303,14 @@ module Aws::EC2
     #   The primary or secondary private IP address to associate with the
     #   Elastic IP address. If no private IP address is specified, the Elastic
     #   IP address is associated with the primary private IP address.
+    # @option options [Boolean] :allow_reassociation
+    #   Reassociation is automatic, but you can specify false to ensure the
+    #   operation fails if the Elastic IP address is already associated with
+    #   another resource.
     # @return [Types::AssociateAddressResult]
     def associate(options = {})
       options = options.merge(public_ip: @public_ip)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.associate_address(options)
       end
       resp.data
@@ -317,7 +333,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def disassociate(options = {})
       options = options.merge(public_ip: data[:public_ip])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.disassociate_address(options)
       end
       resp.data
@@ -339,10 +355,6 @@ module Aws::EC2
     #
     #   If you provide an incorrect network border group, you receive an
     #   `InvalidAddress.NotFound` error.
-    #
-    #   You cannot use a network border group with EC2 Classic. If you attempt
-    #   this operation on EC2 classic, you receive an
-    #   `InvalidParameterCombination` error.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -351,7 +363,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def release(options = {})
       options = options.merge(public_ip: data[:public_ip])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.release_address(options)
       end
       resp.data