From f195b59528238c881f5c4293a7463f332d682be0 Mon Sep 17 00:00:00 2001
From: KevinLoiseau <k.loiseauand@gmail.com>
Date: Tue, 26 Nov 2019 11:35:33 +0100
Subject: [PATCH] Take care of RedirectConfig in listeners parser

---
 .../aws/parsers/elbv2/describe_listeners.rb   | 62 +++++++++++--------
 .../parsers/elbv2/describe_listeners_tests.rb |  9 +++
 tests/requests/elbv2/helper.rb                |  8 ++-
 3 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/lib/fog/aws/parsers/elbv2/describe_listeners.rb b/lib/fog/aws/parsers/elbv2/describe_listeners.rb
index 523941ab4..72672f541 100644
--- a/lib/fog/aws/parsers/elbv2/describe_listeners.rb
+++ b/lib/fog/aws/parsers/elbv2/describe_listeners.rb
@@ -7,6 +7,7 @@ module Fog
             reset_listener
             @default_action = {}
             @certificate = {}
+            @redirect_config = {}
             @results = { 'Listeners' => [] }
             @response = { 'DescribeListenersResult' => {}, 'ResponseMetadata' => {} }
           end
@@ -26,38 +27,47 @@ module Fog
           end
 
           def end_element(name)
-            case name
-            when 'member'
-              if @in_default_actions
+            if @in_default_actions
+              case name
+              when 'member'
                 @listener['DefaultActions'] << @default_action
                 @default_action = {}
-              elsif @in_certificates
-                @listener['Certificates'] << @certificate
-                @certificate = {}
-              else
-                @results['Listeners'] << @listener
-                reset_listener
+              when 'Type', 'TargetGroupArn'
+                @default_action[name] = value
+              when 'Path', 'Protocol', 'Port', 'Query', 'Host', 'StatusCode'
+                @redirect_config[name] = value
+              when 'RedirectConfig'
+                @default_action[name] = @redirect_config
+                @redirect_config = {}
+              when 'DefaultActions'
+                @in_default_actions = false
               end
-            when 'LoadBalancerArn', 'Protocol', 'Port', 'ListenerArn'
-              @listener[name] = value
-            when 'Type', 'TargetGroupArn'
-              @default_action[name] = value
-            when 'CertificateArn'
-              @certificate[name] = value
+            else
+              case name
+              when 'member'
+                if @in_certificates
+                  @listener['Certificates'] << @certificate
+                  @certificate = {}
+                else
+                  @results['Listeners'] << @listener
+                  reset_listener
+                end
+              when 'LoadBalancerArn', 'Protocol', 'Port', 'ListenerArn'
+                @listener[name] = value
+              when 'CertificateArn'
+                @certificate[name] = value
+              when 'Certificates'
+                @in_certificates = false
 
-            when 'DefaultActions'
-              @in_default_actions = false
-            when 'Certificates'
-              @in_certificates = false
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
 
-            when 'RequestId'
-              @response['ResponseMetadata'][name] = value
+              when 'NextMarker'
+                @results['NextMarker'] = value
 
-            when 'NextMarker'
-              @results['NextMarker'] = value
-
-            when 'DescribeListenersResponse'
-              @response['DescribeListenersResult'] = @results
+              when 'DescribeListenersResponse'
+                @response['DescribeListenersResult'] = @results
+              end
             end
           end
         end
diff --git a/tests/parsers/elbv2/describe_listeners_tests.rb b/tests/parsers/elbv2/describe_listeners_tests.rb
index 4d7063cae..52d741c43 100644
--- a/tests/parsers/elbv2/describe_listeners_tests.rb
+++ b/tests/parsers/elbv2/describe_listeners_tests.rb
@@ -14,6 +14,15 @@ DESCRIBE_LISTENERS_RESULT = <<-EOF
           <member>
             <Type>forward</Type>
             <TargetGroupArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067</TargetGroupArn>
+            <RedirectConfig>
+              <Protocol>HTTPS</Protocol>
+              <Port>443</Port>
+              <Path>\#{path}</Path>
+              <Query>\#{query}</Query>
+              <Host>\#{host}</Host>
+              <StatusCode>HTTP_301</StatusCode>
+              <Type>redirect</Type>
+            </RedirectConfig>
           </member>
         </DefaultActions>
         <Certificates>
diff --git a/tests/requests/elbv2/helper.rb b/tests/requests/elbv2/helper.rb
index bf1165c76..4eb4c78f9 100644
--- a/tests/requests/elbv2/helper.rb
+++ b/tests/requests/elbv2/helper.rb
@@ -30,12 +30,18 @@ class AWS
         'CreateLoadBalancerResult' => {'LoadBalancers' => [LOAD_BALANCER], 'NextMarker' => Fog::Nullable::String}
       })
 
+      LISTENER_DEFAULT_ACTIONS = [{
+        "Type" => String,
+        "TargetGroupArn" => String,
+        "RedirectConfig" => Fog::Nullable::Hash
+      }]
+
       LISTENER = {
         "LoadBalancerArn" => String,
         "Protocol" => String,
         "Port" => String,
         "ListenerArn" => String,
-        "DefaultActions" => [{"Type" => String, "TargetGroupArn" => String}],
+        "DefaultActions" => LISTENER_DEFAULT_ACTIONS,
         "Certificates" => [{"CertificateArn" => String}]
       }