fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/parsers/storage/get_bucket_website.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
 
         # http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETwebsite.html
         class GetBucketWebsite < Fog::Parsers::Base

data/lib/fog/aws/parsers/storage/get_object_tagging.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class GetObjectTagging < Fog::Parsers::Base
+          def reset
+            @in_tag = {}
+            @response = {'ObjectTagging' => {}}
+          end
+
+          def start_element(name, *args)
+            super
+            if name == 'Tag'
+              @in_tag = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Tag'
+              @response['ObjectTagging'].merge!(@in_tag)
+              @in_tag = {}
+            when 'Key'
+              @in_tag[value] = nil
+            when 'Value'
+              @in_tag = {@in_tag.keys.first => value}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/storage/get_request_payment.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class GetRequestPayment < Fog::Parsers::Base
           def end_element(name)
             case name

data/lib/fog/aws/parsers/storage/get_service.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class GetService < Fog::Parsers::Base
           def reset
             @bucket = {}

data/lib/fog/aws/parsers/storage/initiate_multipart_upload.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class InitiateMultipartUpload < Fog::Parsers::Base
           def reset
             @response = {}

data/lib/fog/aws/parsers/storage/list_multipart_uploads.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class ListMultipartUploads < Fog::Parsers::Base
           def reset
             @upload = { 'Initiator' => {}, 'Owner' => {} }

data/lib/fog/aws/parsers/storage/list_parts.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class ListParts < Fog::Parsers::Base
           def reset
             @part = {}

data/lib/fog/aws/parsers/storage/upload_part_copy_object.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class UploadPartCopyObject < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'ETag'
+              @response[name] = value.gsub('"', '')
+            when 'LastModified'
+              @response[name] = Time.parse(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/sts/assume_role_with_web_identity.rb

@@ -2,7 +2,7 @@ module Fog
   module Parsers
     module AWS
       module STS
-        class AssumeRoleWithWithWebIdentity < Fog::Parsers::Base
+        class AssumeRoleWithWebIdentity < Fog::Parsers::Base
           def reset
             @response = {}
           end

data/lib/fog/aws/rds.rb

@@ -51,7 +51,7 @@ module Fog
       request :create_db_subnet_group
       request :describe_db_subnet_groups
       request :delete_db_subnet_group
-      # TODO: :modify_db_subnet_group
+      request :modify_db_subnet_group
 
       request :describe_orderable_db_instance_options
 
@@ -164,7 +164,7 @@ module Fog
           @data = nil
         end
 
-        attr_accessor :region
+        attr_accessor :region, :aws_access_key_id
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]

data/lib/fog/aws/requests/auto_scaling/attach_load_balancer_target_groups.rb

@@ -0,0 +1,58 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Attaches one or more load balancer target groups to the specified Auto Scaling
+        # group.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'TagetGroupARNs'<~Array> - A list of target group arns to use.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_AttachLoadBalancerTargetGroups.html
+        #
+
+        ExpectedOptions[:attach_load_balancer_target_groups] = %w[TargetGroupARNs]
+
+        def attach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          if target_group_arns = options.delete('TargetGroupARNs')
+            options.merge!(AWS.indexed_param('TargetGroupARNs.member.%d', *target_group_arns))
+          end
+
+          request({
+            'Action'               => 'AttachLoadBalancerTargetGroups',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+
+      end
+
+      class Mock
+        def attach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:attach_load_balancer_target_groups]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -72,11 +72,9 @@ module Fog
           end
 
           if tags = options.delete('Tags')
-            tags.each_with_index do |(key, value), i|
-              options["Tags.member.#{i+1}.Key"] = key.to_s # turns symbol into string
-              options["Tags.member.#{i+1}.Value"] = value
-            end
+            options.merge!(AWS.indexed_param("Tags.member.%d", [*tags]))
           end
+
           if termination_policies = options.delete('TerminationPolicies')
             options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
           end
@@ -123,6 +121,7 @@ module Fog
             'PlacementGroup'          => nil,
             'SuspendedProcesses'      => [],
             'Tags'                    => [],
+            'TargetGroupARNs'         => [],
             'TerminationPolicies'     => ['Default'],
             'VPCZoneIdentifier'       => nil
           }.merge!(options)

data/lib/fog/aws/requests/auto_scaling/detach_instances.rb

@@ -13,9 +13,7 @@ module Fog
         #
         #   * AutoScalingGroupName<~String> - The name of the Auto Scaling group``
         #   * 'InstanceIds'<~Array> - The list of Auto Scaling instances to detach.
-        #
-        # * options<~Hash>:
-        # 'shouldDecrementDesiredCapacity'<~Boolean> - decrement the asg capacity or not (it will boot another if an instance id detached)
+        #   * ShouldDecrementDesiredCapacity<~Boolean> - decrement the asg capacity or not (it will boot another if an instance id detached)
         #
         # ==== See Also
         #
@@ -23,6 +21,7 @@ module Fog
 
         ExpectedOptions[:asg_name] = %w[AutoScalingGroupName]
         ExpectedOptions[:instance_ids] = %w[InstanceIds]
+        ExpectedOptions[:should_decrement_desired_capacity] = %w[ShouldDecrementDesiredCapacity]
 
         def detach_instances(auto_scaling_group_name, options = {})
 
@@ -46,7 +45,7 @@ module Fog
 
       class Mock
         def detach_instances(auto_scaling_group_name, options = {})
-          unexpected_options = options.keys - ExpectedOptions[:asg_name] - ExpectedOptions[:instance_ids]
+          unexpected_options = options.keys - ExpectedOptions[:asg_name] - ExpectedOptions[:instance_ids] - ExpectedOptions[:should_decrement_desired_capacity]
 
           unless unexpected_options.empty?
             raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")

data/lib/fog/aws/requests/auto_scaling/detach_load_balancer_target_groups.rb

@@ -0,0 +1,57 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Removes one or more load balancer target groups from the specified
+        # Auto Scaling group.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'TargetGroupARNs'<~Array> - A list of target groups to detach.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_DetachLoadBalancerTargetGroups.html
+        #
+
+        ExpectedOptions[:detach_load_balancer_target_groups] = %w[TargetGroupARNs]
+
+        def detach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          if target_group_arns = options.delete('TargetGroupARNs')
+            options.merge!(AWS.indexed_param('TargetGroupARNs.member.%d', *target_group_arns))
+          end
+
+          request({
+            'Action'               => 'DetachLoadBalancerTargetGroups',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def detach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:detach_load_balancer_target_groups]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/auto_scaling/put_scaling_policy.rb

@@ -23,7 +23,7 @@ module Fog
         #   Auto Scaling group size). A positive increment adds to the current
         #   capacity and a negative value removes from the current capacity.
         # * options<~Hash>:
-        #   * 'CoolDown'<~Integer> - The amount of time, in seconds, after a
+        #   * 'Cooldown'<~Integer> - The amount of time, in seconds, after a
         #     scaling activity completes before any further trigger-related
         #     scaling activities can start
         #

data/lib/fog/aws/requests/auto_scaling/set_instance_protection.rb

@@ -0,0 +1,67 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Sets or removes scale in instance protection from one or more instances from the specified
+        # Auto Scaling group.
+        #
+        #  cli equiv:
+        # `aws autoscaling set-instance-protection --instance-ids i-5f2e8a0d --auto-scaling-group-name my-asg --protected-from-scale-in`
+        #
+        # ==== Parameters
+        #
+        #   * AutoScalingGroupName<~String> - The name of the Auto Scaling group``
+        #   * 'InstanceIds'<~Array> - The list of Auto Scaling instances to set or remove protection on.
+        #   * 'ProtectedFromScaleIn'<~Boolean> - Protection state
+        #
+        # ==== See Also
+        #
+        # https://docs.aws.amazon.com/autoscaling/latest/APIReference/API_SetInstanceProtection.html
+
+        ExpectedOptions[:asg_name] = %w[AutoScalingGroupName]
+        ExpectedOptions[:instance_ids] = %w[InstanceIds]
+        ExpectedOptions[:protected_from_scale_in] = %w[ProtectedFromScaleIn]
+
+        def set_instance_protection(auto_scaling_group_name, options = {})
+          if instance_ids = options.delete('InstanceIds')
+            options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids]))
+          end
+          protected_from_scale_in = options.delete('ProtectedFromScaleIn')
+
+          request({
+            'Action'               => 'SetInstanceProtection',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            'ProtectedFromScaleIn' => protected_from_scale_in,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def set_instance_protection(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - \
+            ExpectedOptions[:asg_name] - \
+            ExpectedOptions[:instance_ids] - \
+            ExpectedOptions[:protected_from_scale_in]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cdn/delete_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         # Delete a distribution from CloudFront.
         #
@@ -26,13 +26,13 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['DistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
             if distribution['DistributionConfig']['Enabled']
-              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+              Fog::AWS::CDN::Mock.error(:distribution_not_disabled)
             end
 
             self.data[:distributions].delete(distribution_id)
@@ -43,7 +43,7 @@ module Fog
             response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/delete_streaming_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         # Delete a streaming distribution from CloudFront.
         #
@@ -26,13 +26,13 @@ module Fog
 
           if distribution
             if distribution['ETag'] != etag
-              Fog::CDN::AWS::Mock.error(:invalid_if_match_version)
+              Fog::AWS::CDN::Mock.error(:invalid_if_match_version)
             end
             unless distribution['StreamingDistributionConfig']['CallerReference']
-              Fog::CDN::AWS::Mock.error(:illegal_update)
+              Fog::AWS::CDN::Mock.error(:illegal_update)
             end
             if distribution['StreamingDistributionConfig']['Enabled']
-              Fog::CDN::AWS::Mock.error(:distribution_not_disabled)
+              Fog::AWS::CDN::Mock.error(:distribution_not_disabled)
             end
 
             self.data[:streaming_distributions].delete(distribution_id)
@@ -42,7 +42,7 @@ module Fog
             response.body = "x-amz-request-id: #{Fog::AWS::Mock.request_id}"
             response
           else
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
         end
       end

data/lib/fog/aws/requests/cdn/get_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/distribution'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::CDN::AWS::Distribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
             :path       => "/distribution/#{distribution_id}"
           })
         end
@@ -54,14 +54,14 @@ module Fog
 
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           if distribution['Status'] == 'InProgress' && (Time.now - Time.parse(distribution['LastModifiedTime']) >= Fog::Mock.delay * 2)
             distribution['Status'] = 'Deployed'
           end
 
-          etag = Fog::CDN::AWS::Mock.generic_id
+          etag = Fog::AWS::CDN::Mock.generic_id
           response.status = 200
           response.body = {
             'InProgressInvalidationBatches' => 0,

data/lib/fog/aws/requests/cdn/get_distribution_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_distribution_list'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetDistributionList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetDistributionList.new,
             :path       => "/distribution",
             :query      => options
           })

data/lib/fog/aws/requests/cdn/get_invalidation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_invalidation'
 
@@ -24,7 +24,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetInvalidation.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetInvalidation.new,
             :path       => "/distribution/#{distribution_id}/invalidation/#{invalidation_id}"
           })
         end
@@ -34,12 +34,12 @@ module Fog
         def get_invalidation(distribution_id, invalidation_id)
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           invalidation = self.data[:invalidations][distribution_id][invalidation_id]
           unless invalidation
-            Fog::CDN::AWS::Mock.error(:no_such_invalidation)
+            Fog::AWS::CDN::Mock.error(:no_such_invalidation)
           end
 
           if invalidation['Status'] == 'InProgress' && (Time.now - Time.parse(invalidation['CreateTime']) >= Fog::Mock.delay * 2)

data/lib/fog/aws/requests/cdn/get_invalidation_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_invalidation_list'
 
@@ -27,7 +27,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetInvalidationList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetInvalidationList.new,
             :path       => "/distribution/#{distribution_id}/invalidation",
             :query      => options
           })
@@ -38,7 +38,7 @@ module Fog
         def get_invalidation_list(distribution_id, options = {})
           distribution = self.data[:distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_distribution)
           end
 
           invalidations = (self.data[:invalidations][distribution_id] || {}).values

data/lib/fog/aws/requests/cdn/get_streaming_distribution.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/streaming_distribution'
 
@@ -35,7 +35,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::CDN::AWS::StreamingDistribution.new,
+            :parser     => Fog::Parsers::AWS::CDN::StreamingDistribution.new,
             :path       => "/streaming-distribution/#{distribution_id}"
           })
         end
@@ -47,14 +47,14 @@ module Fog
 
           distribution = self.data[:streaming_distributions][distribution_id]
           unless distribution
-            Fog::CDN::AWS::Mock.error(:no_such_streaming_distribution)
+            Fog::AWS::CDN::Mock.error(:no_such_streaming_distribution)
           end
 
           if distribution['Status'] == 'InProgress' && (Time.now - Time.parse(distribution['LastModifiedTime']) >= Fog::Mock.delay * 2)
             distribution['Status'] = 'Deployed'
           end
 
-          etag = Fog::CDN::AWS::Mock.generic_id
+          etag = Fog::AWS::CDN::Mock.generic_id
           response.status = 200
           response.body = distribution.reject { |k,v| k == 'ETag' }
 

data/lib/fog/aws/requests/cdn/get_streaming_distribution_list.rb

@@ -1,6 +1,6 @@
 module Fog
-  module CDN
-    class AWS
+  module AWS
+    class CDN
       class Real
         require 'fog/aws/parsers/cdn/get_streaming_distribution_list'
 
@@ -42,7 +42,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::CDN::AWS::GetStreamingDistributionList.new,
+            :parser   => Fog::Parsers::AWS::CDN::GetStreamingDistributionList.new,
             :path       => "/streaming-distribution",
             :query      => options
           })