Merge pull request #5582 from hashicorp/backport/moduli-e2e-encryption/firstly-sacred-adder

hc-github-team-secure-boundary · web-flow · commit f9a59c1424d2 · 2025-03-06T09:55:52.000-05:00
This pull request was automerged via backport-assistant
diff --git a/enos/modules/aws_boundary/boundary-instances.tf b/enos/modules/aws_boundary/boundary-instances.tf
@@ -20,6 +20,7 @@ resource "aws_instance" "controller" {
     volume_type = var.controller_ebs_type
     throughput  = var.controller_ebs_throughput
     tags        = local.common_tags
+    encrypted   = true
   }
 
   tags = merge(local.common_tags,
@@ -46,6 +47,7 @@ resource "aws_instance" "worker" {
     volume_type = var.worker_ebs_type
     throughput  = var.worker_ebs_throughput
     tags        = local.common_tags
+    encrypted   = true
   }
 
   tags = merge(local.common_tags,
diff --git a/enos/modules/aws_worker/main.tf b/enos/modules/aws_worker/main.tf
@@ -139,6 +139,7 @@ resource "aws_instance" "worker" {
     volume_type = var.ebs_type
     throughput  = var.ebs_throughput
     tags        = local.common_tags
+    encrypted   = true
   }
 
   tags = merge(

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ resource "aws_instance" "controller" {`
`20`	`20`	`volume_type = var.controller_ebs_type`
`21`	`21`	`throughput = var.controller_ebs_throughput`
`22`	`22`	`tags = local.common_tags`
	`23`	`+ encrypted = true`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`tags = merge(local.common_tags,`
`@@ -46,6 +47,7 @@ resource "aws_instance" "worker" {`
`46`	`47`	`volume_type = var.worker_ebs_type`
`47`	`48`	`throughput = var.worker_ebs_throughput`
`48`	`49`	`tags = local.common_tags`
	`50`	`+ encrypted = true`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`tags = merge(local.common_tags,`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ resource "aws_instance" "worker" {`
`139`	`139`	`volume_type = var.ebs_type`
`140`	`140`	`throughput = var.ebs_throughput`
`141`	`141`	`tags = local.common_tags`
	`142`	`+ encrypted = true`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`tags = merge(`