Merge pull request #1761 from alphagov/sengi/fix-ip-acl-bs

Make infra-security module deployable again.
alphagov · Oct 10, 2023 · 07e4164 · 07e4164
2 parents d4ddeb0 + b0e88fc
commit 07e4164
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/terraform/modules/aws/iam/gds_user_role/README.md b/terraform/modules/aws/iam/gds_user_role/README.md
@@ -30,7 +30,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_office_ips"></a> [office\_ips](#input\_office\_ips) | An array of CIDR blocks that will be allowed offsite access. | `list` | n/a | yes |
+| <a name="input_office_ips"></a> [office\_ips](#input\_office\_ips) | DEPRECATED: list of trusted CIDR netblocks | `list(string)` | `[]` | no |
 | <a name="input_restrict_to_gds_ips"></a> [restrict\_to\_gds\_ips](#input\_restrict\_to\_gds\_ips) | n/a | `bool` | `false` | no |
 | <a name="input_role_policy_arns"></a> [role\_policy\_arns](#input\_role\_policy\_arns) | List of ARNs of policies to attach to the role | `list` | `[]` | no |
 | <a name="input_role_suffix"></a> [role\_suffix](#input\_role\_suffix) | Suffix of the role name | `string` | n/a | yes |

diff --git a/terraform/modules/aws/iam/gds_user_role/main.tf b/terraform/modules/aws/iam/gds_user_role/main.tf
@@ -30,8 +30,9 @@ variable "restrict_to_gds_ips" {
 }
 
 variable "office_ips" {
-  type        = list
-  description = "An array of CIDR blocks that will be allowed offsite access."
+  type        = list(string)
+  description = "DEPRECATED: list of trusted CIDR netblocks"
+  default     = []
 }
 
 # Resources