fog-aws 1.4.1 → 3.27.0

data/lib/fog/aws/parsers/dns/get_hosted_zone.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class GetHostedZone < Fog::Parsers::Base
           def reset
             @hosted_zone = {}
@@ -17,14 +17,14 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name]= value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config', 'ResourceRecordSetCount'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config'
                 @hosted_zone[name]= value
+              when 'ResourceRecordSetCount'
+                @hosted_zone['ResourceRecordSetCount'] = value.to_i
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
                 @section = :name_servers
-              when 'ResourceRecordSetCount'
-                @response['ResourceRecordSetCount'] = value.to_i
               end
             elsif @section == :name_servers
               case name

data/lib/fog/aws/parsers/dns/health_check.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class HealthCheck < Fog::Parsers::Base
           def reset
             @health_check = {}

data/lib/fog/aws/parsers/dns/list_health_checks.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class ListHealthChecks < Fog::Parsers::Base
           def reset
             @health_checks = []

data/lib/fog/aws/parsers/dns/list_hosted_zones.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class ListHostedZones < Fog::Parsers::Base
           def reset
             @hosted_zones = []
@@ -13,8 +13,10 @@ module Fog
             case name
             when 'Id'
               @zone[name] = value.sub('/hostedzone/', '')
-            when 'Name', 'CallerReference', 'Comment'
+            when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
               @zone[name] = value
+            when 'ResourceRecordSetCount'
+              @zone['ResourceRecordSetCount'] = value.to_i
             when 'HostedZone'
               @hosted_zones << @zone
               @zone = {}

data/lib/fog/aws/parsers/dns/list_resource_record_sets.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class ListResourceRecordSets < Fog::Parsers::Base
           def reset
             @resource_record = []

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

@@ -101,7 +101,8 @@ module Fog
                 @listener_description['Listener'][name] = value.to_i
               end
 
-            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme'
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type', 'State',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId'
               @load_balancer[name] = value
             when 'CreatedTime'
               @load_balancer[name] = Time.parse(value)
@@ -119,9 +120,8 @@ module Fog
               @in_instances = false
             when 'InstanceId'
               @load_balancer['Instances'] << value
-            when 'VPCId'
+            when 'VPCId', 'VpcId'
               @load_balancer[name] = value
-
             when 'AvailabilityZones'
               @in_availability_zones = false
             when 'SecurityGroups'

data/lib/fog/aws/parsers/elbv2/create_load_balancer.rb

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class CreateLoadBalancer < Fog::Parsers::Base
+          def reset
+            reset_load_balancer
+            reset_availability_zone
+            @load_balancer_addresses = {}
+            @state = {}
+            @results = { 'LoadBalancers' => [] }
+            @response = { 'CreateLoadBalancerResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_load_balancer
+            @load_balancer = { 'SecurityGroups' => [], 'AvailabilityZones' => [] }
+          end
+
+          def reset_availability_zone
+            @availability_zone = { 'LoadBalancerAddresses' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = true
+            when 'SecurityGroups'
+              @in_security_groups = true
+            when 'State'
+              @in_state = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_availability_zones && @in_load_balancer_addresses
+                @availability_zone['LoadBalancerAddresses'] << @load_balancer_addresses
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @availability_zone
+                reset_availability_zone
+              elsif @in_security_groups
+                @load_balancer['SecurityGroups'] << value
+              else
+                @results['LoadBalancers'] << @load_balancer
+                reset_load_balancer
+              end
+            when 'SubnetId', 'ZoneName'
+              @availability_zone[name] = value
+            when 'IpAddress', 'AllocationId'
+              @load_balancer_addresses[name] = value
+
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId', 'VpcId'
+              @load_balancer[name] = value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(value)
+
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = false
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+            when 'SecurityGroups'
+              @in_security_groups = false
+            when 'State'
+              @in_state = false
+              @load_balancer[name] = @state
+              @state = {}
+            when 'Code'
+              @state[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'NextMarker'
+              @results['NextMarker'] = value
+            when 'CreateLoadBalancerResponse'
+              @response['CreateLoadBalancerResult'] = @results
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/describe_listeners.rb

@@ -0,0 +1,110 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeListeners < Fog::Parsers::Base
+          def reset
+            reset_listener
+            @default_action = {}
+            @certificate = {}
+            @config = {}
+            @target_groups = []
+            @target_group = {}
+            @target_group_stickiness_config = {}
+            @results = { 'Listeners' => [] }
+            @response = { 'DescribeListenersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_listener
+            @listener= { 'DefaultActions' => [], 'Certificates' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'DefaultActions'
+              @in_default_actions = true
+            when 'Certificates'
+              @in_certificates = true
+            when 'TargetGroups'
+              @in_target_groups = true
+            when 'TargetGroupStickinessConfig'
+              @in_target_group_stickiness_config = true
+            end
+          end
+
+          def end_element(name)
+            if @in_default_actions
+              case name
+              when 'member'
+                if @in_target_groups
+                  @target_groups << @target_group
+                  @target_group = {}
+                else
+                  @listener['DefaultActions'] << @default_action
+                  @default_action = {}
+                end
+              when 'TargetGroupArn'
+                if @in_target_groups
+                  @target_group[name] = value
+                else
+                  @default_action[name] = value
+                end
+              when 'Weight'
+                @target_group[name] = value
+              when 'Type', 'Order'
+                @default_action[name] = value
+              when 'Path', 'Protocol', 'Port', 'Query', 'Host', 'StatusCode', 'ContentType',
+                   'MessageBody', 'StatusCode'
+                @config[name] = value
+              when 'RedirectConfig', 'ForwardConfig', 'FixedResponseConfig'
+                @default_action[name] = @config
+                @config = {}
+              when 'DurationSeconds', 'Enabled'
+                @target_group_stickiness_config[name] = value
+              when 'DefaultActions'
+                @in_default_actions = false
+              when 'TargetGroupStickinessConfig'
+                if @in_target_group_stickiness_config
+                  @config['TargetGroupStickinessConfig'] = @target_group_stickiness_config
+                  @in_target_group_stickiness_config = false
+                  @target_group_stickiness_config = {}
+                end
+              when 'TargetGroups'
+                @config['TargetGroups'] = @target_groups
+                @in_target_groups = false
+                @target_groups = []
+              end
+            else
+              case name
+              when 'member'
+                if @in_certificates
+                  @listener['Certificates'] << @certificate
+                  @certificate = {}
+                else
+                  @results['Listeners'] << @listener
+                  reset_listener
+                end
+              when 'LoadBalancerArn', 'Protocol', 'Port', 'ListenerArn', 'SslPolicy'
+                @listener[name] = value
+              when 'CertificateArn'
+                @certificate[name] = value
+              when 'Certificates'
+                @in_certificates = false
+
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+
+              when 'NextMarker'
+                @results['NextMarker'] = value
+
+              when 'DescribeListenersResponse'
+                @response['DescribeListenersResult'] = @results
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeLoadBalancers < Fog::Parsers::Base
+          def reset
+            reset_load_balancer
+            reset_availability_zone
+            @load_balancer_addresses = {}
+            @state = {}
+            @results = { 'LoadBalancers' => [] }
+            @response = { 'DescribeLoadBalancersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_load_balancer
+            @load_balancer = { 'SecurityGroups' => [], 'AvailabilityZones' => [] }
+          end
+
+          def reset_availability_zone
+            @availability_zone = { 'LoadBalancerAddresses' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = true
+            when 'SecurityGroups'
+              @in_security_groups = true
+            when 'State'
+              @in_state = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_availability_zones && @in_load_balancer_addresses
+                @availability_zone['LoadBalancerAddresses'] << @load_balancer_addresses
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @availability_zone
+                reset_availability_zone
+              elsif @in_security_groups
+                @load_balancer['SecurityGroups'] << value
+              else
+                @results['LoadBalancers'] << @load_balancer
+                reset_load_balancer
+              end
+            when 'SubnetId', 'ZoneName'
+              @availability_zone[name] = value
+            when 'IpAddress', 'AllocationId'
+              @load_balancer_addresses[name] = value
+
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId', 'VpcId'
+              @load_balancer[name] = value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(value)
+
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = false
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+            when 'SecurityGroups'
+              @in_security_groups = false
+            when 'State'
+              @in_state = false
+              @load_balancer[name] = @state
+              @state = {}
+            when 'Code'
+              @state[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'NextMarker'
+              @results['NextMarker'] = value
+            when 'DescribeLoadBalancersResponse'
+              @response['DescribeLoadBalancersResult'] = @results
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/describe_tags.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeTags < Fog::Parsers::Base
+          def reset
+            @this_key   = nil
+            @this_value = nil
+            @tags       = Hash.new
+            @response   = { 'DescribeTagsResult' => { 'TagDescriptions' => [] }, 'ResponseMetadata' => {} }
+            @in_tags = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+              when 'member'
+                unless @in_tags
+                  @resource_arn = nil
+                  @tags = {}
+                end
+              when 'Tags'
+                @in_tags = true
+            end
+          end
+
+          def end_element(name)
+            super
+            case name
+              when 'member'
+                if @in_tags
+                  @tags[@this_key] = @this_value
+                  @this_key, @this_value = nil, nil
+                else
+                  @response['DescribeTagsResult']['TagDescriptions'] << { 'Tags' => @tags, 'ResourceArn' => @resource_arn }
+                end
+              when 'Key'
+                @this_key = value
+              when 'Value'
+                @this_value = value
+              when 'ResourceArn'
+                @resource_arn = value
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+              when 'Tags'
+                @in_tags = false
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/empty.rb

@@ -0,0 +1,10 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class Empty < ELB::Empty
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/get_group_policy.rb

@@ -14,7 +14,7 @@ module Fog
             when 'GroupName', 'PolicyName'
               @response[name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/get_role_policy.rb

@@ -12,7 +12,7 @@ module Fog
             when 'RoleName', 'PolicyName'
               @response['Policy'][name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/get_user_policy.rb

@@ -14,7 +14,7 @@ module Fog
             when 'UserName', 'PolicyName'
               @response['Policy'][name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/list_access_keys.rb

@@ -10,7 +10,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'AccessKeyId', 'Status', 'Username'
+            when 'AccessKeyId', 'Status', 'UserName'
               @access_key[name] = value
             when 'member'
               @response['AccessKeys'] << @access_key

data/lib/fog/aws/parsers/iam/list_server_certificates.rb

@@ -21,7 +21,7 @@ module Fog
             when 'member'
               @response['Certificates'] << @certificate
               reset_certificate
-            when 'IsTrunctated'
+            when 'IsTruncated'
               @response[name] = !!value
             when 'Marker'
               @response[name] = value

data/lib/fog/aws/parsers/iam/policy_version.rb

@@ -18,7 +18,7 @@ module Fog
             when 'IsDefaultVersion'
               @version[name] = (value == 'true')
             when 'Document'
-              @version[name] = if decoded_string = URI.decode(value)
+              @version[name] = if decoded_string = URI.decode_www_form_component(value)
                                  Fog::JSON.decode(decoded_string) rescue value
                                else
                                  value

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

@@ -42,7 +42,7 @@ module Fog
             when 'VpcSecurityGroupId'
               @vpc_security_group[name] = value
             when 'Status'
-              # Unfortunately, status is used in VpcSecurityGroupMemebership and
+              # Unfortunately, status is used in VpcSecurityGroupMembership and
               # DBSecurityGroups
               if @in_db_security_groups
                 @db_security_group[name]=value

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

@@ -8,7 +8,7 @@ module Fog
           end
 
           def fresh_instance
-            {'PendingModifiedValues' => [], 'DBSecurityGroups' => [], 'ReadReplicaDBInstanceIdentifiers' => [], 'Endpoint' => {}}
+            {'PendingModifiedValues' => [], 'DBSecurityGroups' => [], 'ReadReplicaDBInstanceIdentifiers' => [], 'Endpoint' => {}, 'DBSubnetGroup' => {}}
           end
 
           def start_element(name, attrs = [])
@@ -35,6 +35,17 @@ module Fog
             when 'VpcSecurityGroups'
               @in_vpc_security_groups = true
               @vpc_security_groups = []
+            when 'DBSubnetGroup'
+              @in_db_subnet_group = true
+              @db_subnet_group = {}
+            when 'Subnets'
+              @in_subnets = true
+              @subnets = []
+            when 'Subnet'
+              @subnet = {}
+            when 'SubnetAvailabilityZone'
+              @in_subnet_availability_zone = true
+              @subnet_availability_zone = {}
             end
           end
 
@@ -51,7 +62,8 @@ module Fog
               'CharacterSetName', 'DbiResourceId', 'LicenseModel', 'KmsKeyId',
               'DBClusterIdentifier'
               @db_instance[name] = value
-            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible', 'StorageEncrypted'
+            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible',
+              'StorageEncrypted', 'EnableIAMDatabaseAuthentication'
               @db_instance[name] = (value == 'true')
             when 'DBParameterGroups'
               @in_db_parameter_groups = false
@@ -93,7 +105,7 @@ module Fog
             when 'VpcSecurityGroupId'
               @vpc_security_group[name] = value
             when 'Status'
-              # Unfortunately, status is used in VpcSecurityGroupMemebership and
+              # Unfortunately, status is used in VpcSecurityGroupMembership and
               # DBSecurityGroups
               if @in_db_security_groups
                 @db_security_group[name]=value
@@ -121,6 +133,33 @@ module Fog
               @db_instance['ReadReplicaSourceDBInstanceIdentifier'] = value
             when 'DBInstance'
               @db_instance = fresh_instance
+            when 'DBSubnetGroup'
+              @in_db_subnet_group = false
+              @db_instance['DBSubnetGroup'] = @db_subnet_group
+            when 'VpcId'
+              if @in_db_subnet_group
+                @db_subnet_group[name] = value
+              end
+            when 'Subnets'
+              @in_subnets = false
+              if @in_db_subnet_group
+                @db_subnet_group['Subnets'] = @subnets
+              end
+            when 'Subnet'
+              if @in_subnets
+                @subnets << @subnet
+              end
+            when 'SubnetIdentifier', 'SubnetStatus'
+              if @in_subnets
+                @subnet[name] = value
+              end
+            when 'SubnetAvailabilityZone'
+              @in_subnet_availability_zone = false
+              @subnet['SubnetAvailabilityZone'] = @subnet_availability_zone
+            when 'Name'
+              if @in_subnet_availability_zone
+                @subnet_availability_zone[name] = value
+              end
             end
           end
         end

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

@@ -19,12 +19,13 @@ module Fog
 
           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 'MultiAZCapable', 'ReadReplicaCapable', 'Vpc', 'SupportsIops',
+                 'SupportsEnhancedMonitoring', 'SupportsIAMDatabaseAuthentication',
+                 'SupportsPerformanceInsights', 'SupportsStorageEncryption' then @db_instance_option[name] = to_boolean(value)
+            when 'Engine', 'LicenseModel', 'EngineVersion', 'DBInstanceClass', 'StorageType' 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 = {}

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

@@ -4,7 +4,7 @@ module Fog
       module RDS
         class ModifyDBSubnetGroup < Fog::Parsers::Base
           def reset
-            @response = { 'ModifyDBSubnetGrouptAttributeResult' => {}, 'ResponseMetadata' => {} }
+            @response = { 'ModifyDBSubnetGroupAttributeResult' => {}, 'ResponseMetadata' => {} }
           end
 
           def start_element(name, attrs = [])

data/lib/fog/aws/parsers/redshift/cluster_subnet_group_parser.rb

@@ -32,7 +32,7 @@ module Fog
           def end_element(name)
             super
             case name
-            when 'ClusterSubnetGroupName', 'Desciption', 'VpcId', 'SubnetGroupStatus'
+            when 'ClusterSubnetGroupName', 'Description', 'VpcId', 'SubnetGroupStatus'
               @response[name] = value
             when 'SubnetIdentifier', 'SubnetStatus'
               @subnet[name] = value

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Storage
-      module AWS
+    module AWS
+      module Storage
         class AccessControlList < Fog::Parsers::Base
           def reset
             @in_access_control_list = false