diff --git a/Makefile b/Makefile index f7962416..7cc4fcf9 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ endif $(MAKE) -init .PHONY: -init --init: ## terraform init (make init ENV=development) +-init: $(DOCKER_RUN) terraform init --backend-config="key=terraform.$$ENV.state" $(MAKE) workspace-select diff --git a/data.tf b/data.tf index 4220ce4e..39444bce 100644 --- a/data.tf +++ b/data.tf @@ -76,11 +76,6 @@ data "aws_ssm_parameter" "pdns_ips_list" { with_decryption = true } -# I DONT THINK THIS ONE IS NEEDED -# data "aws_ssm_parameter" "critical_notification_recipients" { -# name = "codebuild/pttp-ci-infrastructure-core-pipeline/${terraform.workspace}/critical_notification_recipients" -# } - data "aws_ssm_parameter" "vpn_hosted_zone_id" { name = "/codebuild/${terraform.workspace}/vpn_hosted_zone_id" with_decryption = true @@ -151,12 +146,6 @@ data "aws_ssm_parameter" "model_office_vm_ip" { with_decryption = true } -# I DONT THINK THIS ONE IS NEEDED - it's not used anywhere -# data "aws_ssm_parameter" "dhcp_egress_transit_gateway_routes" { -# name = "/staff-device/${terraform.workspace}/dhcp_egress_transit_gateway_routes" -# with_decryption = true -# } - data "aws_ssm_parameter" "allowed_ip_ranges" { name = "/staff-device/dns-dhcp/admin/${terraform.workspace}/allowed_ip_ranges" } diff --git a/documentation/corsham-test.md b/documentation/corsham-test.md index a2b1d4a1..c7bd95f3 100644 --- a/documentation/corsham-test.md +++ b/documentation/corsham-test.md @@ -15,7 +15,7 @@ This is integrated with the production MoJ network so will only work on our prod 1. Add your public IP address to AWS SSM parameter store (Shared Services Account) `/staff-device/corsham_testing/bastion_allowed_ingress_ip`. -2. Modify the `/staff-device/dns-dhcp/$ENV/enable_bastion` ssm parameter in AWS shared services account and set it to `true`. +2. Modify the `enable_corsham_test_bastion` variable in `./variables.tf` and set it to `true`. 3. Run the pipeline. diff --git a/variables.tf b/variables.tf index 84d69969..64c646b4 100644 --- a/variables.tf +++ b/variables.tf @@ -8,11 +8,6 @@ variable "enable_critical_notifications" { default = false } -variable "critical_notification_recipients" { - type = list(any) - default = [] -} - variable "admin_db_backup_retention_period" { type = number default = 30