Move volume_tags into dynamic blocks

This effectively removes the churn-ing that is happening when an
ebs_volume is attached separately from the module

Takes advantage of the new feature in the aws provider available as of 3.24.0.
hashicorp/terraform-provider-aws#15474

Author: dekimsey

main.tf

@@ -35,6 +35,12 @@ resource "aws_instance" "this" {
       kms_key_id            = lookup(root_block_device.value, "kms_key_id", null)
       volume_size           = lookup(root_block_device.value, "volume_size", null)
       volume_type           = lookup(root_block_device.value, "volume_type", null)
+      tags = merge(
+        {
+          "Name" = var.instance_count > 1 || var.use_num_suffix ? format("%s${var.num_suffix_format}", var.name, count.index + 1) : var.name
+        },
+        var.volume_tags,
+      )
     }
   }
 
@@ -49,6 +55,12 @@ resource "aws_instance" "this" {
       snapshot_id           = lookup(ebs_block_device.value, "snapshot_id", null)
       volume_size           = lookup(ebs_block_device.value, "volume_size", null)
       volume_type           = lookup(ebs_block_device.value, "volume_type", null)
+      tags = merge(
+        {
+          "Name" = var.instance_count > 1 || var.use_num_suffix ? format("%s${var.num_suffix_format}", var.name, count.index + 1) : var.name
+        },
+        var.volume_tags,
+      )
     }
   }
 
@@ -92,13 +104,6 @@ resource "aws_instance" "this" {
     var.tags,
   )
 
-  volume_tags = merge(
-    {
-      "Name" = var.instance_count > 1 || var.use_num_suffix ? format("%s${var.num_suffix_format}", var.name, count.index + 1) : var.name
-    },
-    var.volume_tags,
-  )
-
   credit_specification {
     cpu_credits = local.is_t_instance_type ? var.cpu_credits : null
   }

versions.tf

@@ -2,6 +2,6 @@ terraform {
   required_version = ">= 0.12.6"
 
   required_providers {
-    aws = ">= 2.65"
+    aws = ">= 3.24.0"
   }
 }