From e6195aef36b5a4804f2dc65fccd9cf5c9afd11db Mon Sep 17 00:00:00 2001
From: "prisma-cloud-devsecops[bot]"
 <89982750+prisma-cloud-devsecops[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:36:46 +0000
Subject: [PATCH] Prisma Cloud [bot] commented

---
 modules/elb/elbcreate/01-create-elb.tf     |  5 ++-
 modules/iam/01-master-role.tf              |  6 ++++
 modules/iam/02-kubenode-role.tf            |  6 ++++
 modules/kubernetes/etcd/01-smilodon-ebs.tf | 15 +++++++--
 modules/kubernetes/etcd/02-smilodon-eni.tf |  9 ++++++
 modules/route53/main.tf                    | 15 +++++----
 modules/s3/02-s3bucket.tf                  |  8 ++++-
 modules/s3/03-s3certobjects.tf             | 36 ++++++++++++++++++++++
 modules/s3/04-s3kubemanifests.tf           | 16 ++++++++--
 modules/security/01-KubemasterSG.tf        |  9 ++++--
 modules/security/02-KubenodeSG.tf          |  9 ++++--
 modules/security/04-BastionSG.tf           |  9 ++++--
 modules/security/05-ELBSG.tf               |  9 ++++--
 modules/vpc/01-vpc.tf                      | 26 ++++++++++++++--
 modules/vpc/02-routetables.tf              | 30 ++++++++++++++----
 modules/vpc/03-subnets.tf                  | 24 +++++++++++----
 modules/vpc/04-keypair.tf                  |  3 ++
 17 files changed, 196 insertions(+), 39 deletions(-)

diff --git a/modules/elb/elbcreate/01-create-elb.tf b/modules/elb/elbcreate/01-create-elb.tf
index 25295af..ad91513 100644
--- a/modules/elb/elbcreate/01-create-elb.tf
+++ b/modules/elb/elbcreate/01-create-elb.tf
@@ -20,8 +20,11 @@ resource "aws_elb" "kube_master" {
   }
 
   tags {
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
     Name              = "${var.elb_name}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "cdf867cb-b069-4f65-97e3-220eacf499d4"
+  }
 }
diff --git a/modules/iam/01-master-role.tf b/modules/iam/01-master-role.tf
index ede24b1..0cc0bbb 100644
--- a/modules/iam/01-master-role.tf
+++ b/modules/iam/01-master-role.tf
@@ -3,6 +3,9 @@ resource "aws_iam_role" "master_role" {
   name               = "${var.master_role_name}"
   path               = "/"
   assume_role_policy = "${file("${path.module}/Files/master-role.json")}"
+  tags = {
+    yor_trace = "9c6ea8d0-c567-4bf8-ad90-23a23d0fbbff"
+  }
 }
 
 data "template_file" "master_policy" {
@@ -24,4 +27,7 @@ resource "aws_iam_instance_profile" "master_profile" {
   depends_on = ["aws_iam_role.master_role", "aws_iam_role_policy.master_policy"]
   name       = "master_profile"
   role       = "${aws_iam_role.master_role.name}"
+  tags = {
+    yor_trace = "f724ce26-aa98-45fc-97d6-4525aca7c74c"
+  }
 }
diff --git a/modules/iam/02-kubenode-role.tf b/modules/iam/02-kubenode-role.tf
index 569bbe7..8147611 100644
--- a/modules/iam/02-kubenode-role.tf
+++ b/modules/iam/02-kubenode-role.tf
@@ -3,6 +3,9 @@ resource "aws_iam_role" "worker_role" {
   name               = "${var.worker_role_name}"
   path               = "/"
   assume_role_policy = "${file("${path.module}/Files/worker-role.json")}"
+  tags = {
+    yor_trace = "0e1a6d3a-24d3-4a89-9834-8582d69b9954"
+  }
 }
 
 data "template_file" "worker_policy" {
@@ -24,4 +27,7 @@ resource "aws_iam_instance_profile" "worker_profile" {
   depends_on = ["aws_iam_role.worker_role", "aws_iam_role_policy.worker_policy"]
   name       = "worker_profile"
   role       = "${aws_iam_role.worker_role.name}"
+  tags = {
+    yor_trace = "eb69d136-38ae-4923-b607-f122dc9cb5e1"
+  }
 }
diff --git a/modules/kubernetes/etcd/01-smilodon-ebs.tf b/modules/kubernetes/etcd/01-smilodon-ebs.tf
index dd6a515..9c3b407 100644
--- a/modules/kubernetes/etcd/01-smilodon-ebs.tf
+++ b/modules/kubernetes/etcd/01-smilodon-ebs.tf
@@ -10,11 +10,14 @@ resource "aws_ebs_volume" "etcd_volumes_az1" {
   tags {
     Role              = "etcd-data"
     Env               = "${var.environment}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
     Name              = "${var.environment}-etcd-node${count.index}"
     NodeID            = "${count.index}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "34c5aa44-ca17-4882-8fbf-487acb6a8009"
+  }
 }
 
 resource "aws_ebs_volume" "etcd_volumes_az2" {
@@ -28,11 +31,14 @@ resource "aws_ebs_volume" "etcd_volumes_az2" {
   tags {
     Role              = "etcd-data"
     Env               = "${var.environment}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
     Name              = "${var.environment}-etcd-node${count.index}"
     NodeID            = "${count.index + aws_ebs_volume.etcd_volumes_az1.count}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "a5f9a4a6-5d18-4414-a511-8be9f4c66cca"
+  }
 }
 
 resource "aws_ebs_volume" "etcd_volumes_az3" {
@@ -46,9 +52,12 @@ resource "aws_ebs_volume" "etcd_volumes_az3" {
   tags {
     Role              = "etcd-data"
     Env               = "${var.environment}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
     Name              = "${var.environment}-etcd-node${count.index}"
     NodeID            = "${count.index + aws_ebs_volume.etcd_volumes_az1.count + aws_ebs_volume.etcd_volumes_az2.count}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "c2716d20-86f0-4387-b8d2-01f33198b35c"
+  }
 }
diff --git a/modules/kubernetes/etcd/02-smilodon-eni.tf b/modules/kubernetes/etcd/02-smilodon-eni.tf
index 3cadc43..2159193 100644
--- a/modules/kubernetes/etcd/02-smilodon-eni.tf
+++ b/modules/kubernetes/etcd/02-smilodon-eni.tf
@@ -15,6 +15,9 @@ resource "aws_network_interface" "etcd_eni_az1" {
     Role    = "etcd-eni"
     Service = "etcd"
   }
+  tags = {
+    yor_trace = "db898c43-0e31-4ec8-a31f-5a287786ee79"
+  }
 }
 
 ## Etcd ENI Interfaces
@@ -34,6 +37,9 @@ resource "aws_network_interface" "etcd_eni_az2" {
     Role    = "etcd-eni"
     Service = "etcd"
   }
+  tags = {
+    yor_trace = "e7e31edb-b62b-445e-b57d-74029ae50711"
+  }
 }
 
 ## Etcd ENI Interfaces
@@ -53,4 +59,7 @@ resource "aws_network_interface" "etcd_eni_az3" {
     Role    = "etcd-eni"
     Service = "etcd"
   }
+  tags = {
+    yor_trace = "8c8601a9-fc2a-41cf-8a37-571bb3ec8003"
+  }
 }
diff --git a/modules/route53/main.tf b/modules/route53/main.tf
index 5f7371f..b4eecc9 100644
--- a/modules/route53/main.tf
+++ b/modules/route53/main.tf
@@ -1,22 +1,25 @@
 resource "aws_route53_zone" "internal" {
   comment = "Kubernetes cluster DNS (internal)"
-  name    = "${ var.internal-tld }"
+  name    = "${var.internal-tld}"
 
   tags {
     builtWith         = "terraform"
-    KubernetesCluster = "${ var.cluster-name }"
-    Name              = "k8s-${ var.cluster-name }"
+    KubernetesCluster = "${var.cluster-name}"
+    Name              = "k8s-${var.cluster-name}"
   }
 
-  vpc_id = "${ var.vpcid }"
+  vpc_id = "${var.vpcid}"
+  tags = {
+    yor_trace = "15d24864-f0af-42f0-b25f-29e9ea0bf848"
+  }
 }
 
 resource "aws_route53_record" "CNAME-master" {
   name    = "master"
-  records = ["etcd.${ var.internal-tld }"]
+  records = ["etcd.${var.internal-tld}"]
   ttl     = "300"
   type    = "CNAME"
-  zone_id = "${ aws_route53_zone.internal.zone_id }"
+  zone_id = "${aws_route53_zone.internal.zone_id}"
 }
 
 resource "null_resource" "dummy_dependency" {
diff --git a/modules/s3/02-s3bucket.tf b/modules/s3/02-s3bucket.tf
index 4cdb951..802829b 100644
--- a/modules/s3/02-s3bucket.tf
+++ b/modules/s3/02-s3bucket.tf
@@ -3,6 +3,9 @@ resource "aws_kms_key" "kubekms" {
   description             = "KMS key 1"
   deletion_window_in_days = 7
   policy                  = "${data.template_file.kmspolicy.rendered}"
+  tags = {
+    yor_trace = "89cc8f08-6cee-46cc-957a-d101ca33e2dd"
+  }
 }
 
 resource "aws_s3_bucket" "kubebucket" {
@@ -14,6 +17,9 @@ resource "aws_s3_bucket" "kubebucket" {
   tags {
     Name              = "Kubebucket"
     Environment       = "Dev"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "4c07542c-9dab-465e-9bd1-c277788f779a"
   }
 }
diff --git a/modules/s3/03-s3certobjects.tf b/modules/s3/03-s3certobjects.tf
index eaf98a8..5e9ba2a 100644
--- a/modules/s3/03-s3certobjects.tf
+++ b/modules/s3/03-s3certobjects.tf
@@ -4,6 +4,9 @@ resource "aws_s3_bucket_object" "capem" {
   key        = "${var.capem}"
   source     = "${path.cwd}/Certs/${var.capem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "ddefd3d6-6912-4e5a-9121-85e6be4cb534"
+  }
 }
 
 resource "aws_s3_bucket_object" "cakey" {
@@ -12,6 +15,9 @@ resource "aws_s3_bucket_object" "cakey" {
   key        = "${var.cakey}"
   source     = "${path.cwd}/Certs/${var.cakey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "8a41483a-cd79-4ab5-ac39-d02c571e4a92"
+  }
 }
 
 resource "aws_s3_bucket_object" "etcdpem" {
@@ -20,6 +26,9 @@ resource "aws_s3_bucket_object" "etcdpem" {
   key        = "${var.etcdpem}"
   source     = "${path.cwd}/Certs/${var.etcdpem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "ca39a641-dad7-4643-80d2-9d5d374bfa56"
+  }
 }
 
 resource "aws_s3_bucket_object" "etcdkey" {
@@ -28,6 +37,9 @@ resource "aws_s3_bucket_object" "etcdkey" {
   key        = "${var.etcdkey}"
   source     = "${path.cwd}/Certs/${var.etcdkey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "3b48aad3-fa30-4161-86ce-f570618a2ab6"
+  }
 }
 
 resource "aws_s3_bucket_object" "masterpem" {
@@ -36,6 +48,9 @@ resource "aws_s3_bucket_object" "masterpem" {
   key        = "${var.masterpem}"
   source     = "${path.cwd}/Certs/${var.masterpem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "4fd2cb7c-96ad-4235-8fbe-9d4e09059bb4"
+  }
 }
 
 resource "aws_s3_bucket_object" "masterkey" {
@@ -44,6 +59,9 @@ resource "aws_s3_bucket_object" "masterkey" {
   key        = "${var.masterkey}"
   source     = "${path.cwd}/Certs/${var.masterkey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "4d7cd18f-0afe-40a2-baef-82e2525449d0"
+  }
 }
 
 resource "aws_s3_bucket_object" "kubenodepem" {
@@ -52,6 +70,9 @@ resource "aws_s3_bucket_object" "kubenodepem" {
   key        = "${var.kubenodepem}"
   source     = "${path.cwd}/Certs/${var.kubenodepem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "90fd2976-1016-4e0c-9c8d-6d27cc415334"
+  }
 }
 
 resource "aws_s3_bucket_object" "kubenodekey" {
@@ -60,6 +81,9 @@ resource "aws_s3_bucket_object" "kubenodekey" {
   key        = "${var.kubenodekey}"
   source     = "${path.cwd}/Certs/${var.kubenodekey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "053f6f1f-84aa-462a-93e9-154d10b18cab"
+  }
 }
 
 resource "aws_s3_bucket_object" "adminpem" {
@@ -68,6 +92,9 @@ resource "aws_s3_bucket_object" "adminpem" {
   key        = "${var.adminpem}"
   source     = "${path.cwd}/Certs/${var.adminpem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "0cb689d3-2316-4085-8d70-7dbed936091e"
+  }
 }
 
 resource "aws_s3_bucket_object" "adminkey" {
@@ -76,6 +103,9 @@ resource "aws_s3_bucket_object" "adminkey" {
   key        = "${var.adminkey}"
   source     = "${path.cwd}/Certs/${var.adminkey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "d6aafbbe-832d-449a-90f8-ef90d75c7c51"
+  }
 }
 
 resource "aws_s3_bucket_object" "etcdproxypem" {
@@ -84,6 +114,9 @@ resource "aws_s3_bucket_object" "etcdproxypem" {
   key        = "${var.etcdproxypem}"
   source     = "${path.cwd}/Certs/${var.etcdproxypem}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "3da8dd38-f3ac-41db-abe2-5b55398064b1"
+  }
 }
 
 resource "aws_s3_bucket_object" "etcdproxykey" {
@@ -92,4 +125,7 @@ resource "aws_s3_bucket_object" "etcdproxykey" {
   key        = "${var.etcdproxykey}"
   source     = "${path.cwd}/Certs/${var.etcdproxykey}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "a52e50e8-f853-47d6-a15a-8828b5f29173"
+  }
 }
diff --git a/modules/s3/04-s3kubemanifests.tf b/modules/s3/04-s3kubemanifests.tf
index 4ae1fe6..cd58bdd 100644
--- a/modules/s3/04-s3kubemanifests.tf
+++ b/modules/s3/04-s3kubemanifests.tf
@@ -4,6 +4,9 @@ resource "aws_s3_bucket_object" "kube-apiserver" {
   key        = "Manifests/kube-apiserver.yml"
   content    = "${data.template_file.kube-apiserver.rendered}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "660843d2-ee93-4ad7-b28e-eee2718c11da"
+  }
 }
 
 resource "aws_s3_bucket_object" "kube-controllermanager" {
@@ -12,6 +15,9 @@ resource "aws_s3_bucket_object" "kube-controllermanager" {
   key        = "Manifests/kube-controller-manager.yml"
   content    = "${data.template_file.kube-controllermanager.rendered}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "ba696e5f-fedb-416f-b02a-04d4929a77aa"
+  }
 }
 
 resource "aws_s3_bucket_object" "kube-proxy" {
@@ -20,6 +26,9 @@ resource "aws_s3_bucket_object" "kube-proxy" {
   key        = "Manifests/kube-proxy.yml"
   content    = "${data.template_file.kube-proxy.rendered}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "44b3a7eb-edb5-4fed-ba7c-35af4141eb07"
+  }
 }
 
 resource "aws_s3_bucket_object" "kube-scheduler" {
@@ -28,6 +37,9 @@ resource "aws_s3_bucket_object" "kube-scheduler" {
   key        = "Manifests/kube-scheduler.yml"
   content    = "${data.template_file.kube-scheduler.rendered}"
   kms_key_id = "${aws_kms_key.kubekms.arn}"
+  tags = {
+    yor_trace = "85a7cfe8-b41d-4533-8267-f0142ce8763c"
+  }
 }
 
 data "template_file" "kube-apiserver" {
@@ -35,14 +47,14 @@ data "template_file" "kube-apiserver" {
 
   vars {
     kubernetes_image         = "${var.kubernetes_image}"
-    etcd_memberlist          = "${join(",", concat(formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az1), values(var.etcd_nodes_az1)), formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az2), values(var.etcd_nodes_az2)), formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az3), values(var.etcd_nodes_az3)) ))}"
+    etcd_memberlist          = "${join(",", concat(formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az1), values(var.etcd_nodes_az1)), formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az2), values(var.etcd_nodes_az2)), formatlist("%s=https://%s:2380", keys(var.etcd_nodes_az3), values(var.etcd_nodes_az3))))}"
     service-cluster-ip-range = "${var.service-cluster-ip-range}"
     mastercertobject         = "${var.masterpem}"
     masterkeyobject          = "${var.masterkey}"
     cacertobject             = "${var.capem}"
     etcdcertobject           = "${var.etcdpem}"
     etcdkeyobject            = "${var.etcdkey}"
-    apiservercount           = "${var.etcd_asg_maxsize_az1 + var.etcd_asg_maxsize_az2 + var.etcd_asg_maxsize_az3 }"
+    apiservercount           = "${var.etcd_asg_maxsize_az1 + var.etcd_asg_maxsize_az2 + var.etcd_asg_maxsize_az3}"
   }
 }
 
diff --git a/modules/security/01-KubemasterSG.tf b/modules/security/01-KubemasterSG.tf
index e689262..0027a69 100644
--- a/modules/security/01-KubemasterSG.tf
+++ b/modules/security/01-KubemasterSG.tf
@@ -23,12 +23,15 @@ resource "aws_security_group" "kubemaster" {
   egress {
     from_port   = 0
     to_port     = 0
-    protocol    = "-1"          # for all protocols
+    protocol    = "-1" # for all protocols
     cidr_blocks = ["0.0.0.0/0"]
   }
   tags {
-    KubernetesCluster = "${ var.name }"
-    Name              = "Master-k8s-${ var.name }"
+    KubernetesCluster = "${var.name}"
+    Name              = "Master-k8s-${var.name}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "973a126a-4570-4c44-8967-d1b2cad25c27"
+  }
 }
diff --git a/modules/security/02-KubenodeSG.tf b/modules/security/02-KubenodeSG.tf
index 0fed286..c3cbc5c 100644
--- a/modules/security/02-KubenodeSG.tf
+++ b/modules/security/02-KubenodeSG.tf
@@ -23,12 +23,15 @@ resource "aws_security_group" "kubenode" {
   egress {
     from_port   = 0
     to_port     = 0
-    protocol    = "-1"          # for all protocols
+    protocol    = "-1" # for all protocols
     cidr_blocks = ["0.0.0.0/0"]
   }
   tags {
-    KubernetesCluster = "${ var.name }"
-    Name              = "Kubenode-k8s-${ var.name }"
+    KubernetesCluster = "${var.name}"
+    Name              = "Kubenode-k8s-${var.name}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "d8b572be-3c61-443c-af14-c77577df7564"
+  }
 }
diff --git a/modules/security/04-BastionSG.tf b/modules/security/04-BastionSG.tf
index e3b0e3d..d635ec2 100644
--- a/modules/security/04-BastionSG.tf
+++ b/modules/security/04-BastionSG.tf
@@ -29,12 +29,15 @@ resource "aws_security_group" "bastion" {
   egress {
     from_port   = 0
     to_port     = 0
-    protocol    = "-1"          # for all protocols
+    protocol    = "-1" # for all protocols
     cidr_blocks = ["0.0.0.0/0"]
   }
   tags {
-    KubernetesCluster = "${ var.name }"
-    Name              = "Bastion-k8s-${ var.name }"
+    KubernetesCluster = "${var.name}"
+    Name              = "Bastion-k8s-${var.name}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "968f8d7c-c6dc-45b2-a81d-05c099a4db66"
+  }
 }
diff --git a/modules/security/05-ELBSG.tf b/modules/security/05-ELBSG.tf
index 1e52c72..5034afe 100644
--- a/modules/security/05-ELBSG.tf
+++ b/modules/security/05-ELBSG.tf
@@ -27,12 +27,15 @@ resource "aws_security_group" "elb" {
   egress {
     from_port       = 0
     to_port         = 0
-    protocol        = "-1"                                    # for all protocols
+    protocol        = "-1" # for all protocols
     security_groups = ["${aws_security_group.kubemaster.id}"]
   }
   tags {
-    KubernetesCluster = "${ var.name }"
-    Name              = "ELB-k8s-${ var.name }"
+    KubernetesCluster = "${var.name}"
+    Name              = "ELB-k8s-${var.name}"
     builtWith         = "terraform"
   }
+  tags = {
+    yor_trace = "52b721b1-abba-4f4d-b74d-b3e8804b592f"
+  }
 }
diff --git a/modules/vpc/01-vpc.tf b/modules/vpc/01-vpc.tf
index 0cb0c57..e157933 100644
--- a/modules/vpc/01-vpc.tf
+++ b/modules/vpc/01-vpc.tf
@@ -5,7 +5,8 @@ resource "aws_vpc" "vpc" {
 
   tags = {
     Name              = "TerraKubeVPC"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+    yor_trace         = "b720ebe9-6b50-40fa-884a-4ddc7a530cd6"
   }
 }
 
@@ -15,7 +16,10 @@ resource "aws_internet_gateway" "internet-gateway" {
 
   tags {
     Name              = "TerraKubeInternetGateway"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "e4e9f8ec-bc85-4207-af50-497a880a7837"
   }
 }
 
@@ -23,16 +27,25 @@ resource "aws_internet_gateway" "internet-gateway" {
 resource "aws_eip" "nat1" {
   vpc        = true
   depends_on = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "678f07d9-096d-44f8-b963-a89523d30453"
+  }
 }
 
 resource "aws_eip" "nat2" {
   vpc        = true
   depends_on = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "748344dc-fe80-4cda-a2b4-91ee5c28dc8c"
+  }
 }
 
 resource "aws_eip" "nat3" {
   vpc        = true
   depends_on = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "f84fc527-87ff-4cb7-b71d-12ddc8d8df10"
+  }
 }
 
 #Create NAT gateways for each AZ and it will depend on the internet gateway creation
@@ -40,16 +53,25 @@ resource "aws_nat_gateway" "nat1" {
   allocation_id = "${aws_eip.nat1.id}"
   subnet_id     = "${aws_subnet.public1.id}"
   depends_on    = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "81d44a80-adaa-4eee-a7b6-a5d93eb77fcd"
+  }
 }
 
 resource "aws_nat_gateway" "nat2" {
   allocation_id = "${aws_eip.nat2.id}"
   subnet_id     = "${aws_subnet.public2.id}"
   depends_on    = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "652b8ed7-7062-4173-b5e2-041c11db9ef6"
+  }
 }
 
 resource "aws_nat_gateway" "nat3" {
   allocation_id = "${aws_eip.nat3.id}"
   subnet_id     = "${aws_subnet.public3.id}"
   depends_on    = ["aws_internet_gateway.internet-gateway"]
+  tags = {
+    yor_trace = "ae97869b-c406-42c0-b335-97e8a217c0c7"
+  }
 }
diff --git a/modules/vpc/02-routetables.tf b/modules/vpc/02-routetables.tf
index a3e600c..c589ee9 100644
--- a/modules/vpc/02-routetables.tf
+++ b/modules/vpc/02-routetables.tf
@@ -4,7 +4,10 @@ resource "aws_route_table" "public1_route_table" {
 
   tags {
     Name              = "TerraKube Public1 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "3d3a7a53-6ff5-4df6-a436-0d76429c895d"
   }
 }
 
@@ -13,7 +16,10 @@ resource "aws_route_table" "public2_route_table" {
 
   tags {
     Name              = "TerraKube Public2 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "f8a489a1-df5b-40cb-b4f2-41388ca5955a"
   }
 }
 
@@ -22,7 +28,10 @@ resource "aws_route_table" "public3_route_table" {
 
   tags {
     Name              = "TerraKube Public3 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "2f1e123c-4dba-4ebc-850f-2b1bd9c9d66a"
   }
 }
 
@@ -51,7 +60,10 @@ resource "aws_route_table" "private1_route_table" {
 
   tags {
     Name              = "TerraKube Private1 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "9d89ab59-0996-4f42-a71d-54b6fce1dd21"
   }
 }
 
@@ -60,7 +72,10 @@ resource "aws_route_table" "private2_route_table" {
 
   tags {
     Name              = "TerraKube Private2 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "daea470c-aa56-49a3-8e98-48775999fc18"
   }
 }
 
@@ -69,7 +84,10 @@ resource "aws_route_table" "private3_route_table" {
 
   tags {
     Name              = "TerraKube Private3 route table"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "3a67e5b2-8dc6-4ebd-87d8-c50ebdba1c4c"
   }
 }
 
diff --git a/modules/vpc/03-subnets.tf b/modules/vpc/03-subnets.tf
index 116f1e2..8bea7bb 100644
--- a/modules/vpc/03-subnets.tf
+++ b/modules/vpc/03-subnets.tf
@@ -8,7 +8,10 @@ resource "aws_subnet" "public1" {
 
   tags {
     Name              = "Terrakube public subnet ${lookup(var.subnetaz1, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "37d775b7-1e8e-49bc-9d7e-c1e0d33f67a8"
   }
 }
 
@@ -20,7 +23,10 @@ resource "aws_subnet" "public2" {
 
   tags {
     Name              = "Terrakube public subnet ${lookup(var.subnetaz2, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "500d5213-3308-4e0a-af8b-d9ad58ff30e3"
   }
 }
 
@@ -32,7 +38,10 @@ resource "aws_subnet" "public3" {
 
   tags {
     Name              = "Terrakube public subnet ${lookup(var.subnetaz3, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+  }
+  tags = {
+    yor_trace = "0faf196f-9299-4a4d-8e6a-02c5ec58512e"
   }
 }
 
@@ -45,7 +54,8 @@ resource "aws_subnet" "private1" {
 
   tags = {
     Name              = "Terraform private subnet ${lookup(var.subnetaz1, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+    yor_trace         = "992b4202-afe6-416a-8c99-49ebcfc87096"
   }
 }
 
@@ -56,7 +66,8 @@ resource "aws_subnet" "private2" {
 
   tags = {
     Name              = "Terraform private subnet ${lookup(var.subnetaz2, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+    yor_trace         = "e768211e-fb4a-4d35-8926-5779ade406a3"
   }
 }
 
@@ -67,7 +78,8 @@ resource "aws_subnet" "private3" {
 
   tags = {
     Name              = "Terraform private subnet ${lookup(var.subnetaz3, var.adminregion)}"
-    KubernetesCluster = "${ var.name }"
+    KubernetesCluster = "${var.name}"
+    yor_trace         = "5d7bc2d2-d17b-48ea-aa7c-7b941fea552d"
   }
 }
 
diff --git a/modules/vpc/04-keypair.tf b/modules/vpc/04-keypair.tf
index e5fd0eb..32da6f6 100644
--- a/modules/vpc/04-keypair.tf
+++ b/modules/vpc/04-keypair.tf
@@ -2,4 +2,7 @@
 resource "aws_key_pair" "auth" {
   key_name   = "${var.key_name}"
   public_key = "${file(var.public_key_path)}"
+  tags = {
+    yor_trace = "17a1e60f-db02-43ae-afcc-20a8bc22198b"
+  }
 }