Add ability to tag data containing resources (#10534)

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [ ] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [ ] Documented any API changes (docs/Using-Fleet/REST-API.md or
docs/Contributing/API-for-contributors.md)
- [ ] Documented any permissions changes
- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] Added support on fleet's osquery simulator `cmd/osquery-perf` for
new osquery data ingestion features.
- [ ] Added/updated tests
- [ ] Manual QA for all new/changed functionality
  - For Orbit and Fleet Desktop changes:
- [ ] Manual QA must be performed in the three main OSs, macOS, Windows
and Linux.
- [ ] Auto-update manual QA, from released version of component to new
version (see [tools/tuf/test](../tools/tuf/test/README.md)).

terraform/byo-vpc/main.tf

@@ -59,6 +59,8 @@ module "rds" {
   database_name                   = "fleet"
   skip_final_snapshot             = true
   snapshot_identifier             = var.rds_config.snapshot_identifier
+
+  cluster_tags = var.rds_config.cluster_tags
 }
 
 data "aws_subnet" "redis" {
@@ -94,6 +96,7 @@ module "redis" {
     protocol    = "tcp"
     cidr_blocks = ["10.0.0.0/8"]
   }]
+  tags = var.redis_config.tags
 }
 
 module "secrets-manager-1" {

terraform/byo-vpc/variables.tf

@@ -24,6 +24,7 @@ variable "rds_config" {
     enabled_cloudwatch_logs_exports = optional(list(string), [])
     master_username                 = optional(string, "fleet")
     snapshot_identifier             = optional(string)
+    cluster_tags                    = optional(map(string), {})
   })
   default = {
     name                            = "fleet"
@@ -41,6 +42,7 @@ variable "rds_config" {
     enabled_cloudwatch_logs_exports = []
     master_username                 = "fleet"
     snapshot_identifier             = null
+    cluster_tags                    = {}
   }
   description = "The config for the terraform-aws-modules/rds-aurora/aws module"
   nullable    = false
@@ -66,6 +68,7 @@ variable "redis_config" {
       name  = string
       value = string
     })), [])
+    tags = optional(map(string), {})
   })
   default = {
     name                          = "fleet"
@@ -83,6 +86,7 @@ variable "redis_config" {
     at_rest_encryption_enabled    = true
     transit_encryption_enabled    = true
     parameter                     = []
+    tags                          = {}
   }
 }
 

terraform/variables.tf

@@ -74,6 +74,7 @@ variable "rds_config" {
     enabled_cloudwatch_logs_exports = optional(list(string), [])
     master_username                 = optional(string, "fleet")
     snapshot_identifier             = optional(string)
+    cluster_tags                    = optional(map(string), {})
   })
   default = {
     name                            = "fleet"
@@ -91,6 +92,7 @@ variable "rds_config" {
     enabled_cloudwatch_logs_exports = []
     master_username                 = "fleet"
     snapshot_identifier             = null
+    cluster_tags                    = {}
   }
   description = "The config for the terraform-aws-modules/rds-aurora/aws module"
   nullable    = false
@@ -116,6 +118,7 @@ variable "redis_config" {
       name  = string
       value = string
     })), [])
+    tags = optional(map(string), {})
   })
   default = {
     name                          = "fleet"
@@ -133,6 +136,7 @@ variable "redis_config" {
     at_rest_encryption_enabled    = true
     transit_encryption_enabled    = true
     parameter                     = []
+    tags                          = {}
   }
 }