Allow tagging resources from the main module

Author: Bit-Doctor

main.tf

@@ -4,6 +4,7 @@ module "vpc" {
   source = "./modules/vpc"
 
   enable_ssm_vpc_endpoint = var.enable_ssm && var.enable_ssm_vpc_endpoint
+  tags                    = var.tags
 }
 
 module "user_data" {
@@ -20,4 +21,5 @@ module "instance" {
   user_data            = module.user_data.install_sh
   iam_instance_profile = var.instance_profile_name
   subnet_id            = module.vpc.private_subnet.id
+  tags                 = var.tags
 }

modules/agentless-scanner-role/main.tf

@@ -82,7 +82,8 @@ resource "aws_iam_role_policy_attachment" "attachment" {
 }
 
 resource "aws_iam_role_policy_attachment" "ssm-attachment" {
-  count      = var.enable_ssm ? 1 : 0
+  count = var.enable_ssm ? 1 : 0
+
   policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
   role       = aws_iam_role.role.name
 }

modules/agentless-scanner-role/variables.tf

@@ -28,14 +28,14 @@ variable "kms_key_arn" {
   default     = null
 }
 
-variable "tags" {
-  description = "A map of additional tags to add to the IAM role/profile created"
-  type        = map(string)
-  default     = {}
-}
-
 variable "enable_ssm" {
   description = "Whether to enable AWS SSM to facilitate executing troubleshooting commands on the instance"
   type        = bool
   default     = false
+}
+
+variable "tags" {
+  description = "A map of additional tags to add to the IAM role/profile created"
+  type        = map(string)
+  default     = {}
 }

modules/vpc/variables.tf

@@ -10,14 +10,14 @@ variable "cidr" {
   default     = "10.0.0.0/16"
 }
 
+variable "enable_ssm_vpc_endpoint" {
+  description = "Whether to enable AWS SSM VPC endpoint"
+  type        = bool
+  default     = false
+}
+
 variable "tags" {
   description = "A map of additional tags to add to the instance/volume created"
   type        = map(string)
   default     = {}
 }
-
-variable "enable_ssm_vpc_endpoint" {
-  description = "Whether to enable AWS SSM VPC endpoint"
-  type        = bool
-  default     = false
-}

variables.tf

@@ -38,4 +38,10 @@ variable "enable_ssm_vpc_endpoint" {
   description = "Whether to enable AWS SSM VPC endpoint (only applicable if enable_ssm is true)"
   type        = bool
   default     = true
+}
+
+variable "tags" {
+  description = "A map of additional tags to add to the IAM role/profile created"
+  type        = map(string)
+  default     = {}
 }