remove explicit root_block_device inclusion of tags (#224)

hashicorp/terraform-provider-aws#19890 was solved upstream
dominodatalab · Mar 6, 2024 · 5ef2917 · 5ef2917
1 parent 4aa12b9
commit 5ef2917
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/modules/infra/submodules/bastion/README.md b/modules/infra/submodules/bastion/README.md
@@ -40,7 +40,6 @@ No modules.
 | [terraform_data.check_bastion_instance_profile](https://registry.terraform.io/providers/hashicorp/terraform/latest/docs/resources/data) | resource |
 | [aws_ami.amazon_linux_2](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) | data source |
 | [aws_caller_identity.aws_account](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
-| [aws_default_tags.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/default_tags) | data source |
 | [aws_iam_policy_document.bastion](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [aws_iam_policy_document.bastion_assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |

diff --git a/modules/infra/submodules/bastion/main.tf b/modules/infra/submodules/bastion/main.tf
@@ -1,6 +1,5 @@
 data "aws_partition" "current" {}
 data "aws_caller_identity" "aws_account" {}
-data "aws_default_tags" "this" {}
 
 locals {
   dns_suffix     = data.aws_partition.current.dns_suffix
@@ -186,10 +185,9 @@ resource "aws_instance" "bastion" {
     volume_size           = "40"
     volume_type           = "gp3"
     kms_key_id            = var.kms_info.enabled ? var.kms_info.key_arn : null
-    tags = merge(data.aws_default_tags.this.tags, {
+    tags = {
       "Name" = "${var.deploy_id}-bastion"
-    })
-
+    }
   }
 
   source_dest_check = true