Moved rds bastion output

into it's own block for consistency with other projects. ND-403
ministryofjustice · Jul 1, 2024 · 24339d4 · 24339d4
1 parent 8b29481
commit 24339d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -113,12 +113,12 @@ output: ## terraform output (make output OUTPUT_ARGUMENT='--raw dns_dhcp_vpc_id'
 	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color ${OUTPUT_ARGUMENT}"
 
 .PHONY: output-bastion-rds-admin
-output-bastion-rds-admin: ## terraform output (make output OUTPUT_ARGUMENT='--raw dns_dhcp_vpc_id')
-	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color -json terraform_outputs | jq -r .rds_bastion.admin[][]"
+output-bastion-rds-admin: ## terraform output (make output-bastion-rds-admin)
+	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color -json rds_bastion | jq -r .admin[][]"
 
 .PHONY: output-bastion-rds-server
-output-bastion-rds-server: ## terraform output (make output OUTPUT_ARGUMENT='--raw dns_dhcp_vpc_id')
-	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color -json terraform_outputs | jq -r .rds_bastion.server[][]"
+output-bastion-rds-server: ## terraform output (make output-bastion-rds-server)
+	$(DOCKER_RUN) /bin/bash -c "terraform output -no-color -json rds_bastion | jq -r .server[][]"
 
 .PHONY: apply
 apply: ## terraform apply

diff --git a/outputs.tf b/outputs.tf
@@ -22,9 +22,12 @@ output "terraform_outputs" {
     nat_gateway_route_table = {
       value = module.radius_vpc.nat_gateway_route_table_id
     }
-    rds_bastion = {
-      admin  = module.rds_admin_bastion[*].bastion
-      server = module.rds_servers_bastion[*].bastion
-    }
+  }
+}
+
+output "rds_bastion" {
+  value = {
+    admin  = module.rds_admin_bastion[*].bastion
+    server = module.rds_servers_bastion[*].bastion
   }
 }