From 518da425be3ad5dce595d9227571ad0560a33dba Mon Sep 17 00:00:00 2001
From: Dave Arnold <user@example.com>
Date: Wed, 8 Jul 2026 14:11:37 -0400
Subject: [PATCH] refactor: use boc-nts tags module outputs for resource
 tagging

- tags.tf: set legacy_tags = var.tags (replaces account/infra/app var merge)
- locals.tf: replace manual finops_tags + base_tags with module.tags.tags
  and per-resource role via module.tags.finops_roles[role]
- variables.tf: remove finops_project_name and finops_project_number variables
  (finops config now lives in tags.yml)
---
 locals.tf    | 19 ++++++-------------
 tags.tf      |  6 +-----
 variables.tf | 12 ------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/locals.tf b/locals.tf
index dc8f1d2..2598999 100644
--- a/locals.tf
+++ b/locals.tf
@@ -1,18 +1,11 @@
 locals {
   # ─── Tagging ────────────────────────────────────────────────────────────────
-  finops_tags = {
-    finops_project_name   = var.finops_project_name
-    finops_project_number = var.finops_project_number
-  }
-
-  base_tags = merge({ "boc:created_by" = "terraform" }, var.tags)
-
-  tags_rds        = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_rds" })
-  tags_kms        = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_kms" })
-  tags_sqs        = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_sqs" })
-  tags_lambda     = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_lambda" })
-  tags_cloudwatch = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_cloudwatch" })
-  tags_iam        = merge(local.base_tags, local.finops_tags, { finops_project_role = "${var.name_prefix}_iam" })
+  tags_rds        = merge(module.tags.tags, module.tags.finops_roles["rds"])
+  tags_kms        = merge(module.tags.tags, module.tags.finops_roles["kms"])
+  tags_sqs        = merge(module.tags.tags, module.tags.finops_roles["sqs"])
+  tags_lambda     = merge(module.tags.tags, module.tags.finops_roles["lambda"])
+  tags_cloudwatch = merge(module.tags.tags, module.tags.finops_roles["cloudwatch"])
+  tags_iam        = merge(module.tags.tags, module.tags.finops_roles["iam"])
 
   # ─── Resource Names ─────────────────────────────────────────────────────────
   lambda_dispatcher_name  = "${var.name_prefix}-dispatcher"
diff --git a/tags.tf b/tags.tf
index 3e8cb3b..a15ded0 100644
--- a/tags.tf
+++ b/tags.tf
@@ -2,9 +2,5 @@ module "tags" {
   source   = "git@github.e.it.census.gov:terraform-modules/boc-nts//tags"
   filename = format("%v/%v", path.root, "tags.yml")
 
-  legacy_tags = merge(
-    var.account_tags,
-    var.infrastructure_tags,
-    var.application_tags,
-  )
+  legacy_tags = var.tags
 }
\ No newline at end of file
diff --git a/variables.tf b/variables.tf
index 904cdfc..7005d5c 100644
--- a/variables.tf
+++ b/variables.tf
@@ -6,18 +6,6 @@ variable "name_prefix" {
   default     = "csvd-patch40"
 }
 
-# ─── FinOps Tags (required) ───────────────────────────────────────────────────
-
-variable "finops_project_name" {
-  description = "FinOps project name tag value (e.g. 'csvd_patch4'). Must NOT be a catchall value."
-  type        = string
-}
-
-variable "finops_project_number" {
-  description = "FinOps project number tag value (e.g. 'fs0000000009'). Must NOT be a catchall value."
-  type        = string
-}
-
 # ─── Additional Tags ──────────────────────────────────────────────────────────
 
 variable "tags" {