aws-sdk-ec2 1.431.0 → 1.522.0

data/lib/aws-sdk-ec2/customizations/instance.rb

@@ -15,10 +15,27 @@ module Aws
         private_key.private_decrypt(decoded)
       end
 
+      class Collection < Aws::Resources::Collection
+          extend Aws::Deprecations
+
+        {
+          create_tags: :batch_create_tags,
+          monitor: :batch_create_tags,
+          reboot: :batch_reboot,
+          start: :batch_start,
+          stop: :batch_stop,
+          terminate: :batch_terminate!,
+          unmonitor: :batch_unmonitor
+        }.each do |old_method, new_method|
+          alias_method old_method, new_method
+          deprecated old_method, use: new_method
+        end
+      end
+
       private
 
       def encrypted_password
-        bytes = Aws::Plugins::UserAgent.feature('resource') do
+        bytes = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           client.get_password_data(instance_id: id).password_data
         end
         if bytes == ''

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

@@ -2,10 +2,53 @@
 
 module Aws
   module EC2
-    class Resource
 
+    # 5 of EC2's old APIs DescribeInstances, DescribeImages, DescribeSnapshots, DescribeVolumes and DescribeTag
+    # support paginated calls and will not paginate server side unless max_results is set to a non-nil value.
+    # This module customizes the resource association methods by adding a default value of 1000 to max_results
+    # to ensure results are paginated.
+    module ResourcePaginationFix
+      def images(options = {})
+        # Prevent the error:
+        # The parameter imageIdsSet cannot be used with the parameter maxResults
+        if options[:image_ids].nil? || options[:image_ids].empty?
+          options[:max_results] ||= 1000
+        end
+        super(options)
+      end
+
+      def instances(options = {})
+        # Prevent the error:
+        # The parameter instancesSet cannot be used with the parameter maxResults
+        if options[:instance_ids].nil? || options[:instance_ids].empty?
+          options[:max_results] ||= 1000
+        end
+        super(options)
+      end
+
+      def snapshots(options = {})
+        # Prevent the error:
+        # The parameter snapshotSet cannot be used with the parameter maxResults
+        if options[:snapshot_ids].nil? || options[:snapshot_ids].empty?
+          options[:max_results] ||= 1000
+        end
+        super(options)
+      end
+
+      def volumes(options = {})
+        # Prevent the error:
+        # The parameter volumeIdsSet cannot be used with the parameter maxResults
+        if options[:volume_ids].nil? || options[:volume_ids].empty?
+          options[:max_results] ||= 1000
+        end
+        super(options)
+      end
+    end
+
+    class Resource
+      prepend ResourcePaginationFix
       def create_tags(options)
-        resp = Aws::Plugins::UserAgent.feature('resource') do
+        resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
           @client.create_tags(options)
         end
         tags = []
@@ -16,7 +59,7 @@ module Aws
         end
         Tag::Collection.new([tags], size: tags.size)
       end
-
     end
+
   end
 end

data/lib/aws-sdk-ec2/customizations/tag.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Aws
+  module EC2
+    class Tag
+      class Collection < Aws::Resources::Collection
+        alias_method :delete, :batch_delete!
+        extend Aws::Deprecations
+        deprecated :delete, use: :batch_delete!
+      end
+    end
+  end
+end

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

@@ -1,23 +1 @@
 # frozen_string_literal: true
-
-# customizations to generated classes
-require 'aws-sdk-ec2/customizations/resource'
-require 'aws-sdk-ec2/customizations/instance'
-
-Aws::EC2::Instance::Collection.extend Aws::Deprecations
-{
-  create_tags: :batch_create_tags,
-  monitor: :batch_create_tags,
-  reboot: :batch_reboot,
-  start: :batch_start,
-  stop: :batch_stop,
-  terminate: :batch_terminate!,
-  unmonitor: :batch_unmonitor,
-}.each do |old, new|
-  Aws::EC2::Instance::Collection.send(:alias_method, old, new)
-  Aws::EC2::Instance::Collection.send(:deprecated, old, use: new)
-end
-
-Aws::EC2::Tag::Collection.send(:alias_method, :delete, :batch_delete!)
-Aws::EC2::Tag::Collection.extend Aws::Deprecations
-Aws::EC2::Tag::Collection.send(:deprecated, :delete, use: :batch_delete!)

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

@@ -35,12 +35,6 @@ module Aws::EC2
     end
     alias :dhcp_options_id :id
 
-    # The DHCP options in the set.
-    # @return [Array<Types::DhcpConfiguration>]
-    def dhcp_configurations
-      data[:dhcp_configurations]
-    end
-
     # The ID of the Amazon Web Services account that owns the DHCP options
     # set.
     # @return [String]
@@ -54,6 +48,12 @@ module Aws::EC2
       data[:tags]
     end
 
+    # The DHCP options in the set.
+    # @return [Array<Types::DhcpConfiguration>]
+    def dhcp_configurations
+      data[:dhcp_configurations]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -68,7 +68,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_dhcp_options(dhcp_options_ids: [@id])
       end
       @data = resp.dhcp_options[0]
@@ -185,7 +185,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
@@ -209,7 +209,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def associate_with_vpc(options = {})
       options = options.merge(dhcp_options_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.associate_dhcp_options(options)
       end
       resp.data
@@ -240,7 +240,7 @@ module Aws::EC2
     def create_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.create_tags(options)
       end
       options[:tags].each do |t|
@@ -287,7 +287,7 @@ module Aws::EC2
     def delete_tags(options = {})
       batch = []
       options = Aws::Util.deep_merge(options, resources: [@id])
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_tags(options)
       end
       options[:tags].each do |t|
@@ -315,7 +315,7 @@ module Aws::EC2
     # @return [EmptyStructure]
     def delete(options = {})
       options = options.merge(dhcp_options_id: @id)
-      resp = Aws::Plugins::UserAgent.feature('resource') do
+      resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do
         @client.delete_dhcp_options(options)
       end
       resp.data

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

@@ -52,15 +52,18 @@ module Aws::EC2
       self[:region] = options[:region]
       self[:use_dual_stack] = options[:use_dual_stack]
       self[:use_dual_stack] = false if self[:use_dual_stack].nil?
-      if self[:use_dual_stack].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :use_dual_stack"
-      end
       self[:use_fips] = options[:use_fips]
       self[:use_fips] = false if self[:use_fips].nil?
-      if self[:use_fips].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :use_fips"
-      end
       self[:endpoint] = options[:endpoint]
     end
+
+    def self.create(config, options={})
+      new({
+        region: config.region,
+        use_dual_stack: config.use_dualstack_endpoint,
+        use_fips: config.use_fips_endpoint,
+        endpoint: (config.endpoint.to_s unless config.regional_endpoint),
+      }.merge(options))
+    end
   end
 end

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

@@ -10,43 +10,39 @@
 module Aws::EC2
   class EndpointProvider
     def resolve_endpoint(parameters)
-      region = parameters.region
-      use_dual_stack = parameters.use_dual_stack
-      use_fips = parameters.use_fips
-      endpoint = parameters.endpoint
-      if Aws::Endpoints::Matchers.set?(endpoint)
-        if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
+      if Aws::Endpoints::Matchers.set?(parameters.endpoint)
+        if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
           raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
         end
-        if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+        if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
           raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
         end
-        return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
+        return Aws::Endpoints::Endpoint.new(url: parameters.endpoint, headers: {}, properties: {})
       end
-      if Aws::Endpoints::Matchers.set?(region)
-        if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
-          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+      if Aws::Endpoints::Matchers.set?(parameters.region)
+        if (partition_result = Aws::Endpoints::Matchers.aws_partition(parameters.region))
+          if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
             if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-              return Aws::Endpoints::Endpoint.new(url: "https://ec2-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+              return Aws::Endpoints::Endpoint.new(url: "https://ec2-fips.#{parameters.region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
             end
             raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
           end
-          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
+          if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_fips, true)
             if Aws::Endpoints::Matchers.boolean_equals?(Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"), true)
               if Aws::Endpoints::Matchers.string_equals?(Aws::Endpoints::Matchers.attr(partition_result, "name"), "aws-us-gov")
-                return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{region}.amazonaws.com", headers: {}, properties: {})
+                return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{parameters.region}.amazonaws.com", headers: {}, properties: {})
               end
-              return Aws::Endpoints::Endpoint.new(url: "https://ec2-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
+              return Aws::Endpoints::Endpoint.new(url: "https://ec2-fips.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
             end
             raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
           end
-          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+          if Aws::Endpoints::Matchers.boolean_equals?(parameters.use_dual_stack, true)
             if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-              return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+              return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{parameters.region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
             end
             raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
           end
-          return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
+          return Aws::Endpoints::Endpoint.new(url: "https://ec2.#{parameters.region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
         end
       end
       raise ArgumentError, "Invalid Configuration: Missing Region"