From 04e29518c0b5a09dae6012f27b92fb466360fafa Mon Sep 17 00:00:00 2001
From: James Hochadel <james.hochadel@gsa.gov>
Date: Tue, 23 Apr 2024 12:04:27 -0400
Subject: [PATCH] Output new CSB access key to terraform state and rename
 module

Once the broker is managed in Terraform, this will no longer be necessary, but for now, there is no other way to access it.

Also make module name "csb", consistent with other usages.
---
 terraform/modules/csb/outputs.tf | 1 -
 terraform/stacks/main/outputs.tf | 9 +++++++++
 terraform/stacks/main/stack.tf   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/terraform/modules/csb/outputs.tf b/terraform/modules/csb/outputs.tf
index d5c356f0..b5c6f1bf 100644
--- a/terraform/modules/csb/outputs.tf
+++ b/terraform/modules/csb/outputs.tf
@@ -19,4 +19,3 @@ output "secret_access_key_curr" {
   value     = aws_iam_access_key.iam_access_key.secret
   sensitive = true
 }
-
diff --git a/terraform/stacks/main/outputs.tf b/terraform/stacks/main/outputs.tf
index ab4bb182..734c58ef 100644
--- a/terraform/stacks/main/outputs.tf
+++ b/terraform/stacks/main/outputs.tf
@@ -645,6 +645,15 @@ output "external_domain_broker_gov_secret_access_key_prev" {
   sensitive = true
 }
 
+output "csb_gov_access_key_id_curr" {
+  value = module.csb.access_key_id_curr
+}
+
+output "csb_gov_secret_access_key_curr" {
+  value     = module.csb.secret_access_key_curr
+  sensitive = true
+}
+
 output "domains_dedicated_lbgroup_target_group_apps_https_names" {
   value = module.dedicated_loadbalancer_group.domains_lbgroup_target_group_apps_https_names
 }
diff --git a/terraform/stacks/main/stack.tf b/terraform/stacks/main/stack.tf
index 9154c97f..998e613b 100644
--- a/terraform/stacks/main/stack.tf
+++ b/terraform/stacks/main/stack.tf
@@ -433,7 +433,7 @@ module "sns" {
   sns_cg_platform_slack_notifications_email = var.sns_cg_platform_slack_notifications_email
 }
 
-module "cloud_service_broker" {
+module "csb" {
   source = "../../modules/csb"
 
   stack_description = var.stack_description