Merge branch 'csr_DSOS-2387_miscellaneous-fixes' of github.com:minist…

…ryofjustice/modernisation-platform-terraform-loadbalancer into csr_DSOS-2387_miscellaneous-fixes

README.md

@@ -178,6 +178,7 @@ If you're looking to raise an issue with this module, please create a new issue
 | [aws_iam_role_policy_attachment.lb_glue_service](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_lb.loadbalancer](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb) | resource |
 | [aws_lb_target_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb_target_group) | resource |
+| [aws_lb_target_group_attachment.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb_target_group_attachment) | resource |
 | [aws_security_group.lb](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | resource |
 | [aws_elb_service_account.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/elb_service_account) | data source |
 | [aws_iam_policy_document.bucket_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
@@ -197,15 +198,16 @@ If you're looking to raise an issue with this module, please create a new issue
 | <a name="input_force_destroy_bucket"></a> [force\_destroy\_bucket](#input\_force\_destroy\_bucket) | A boolean that indicates all objects (including any locked objects) should be deleted from the bucket so that the bucket can be destroyed without error. These objects are not recoverable. | `bool` | `false` | no |
 | <a name="input_idle_timeout"></a> [idle\_timeout](#input\_idle\_timeout) | The time in seconds that the connection is allowed to be idle. | `string` | n/a | yes |
 | <a name="input_internal_lb"></a> [internal\_lb](#input\_internal\_lb) | A boolean that determines whether the load balancer is internal or internet-facing. | `bool` | `false` | no |
-| <a name="input_lb_target_groups"></a> [lb\_target\_groups](#input\_lb\_target\_groups) | Map of load balancer target groups, where key is the name | <pre>map(object({<br>    port                 = optional(number)<br>    deregistration_delay = optional(number)<br>    health_check = optional(object({<br>      enabled             = optional(bool)<br>      interval            = optional(number)<br>      healthy_threshold   = optional(number)<br>      matcher             = optional(string)<br>      path                = optional(string)<br>      port                = optional(number)<br>      timeout             = optional(number)<br>      unhealthy_threshold = optional(number)<br>    }))<br>    stickiness = optional(object({<br>      enabled         = optional(bool)<br>      type            = string<br>      cookie_duration = optional(number)<br>      cookie_name     = optional(string)<br>    }))<br>    attachments = optional(list(object({<br>      target_id         = string<br>      port              = optional(number)<br>      availability_zone = optional(string)<br>    })), [])<br>  }))</pre> | `{}` | no |
+| <a name="input_lb_target_groups"></a> [lb\_target\_groups](#input\_lb\_target\_groups) | Map of load balancer target groups, where key is the name | <pre>map(object({<br>    port                 = optional(number)<br>    attachment_port      = optional(number)<br>    deregistration_delay = optional(number)<br>    health_check = optional(object({<br>      enabled             = optional(bool)<br>      interval            = optional(number)<br>      healthy_threshold   = optional(number)<br>      matcher             = optional(string)<br>      path                = optional(string)<br>      port                = optional(number)<br>      timeout             = optional(number)<br>      unhealthy_threshold = optional(number)<br>    }))<br>    stickiness = optional(object({<br>      enabled         = optional(bool)<br>      type            = string<br>      cookie_duration = optional(number)<br>      cookie_name     = optional(string)<br>    }))<br>  }))</pre> | `{}` | no |
 | <a name="input_load_balancer_type"></a> [load\_balancer\_type](#input\_load\_balancer\_type) | application or network | `string` | `"application"` | no |
 | <a name="input_loadbalancer_egress_rules"></a> [loadbalancer\_egress\_rules](#input\_loadbalancer\_egress\_rules) | Create new security group with these egress rules for the loadbalancer.  Or use the security\_groups var to attach existing group(s) | <pre>map(object({<br>    description     = string<br>    from_port       = number<br>    to_port         = number<br>    protocol        = string<br>    security_groups = list(string)<br>    cidr_blocks     = list(string)<br>  }))</pre> | `{}` | no |
 | <a name="input_loadbalancer_ingress_rules"></a> [loadbalancer\_ingress\_rules](#input\_loadbalancer\_ingress\_rules) | Create new security group with these ingress rules for the loadbalancer.  Or use the security\_groups var to attach existing group(s) | <pre>map(object({<br>    description     = string<br>    from_port       = number<br>    to_port         = number<br>    protocol        = string<br>    security_groups = list(string)<br>    cidr_blocks     = list(string)<br>  }))</pre> | `{}` | no |
 | <a name="input_log_schedule"></a> [log\_schedule](#input\_log\_schedule) | n/a | `string` | `"cron(15 1 ? * MON *)"` | no |
-| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Public subnets | `list(string)` | n/a | yes |
+| <a name="input_public_subnets"></a> [public\_subnets](#input\_public\_subnets) | Badly named variable, use subnets instead. Keeping for backward compatibility | `list(string)` | `[]` | no |
 | <a name="input_region"></a> [region](#input\_region) | AWS Region where resources are to be created | `string` | n/a | yes |
 | <a name="input_s3_versioning"></a> [s3\_versioning](#input\_s3\_versioning) | A boolean that determines whether s3 will have versioning | `bool` | `true` | no |
 | <a name="input_security_groups"></a> [security\_groups](#input\_security\_groups) | List of existing security group ids to attach to the load balancer.  You can use this instead of loadbalancer\_ingress\_rules,loadbalancer\_egress\_rules vars | `list(string)` | `null` | no |
+| <a name="input_subnets"></a> [subnets](#input\_subnets) | List of subnet IDs. Typically use private subnet for internal LBs and public for public LBs | `list(string)` | `[]` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Common tags to be used by all resources | `map(string)` | n/a | yes |
 | <a name="input_vpc_all"></a> [vpc\_all](#input\_vpc\_all) | The full name of the VPC (including environment) used to create resources | `string` | n/a | yes |
 
@@ -214,6 +216,7 @@ If you're looking to raise an issue with this module, please create a new issue
 | Name | Description |
 |------|-------------|
 | <a name="output_athena_db"></a> [athena\_db](#output\_athena\_db) | n/a |
+| <a name="output_lb_target_groups"></a> [lb\_target\_groups](#output\_lb\_target\_groups) | n/a |
 | <a name="output_load_balancer"></a> [load\_balancer](#output\_load\_balancer) | n/a |
 | <a name="output_load_balancer_arn"></a> [load\_balancer\_arn](#output\_load\_balancer\_arn) | n/a |
 | <a name="output_security_group"></a> [security\_group](#output\_security\_group) | n/a |