fog-aws 3.0.0 → 3.10.0

data/lib/fog/aws/parsers/compute/network_acl_parser.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class NetworkAclParser < Fog::Parsers::Base
           def reset_nacl
             @network_acl = { 'associationSet' => [], 'entrySet' => [], 'tagSet' => {} }

data/lib/fog/aws/parsers/compute/network_interface_parser.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class NetworkInterfaceParser < Fog::Parsers::Base
           def reset_nic
             @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {}, 'privateIpAddressesSet' => [] }

data/lib/fog/aws/parsers/compute/purchase_reserved_instances_offering.rb

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

data/lib/fog/aws/parsers/compute/register_image.rb

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

data/lib/fog/aws/parsers/compute/replace_network_acl_association.rb

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

data/lib/fog/aws/parsers/compute/restore_address_to_classic.rb

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

data/lib/fog/aws/parsers/compute/run_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class RunInstances < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}

data/lib/fog/aws/parsers/compute/spot_datafeed_subscription.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class SpotDatafeedSubscription < Fog::Parsers::Base
           def reset
             @response = { 'spotDatafeedSubscription' => {} }

data/lib/fog/aws/parsers/compute/spot_instance_requests.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class SpotInstanceRequests < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}

data/lib/fog/aws/parsers/compute/start_stop_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class StartStopInstances < Fog::Parsers::Base
           def reset
             @instance = { 'currentState' => {}, 'previousState' => {} }

data/lib/fog/aws/parsers/compute/terminate_instances.rb

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class TerminateInstances < Fog::Parsers::Base
           def reset
             @instance = { 'previousState' => {}, 'currentState' => {} }

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class CreateHostedZone < Fog::Parsers::Base
           def reset
             @hosted_zone = {}
@@ -16,7 +16,7 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name] = value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
                 @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone

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

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

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

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

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