Merge pull request #1 from base2Services/feature/rule-paths-and-prior…

…ities

Allow for multiple paths in same rule and dynamic priority

fargate-v2.cfndsl.rb

@@ -81,7 +81,7 @@
       targetgroup['rules'].each_with_index do |rule, index|
         listener_conditions = []
         if rule.key?("path")
-          listener_conditions << { Field: "path-pattern", Values: [ rule["path"] ] }
+          listener_conditions << { Field: "path-pattern", Values: [ rule["path"] ].flatten() }
         end
         if rule.key?("host")
           hosts = []
@@ -96,11 +96,19 @@
           listener_conditions << { Field: "host-header", Values: hosts }
         end
 
-        ElasticLoadBalancingV2_ListenerRule("TargetRule#{rule['priority']}") do
+        if rule.key?("name")
+          rule_name = rule['name']
+        elsif rule['priority'].is_a? Integer
+          rule_name = "TargetRule#{rule['priority']}"
+        else
+          rule_name = "TargetRule#{index}"
+        end
+
+        ElasticLoadBalancingV2_ListenerRule(rule_name) do
           Actions [{ Type: "forward", TargetGroupArn: Ref('TaskTargetGroup') }]
           Conditions listener_conditions
           ListenerArn Ref("Listener")
-          Priority rule['priority'].to_i
+          Priority rule['priority']
         end
 
       end

tests/dynamic_priorities.test.yaml

@@ -0,0 +1,24 @@
+
+test_metadata:
+  type: config
+  name: dynamic_priorities
+  description: Set a rule priority with a Ref
+
+task_definition:
+  proxy:
+    image: nginx
+    ports:
+      - 80
+
+targetgroup:
+  name: web
+  type: ip
+  container: nginx
+  port: 80
+  protocol: http
+  listener: http
+  rules:
+    -
+      host: www.*
+      priority:
+        Ref: MinimumHealthyPercent  # a valid Ref to pass test

tests/multi_path_rules.test.yaml

@@ -0,0 +1,26 @@
+
+test_metadata:
+  type: config
+  name: multi_path_rules
+  description: Create a rule with multiple paths
+
+task_definition:
+  proxy:
+    image: nginx
+    ports:
+      - 80
+
+targetgroup:
+  name: web
+  type: ip
+  container: nginx
+  port: 80
+  protocol: http
+  listener: http
+  rules:
+    -
+      host: www.*
+      priority: 10
+      path:
+        - /v1
+        - /v1/*

tests/single_path_rules.test.yaml

@@ -0,0 +1,24 @@
+
+test_metadata:
+  type: config
+  name: single_path_rules
+  description: Create a rule with multiple paths
+
+task_definition:
+  proxy:
+    image: nginx
+    ports:
+      - 80
+
+targetgroup:
+  name: web
+  type: ip
+  container: nginx
+  port: 80
+  protocol: http
+  listener: http
+  rules:
+    -
+      host: www.*
+      priority: 10
+      path: /v1