gapinc-fog 1.12.1.2.1 → 1.14.0

data/lib/fog/aws/parsers/auto_scaling/describe_policies.rb

@@ -20,13 +20,13 @@ module Fog
           def reset_alarm
             @alarm = {}
           end
-          
+
           def start_element(name, attrs = [])
             super
             case name
             when 'Alarms'
-              @in_alarms = true              
-            end            
+              @in_alarms = true
+            end
           end
 
           def end_element(name)
@@ -36,7 +36,7 @@ module Fog
 
             when 'AdjustmentType', 'AutoScalingGroupName', 'PolicyARN', 'PolicyName'
               @scaling_policy[name] = value
-            when 'Cooldown', 'ScalingAdjustment'
+            when 'Cooldown', 'MinAdjustmentStep', 'ScalingAdjustment'
               @scaling_policy[name] = value.to_i
 
             when 'NextToken'
@@ -47,7 +47,7 @@ module Fog
 
             when 'DescribePoliciesResponse'
               @response['DescribePoliciesResult'] = @results
-            
+
             when 'Alarms'
               @in_alarms = false
             when 'member'

data/lib/fog/aws/parsers/elb/describe_load_balancers.rb

@@ -8,21 +8,26 @@ module Fog
           def reset
             reset_load_balancer
             reset_listener_description
-            reset_policy
+            reset_stickiness_policy
+            reset_backend_server_description
             @results = { 'LoadBalancerDescriptions' => [] }
             @response = { 'DescribeLoadBalancersResult' => {}, 'ResponseMetadata' => {} }
           end
 
           def reset_load_balancer
-            @load_balancer = { 'Subnets' => [], 'SecurityGroups' => [], 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [] }, 'HealthCheck' => {}, 'SourceSecurityGroup' => {} }
+            @load_balancer = { 'Subnets' => [], 'SecurityGroups' => [], 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [], 'OtherPolicies' => []}, 'HealthCheck' => {}, 'SourceSecurityGroup' => {}, 'BackendServerDescriptions' => [] }
           end
 
           def reset_listener_description
             @listener_description = { 'PolicyNames' => [], 'Listener' => {} }
           end
 
-          def reset_policy
-            @policy = {}
+          def reset_backend_server_description
+            @backend_server_description = {}
+          end
+
+          def reset_stickiness_policy
+            @stickiness_policy = {}
           end
 
           def start_element(name, attrs = [])
@@ -46,13 +51,19 @@ module Fog
               @in_lb_cookies = true
             when 'AppCookieStickinessPolicies'
               @in_app_cookies = true
+            when 'AppCookieStickinessPolicies'
+              @in_app_cookies = true
+            when 'OtherPolicies'
+              @in_other_policies = true
+            when 'BackendServerDescriptions'
+              @in_backend_server_descriptions = true
             end
           end
 
           def end_element(name)
             case name
             when 'member'
-              if @in_policy_names
+              if @in_policy_names && @in_listeners
                 @listener_description['PolicyNames'] << value
               elsif @in_availability_zones
                 @load_balancer['AvailabilityZones'] << value
@@ -64,16 +75,34 @@ module Fog
                 @load_balancer['ListenerDescriptions'] << @listener_description
                 reset_listener_description
               elsif @in_app_cookies
-                @load_balancer['Policies']['AppCookieStickinessPolicies'] << @policy
-                reset_policy
+                @load_balancer['Policies']['AppCookieStickinessPolicies'] << @stickiness_policy
+                reset_stickiness_policy
               elsif @in_lb_cookies
-                @load_balancer['Policies']['LBCookieStickinessPolicies'] << @policy
-                reset_policy
-              elsif !@in_instances && !@in_policies
+                @load_balancer['Policies']['LBCookieStickinessPolicies'] << @stickiness_policy
+                reset_stickiness_policy
+              elsif @in_other_policies
+                @load_balancer['Policies']['OtherPolicies'] << value
+              elsif @in_backend_server_descriptions && @in_policy_names
+                @backend_server_description['PolicyNames'] ||= []
+                @backend_server_description['PolicyNames'] << value
+              elsif @in_backend_server_descriptions && !@in_policy_names
+                @load_balancer['BackendServerDescriptions'] << @backend_server_description
+                reset_backend_server_description
+              elsif !@in_instances && !@in_policies && !@in_backend_server_descriptions
                 @results['LoadBalancerDescriptions'] << @load_balancer
                 reset_load_balancer
               end
 
+            when 'BackendServerDescriptions'
+              @in_backend_server_descriptions = false
+
+            when 'InstancePort'
+              if @in_backend_server_descriptions
+                @backend_server_description[name] = value.to_i
+              elsif @in_listeners
+                @listener_description['Listener'][name] = value.to_i
+              end
+
             when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme'
               @load_balancer[name] = value
             when 'CreatedTime'
@@ -85,7 +114,7 @@ module Fog
               @in_policy_names = false
             when 'Protocol', 'SSLCertificateId', 'InstanceProtocol'
               @listener_description['Listener'][name] = value
-            when 'LoadBalancerPort', 'InstancePort'
+            when 'LoadBalancerPort'
               @listener_description['Listener'][name] = value.to_i
 
             when 'Instances'
@@ -108,6 +137,8 @@ module Fog
               @in_app_cookies = false
             when 'LBCookieStickinessPolicies'
               @in_lb_cookies = false
+            when 'OtherPolicies'
+              @in_other_policies = false
 
             when 'OwnerAlias', 'GroupName'
               @load_balancer['SourceSecurityGroup'][name] = value
@@ -118,9 +149,9 @@ module Fog
               @load_balancer['HealthCheck'][name] = value
 
             when 'PolicyName', 'CookieName'
-              @policy[name] = value
+              @stickiness_policy[name] = value
             when 'CookieExpirationPeriod'
-              @policy[name] = value.to_i
+              @stickiness_policy[name] = value.to_i
 
             when 'RequestId'
               @response['ResponseMetadata'][name] = value

data/lib/fog/aws/parsers/rds/db_parser.rb

@@ -33,6 +33,11 @@ module Fog
             when 'DBParameterGroups'
               @in_db_parameter_groups = true
               @db_parameter_groups = []
+            when 'VpcSecurityGroupMembership'
+              @vpc_security_group = {}
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = true
+              @vpc_security_groups = []
             end
             
           end
@@ -47,9 +52,9 @@ module Fog
               'DBInstanceStatus', 'DBInstanceIdentifier', 'EngineVersion', 
               'PreferredBackupWindow', 'PreferredMaintenanceWindow', 
               'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel',
-              'DBSubnetGroupName', 'PubliclyAccessible'
+              'DBSubnetGroupName'
               @db_instance[name] = value
-            when 'MultiAZ', 'AutoMinorVersionUpgrade'
+            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible'
               if value == 'false'
                 @db_instance[name] = false
               else
@@ -81,20 +86,37 @@ module Fog
             when 'DBSecurityGroups'
               @in_db_security_groups = false
               @db_instance['DBSecurityGroups'] = @db_security_groups
-            when 'Status', 'DBSecurityGroupName'
-              if @in_db_security_groups
-                @db_security_group[name]=value
-              end
+            when 'DBSecurityGroupName'
+              @db_security_group[name]=value
             when 'DBSecurityGroup'
               @db_security_groups << @db_security_group
               @db_security_group = {}
             
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = false
+              @db_instance['VpcSecurityGroups'] = @vpc_security_groups
+            when 'VpcSecurityGroupMembership'
+              @vpc_security_groups << @vpc_security_group
+              @vpc_security_group = {}
+            when 'VpcSecurityGroupId'
+              @vpc_security_group[name] = value
             when 'AllocatedStorage'
               if @in_pending_modified_values
                 @pending_modified_values[name] = value.to_i
               else
                 @db_instance[name] = value.to_i
               end
+
+            when 'Status'
+              # Unfortunately, status is used in VpcSecurityGroupMemebership and
+              # DBSecurityGroups
+              if @in_db_security_groups
+                @db_security_group[name]=value
+              end
+              if @in_vpc_security_groups
+                @vpc_security_group[name] = value
+              end
+
             when 'Address'
               @endpoint[name] = value
             when 'Port'

data/lib/fog/aws/parsers/rds/describe_db_log_files.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+
+        class DescribeDBLogFiles < Fog::Parsers::Base
+
+          attr_reader :rds_id
+
+          def initialize(rds_id)
+            @rds_id = rds_id
+            super()
+          end
+
+          def reset
+            @response = { 'DescribeDBLogFilesResult' => {'DBLogFiles' => []}, 'ResponseMetadata' => {} }
+            fresh_log_file
+          end
+
+          def fresh_log_file
+            @db_log_file = {'DBInstanceIdentifier' => @rds_id}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'LastWritten' then @db_log_file[name] = Time.at(value.to_i / 1000)
+            when 'LogFileName' then @db_log_file[name] = value
+            when 'Size' then @db_log_file[name] = value.to_i
+            when 'DescribeDBLogFilesDetails'
+              @response['DescribeDBLogFilesResult']['DBLogFiles'] << @db_log_file
+              fresh_log_file
+            when 'Marker' then @response['DescribeDBLogFilesResult'][name] = value
+            when 'RequestId' then @response['ResponseMetadata'][name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb

@@ -0,0 +1,47 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+
+        class DescribeOrderableDBInstanceOptions < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeOrderableDBInstanceOptionsResult' => {'OrderableDBInstanceOptions' => []}, 'ResponseMetadata' => {} }
+            @db_instance_option = {}
+            @db_instance_options = []
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'AvailabilityZones' then @availability_zones = []
+            when 'AvailabilityZone' then @availability_zone = {}
+            end
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'MultiAZCapable', 'ReadReplicaCapable', 'Vpc' then @db_instance_option[name] = to_boolean(value)
+            when 'Engine', 'LicenseModel', 'EngineVersion', 'DBInstanceClass' then @db_instance_option[name] = value
+            when 'AvailabilityZones' then @db_instance_option[name] = @availability_zones
+            when 'AvailabilityZone' then @availability_zones << @availability_zone unless @availability_zone.empty?
+            when 'Name' then @availability_zone[name] = value
+            when 'ProvisionedIopsCapable' then @availability_zone[name] = to_boolean(value)
+            when 'OrderableDBInstanceOption'
+              @db_instance_options << @db_instance_option
+              @db_instance_option = {}
+            when 'OrderableDBInstanceOptions'
+              @response['DescribeOrderableDBInstanceOptionsResult']['OrderableDBInstanceOptions'] = @db_instance_options
+            when 'Marker' then @response['DescribeOrderableDBInstanceOptionsResult'][name] = value
+            when 'RequestId' then @response['ResponseMetadata'][name] = value
+            end
+          end
+
+          def to_boolean(v)
+            (v =~ /\A\s*(true|yes|1|y)\s*$/i) == 0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/download_db_logfile_portion.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+
+        class DownloadDBLogFilePortion < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DownloadDBLogFilePortionResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            key = (name == 'RequestId') ? 'ResponseMetadata' : 'DownloadDBLogFilePortionResult'
+            @response[key][name] = value
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'Bucket', 'ETag', 'Key', 'Location'
+            when 'Bucket', 'ETag', 'Key', 'Location', 'Code', 'Message'
               @response[name] = value
             end
           end

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

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module STS
+
+        class AssumeRole < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'SessionToken', 'SecretAccessKey', 'Expiration', 'AccessKeyId'
+              @response[name] = @value.strip
+            when 'Arn', 'AssumedRoleId'
+              @response[name] = @value.strip
+            when 'PackedPolicySize'
+              @response[name] = @value
+            when 'RequestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -51,11 +51,18 @@ module Fog
       request :describe_db_subnet_groups
       # TODO: :delete_db_subnet_group, :modify_db_subnet_group
 
+      request :describe_orderable_db_instance_options
+
+      request :describe_db_log_files
+      request :download_db_logfile_portion
+
       model_path 'fog/aws/models/rds'
       model       :server
       collection  :servers
+
       model       :snapshot
       collection  :snapshots
+
       model       :parameter_group
       collection  :parameter_groups
 
@@ -68,6 +75,12 @@ module Fog
       model       :subnet_group
       collection  :subnet_groups
 
+      model       :instance_option
+      collection  :instance_options
+
+      model       :log_file
+      collection  :log_files
+
       class Mock
 
         def self.data

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

@@ -111,7 +111,15 @@ module Fog
 
         def describe_auto_scaling_groups(options = {})
           results = { 'AutoScalingGroups' => [] }
-          self.data[:auto_scaling_groups].each do |asg_name, asg_data|
+          asg_set = self.data[:auto_scaling_groups]
+
+          if !options["AutoScalingGroupNames"].nil?
+            asg_set = asg_set.reject do |asg_name, asg_data|
+              ![*options["AutoScalingGroupNames"]].include?(asg_name)
+            end
+          end
+
+          asg_set.each do |asg_name, asg_data|
             results['AutoScalingGroups'] << {
               'AutoScalingGroupName' => asg_name
             }.merge!(asg_data)

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

@@ -76,7 +76,21 @@ module Fog
 
         def describe_policies(options = {})
           results = { 'ScalingPolicies' => [] }
-          self.data[:scaling_policies].each do |asp_name, asp_data|
+          policy_set = self.data[:scaling_policies]
+
+          for opt_key, opt_value in options
+            if opt_key == "PolicyNames" && opt_value != nil && opt_value != ""
+              policy_set = policy_set.reject do |asp_name, asp_data|
+                ![*options["PolicyNames"]].include?(asp_name)
+              end
+            elsif opt_key == "AutoScalingGroupName" && opt_value != nil && opt_value != ""
+              policy_set = policy_set.reject do |asp_name, asp_data|
+                options["AutoScalingGroupName"] != asp_data["AutoScalingGroupName"]
+              end
+            end
+          end
+
+          policy_set.each do |asp_name, asp_data|
             results['ScalingPolicies'] << {
               'PolicyName' => asp_name
             }.merge!(asp_data)