test: add new one and amend GH Actions config

Co-authored-by: Adam <adam.blevins@iongroup.com>
Co-authored-by: Bela <bela.sal@iongroup.com>

.github/workflows/test.yml

@@ -3,14 +3,13 @@ name: Test
 on:
   workflow_dispatch:
   push:
-    branches-ignore:
-      - 'dependabot/**'
+    branches:
+      - master
 
 jobs:
-  publish:
+  test:
     name: Test
     runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/master' }}
     steps:
       - uses: actions/checkout@v2
       - run: ./test/run.sh

test/infra/main.tf

@@ -12,7 +12,8 @@ module "backend_service_routing" {
   aws_account_alias = var.aws_account_alias
   backend_dns       = var.backend_dns
 
-  extra_listener_host_names = var.extra_listener_host_names
+  extra_listener_host_names        = var.extra_listener_host_names
+  extra_listener_http_header_pairs = var.extra_listener_http_header_pairs
 }
 
 # configure provider to not try too hard talking to AWS API
@@ -40,6 +41,15 @@ variable "aws_account_alias" {}
 variable "backend_dns" {}
 
 variable "extra_listener_host_names" {
-  type = list(string)
+  type    = list(string)
+  default = []
+}
+
+variable "extra_listener_http_header_pairs" {
+  description = "A list of HTTP headers to be included in the http header condition for the ALB listener rule"
+  type        = list(object({
+    http_header_name = string,
+    values           = set(string)
+  }))
   default = []
 }

test/test_tf_backend_service_routing.py

@@ -170,6 +170,63 @@ def test_create_alb_listener_rule_extrahosts(self):
         }
     }    """.strip() in output
 
+    def test_create_alb_listener_rule_extra_headers(self):
+        # When
+        output = check_output([
+            'terraform',
+            'plan',
+            '-var', 'env=live',
+            '-var', 'aws_account_alias=awsaccount',
+            '-var', 'backend_dns=testbackend.com',
+            '-var', 'extra_listener_http_header_pairs=[{"http_header_name":"osh_was","values":["here"]}]',
+            '-var-file=test/platform-config/eu-west-1.json',
+            '-target=module.backend_service_routing.aws_alb_listener_rule.rule',
+            '-no-color',
+            'test/infra'
+        ]).decode('utf-8')
+
+        # Then
+        assert """
+  # module.backend_service_routing.aws_alb_listener_rule.rule will be created
+  + resource "aws_alb_listener_rule" "rule" {
+      + arn          = (known after apply)
+      + id           = (known after apply)
+      + listener_arn = "arn:aws:alb:eu-west-1:123456789123:alb:listener"
+      + priority     = 10
+      + tags_all     = (known after apply)
+
+      + action {
+          + order            = (known after apply)
+          + target_group_arn = (known after apply)
+          + type             = "forward"
+        }
+
+      + condition {
+          + host_header {
+              + values = [
+                  + "cognito.domain.com",
+                ]
+            }
+        }
+      + condition {
+
+          + http_header {
+              + http_header_name = "osh_was"
+              + values           = [
+                  + "here",
+                ]
+            }
+        }
+      + condition {
+
+          + path_pattern {
+              + values = [
+                  + "*",
+                ]
+            }
+        }
+    }    """.strip() in output
+
     def test_create_aws_alb_target_group(self):
         # When
         output = check_output([