aws terraform instance naming changes

P4T12ICK · P4T12ICK · commit 2cd331b84069 · 2026-02-19T15:25:15.000+01:00
diff --git a/terraform/aws/modules/generic-server/resources.tf b/terraform/aws/modules/generic-server/resources.tf
@@ -1,6 +1,6 @@
 
 resource "aws_security_group" "this" {
-  name        = "${var.attack_range_id}-${var.server_name}-sg"
+  name        = "ar-${var.server_name}-${var.attack_range_id}-sg"
   description = "Security group allowing all ingress and egress traffic"
   vpc_id      = var.vpc_id
 
@@ -21,7 +21,7 @@ resource "aws_security_group" "this" {
   }
 
   tags = {
-    Name = "${var.attack_range_id}-${var.server_name}-sg"
+    Name = "ar-${var.server_name}-${var.attack_range_id}-sg"
   }
 }
 
@@ -42,7 +42,7 @@ resource "aws_instance" "this" {
   }
 
   tags = {
-    Name = "${var.attack_range_id}-${var.server_name}"
+    Name = "ar-${var.server_name}-${var.attack_range_id}"
   }
 }
 
diff --git a/terraform/aws/modules/network/resources.tf b/terraform/aws/modules/network/resources.tf
@@ -2,13 +2,13 @@
 data "aws_availability_zones" "available" {}
 
 locals {
-  cluster_name = "cluster_${var.attack_range_id}"
+  cluster_name = "ar_cluster_${var.attack_range_id}"
 }
 
 module "vpc" {
   source = "terraform-aws-modules/vpc/aws"
 
-  name   = "vpc_${var.attack_range_id}"
+  name   = "ar_vpc_${var.attack_range_id}"
   cidr   = "10.0.0.0/16"
   azs    = data.aws_availability_zones.available.names
 
diff --git a/terraform/aws/modules/router/resources.tf b/terraform/aws/modules/router/resources.tf
@@ -1,6 +1,6 @@
 
 resource "aws_security_group" "default" {
-  name   = "sg_router_${var.attack_range_id}"
+  name   = "ar_sg_router_${var.attack_range_id}"
   vpc_id = var.vpc_id
 
   ingress {
diff --git a/terraform/aws/modules/zeek-server/resources.tf b/terraform/aws/modules/zeek-server/resources.tf
@@ -1,6 +1,6 @@
 resource "aws_security_group" "zeek_server" {
   count       = var.zeek_server ? 1 : 0
-  name        = "${var.attack_range_id}-${var.server_name}-sg"
+  name        = "ar-${var.server_name}-${var.attack_range_id}-sg"
   description = "Security group allowing all ingress and egress traffic"
   vpc_id      = var.vpc_id
 
@@ -21,7 +21,7 @@ resource "aws_security_group" "zeek_server" {
   }
 
   tags = {
-    Name = "${var.attack_range_id}-${var.server_name}-sg"
+    Name = "ar-${var.server_name}-${var.attack_range_id}-sg"
   }
 }
 
@@ -35,7 +35,7 @@ resource "aws_instance" "zeek_sensor" {
   private_ip = var.private_ip
 
   tags = {
-    Name = "${var.attack_range_id}-${var.server_name}"
+    Name = "ar-${var.server_name}-${var.attack_range_id}"
   }
 
   root_block_device {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`resource "aws_security_group" "this" {`
`3`		`- name = "${var.attack_range_id}-${var.server_name}-sg"`
	`3`	`+ name = "ar-${var.server_name}-${var.attack_range_id}-sg"`
`4`	`4`	`description = "Security group allowing all ingress and egress traffic"`
`5`	`5`	`vpc_id = var.vpc_id`
`6`	`6`
`@@ -21,7 +21,7 @@ resource "aws_security_group" "this" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`tags = {`
`24`		`- Name = "${var.attack_range_id}-${var.server_name}-sg"`
	`24`	`+ Name = "ar-${var.server_name}-${var.attack_range_id}-sg"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`@@ -42,7 +42,7 @@ resource "aws_instance" "this" {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`tags = {`
`45`		`- Name = "${var.attack_range_id}-${var.server_name}"`
	`45`	`+ Name = "ar-${var.server_name}-${var.attack_range_id}"`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`resource "aws_security_group" "zeek_server" {`
`2`	`2`	`count = var.zeek_server ? 1 : 0`
`3`		`- name = "${var.attack_range_id}-${var.server_name}-sg"`
	`3`	`+ name = "ar-${var.server_name}-${var.attack_range_id}-sg"`
`4`	`4`	`description = "Security group allowing all ingress and egress traffic"`
`5`	`5`	`vpc_id = var.vpc_id`
`6`	`6`
`@@ -21,7 +21,7 @@ resource "aws_security_group" "zeek_server" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`tags = {`
`24`		`- Name = "${var.attack_range_id}-${var.server_name}-sg"`
	`24`	`+ Name = "ar-${var.server_name}-${var.attack_range_id}-sg"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`@@ -35,7 +35,7 @@ resource "aws_instance" "zeek_sensor" {`
`35`	`35`	`private_ip = var.private_ip`
`36`	`36`
`37`	`37`	`tags = {`
`38`		`- Name = "${var.attack_range_id}-${var.server_name}"`
	`38`	`+ Name = "ar-${var.server_name}-${var.attack_range_id}"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`root_block_device {`