From dd7e7d6eb757681100d5f12d3a6007b73409ee03 Mon Sep 17 00:00:00 2001
From: lolli001 <braxton.r.lollis@census.gov>
Date: Tue, 23 Jul 2024 17:57:48 -0400
Subject: [PATCH] Updated

---
 iam_policy.tf                        | 4 ++--
 kms.tf                               | 9 +++++----
 modules/image-pipeline/build.pkr.hcl | 9 ++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/iam_policy.tf b/iam_policy.tf
index 8f29ce0..75f243a 100644
--- a/iam_policy.tf
+++ b/iam_policy.tf
@@ -85,7 +85,7 @@ resource "aws_iam_policy" "rhel_x86_codepipeline_permissions" {
           "kms:GenerateDataKey",
           "kms:DescribeKey"
         ],
-        Resource = "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/${aws_kms_key.rhel_x86_codepipeline_key.id}"
+        Resource = "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"
       },
       {
         Effect = "Allow",
@@ -168,7 +168,7 @@ resource "aws_iam_policy" "rhel_x86_ec2_permissions" {
           "kms:GenerateDataKey",
           "kms:DescribeKey"
         ],
-        Resource = "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/${aws_kms_key.rhel_x86_codepipeline_key.id}"
+        Resource = "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"
       }
     ]
   })
diff --git a/kms.tf b/kms.tf
index ac84978..e0491c1 100644
--- a/kms.tf
+++ b/kms.tf
@@ -1,5 +1,6 @@
 resource "aws_kms_key" "rhel_x86_codepipeline_key" {
   description = "KMS key for RHEL x86 CodePipeline"
+  key_id = "ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"  # Static KMS Key ID
   policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -20,7 +21,7 @@ resource "aws_kms_key" "rhel_x86_codepipeline_key" {
         "kms:GenerateDataKey*",
         "kms:DescribeKey"
       ],
-      "Resource": "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/${aws_kms_key.rhel_x86_codepipeline_key.id}"
+      "Resource": "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"
     },
     {
       "Sid": "Allow admin actions",
@@ -29,7 +30,7 @@ resource "aws_kms_key" "rhel_x86_codepipeline_key" {
         "AWS": "arn:aws-us-gov:iam::229685449397:root"
       },
       "Action": "kms:*",
-      "Resource": "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/${aws_kms_key.rhel_x86_codepipeline_key.id}"
+      "Resource": "arn:aws-us-gov:kms:us-gov-west-1:229685449397:key/ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"
     }
   ]
 }
@@ -38,5 +39,5 @@ EOF
 
 resource "aws_kms_alias" "rhel_x86_codepipeline_alias" {
   name          = "alias/rhel-x86-codepipeline-key"
-  target_key_id = aws_kms_key.rhel_x86_codepipeline_key.id
-}
+  target_key_id = "ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"  # Static KMS Key ID
+}
\ No newline at end of file
diff --git a/modules/image-pipeline/build.pkr.hcl b/modules/image-pipeline/build.pkr.hcl
index 2104483..fe5f278 100644
--- a/modules/image-pipeline/build.pkr.hcl
+++ b/modules/image-pipeline/build.pkr.hcl
@@ -1,15 +1,10 @@
-variable "kms_key_id" {
-  type    = string
-  default = aws_kms_key.rhel_x86_codepipeline_key.id
-}
-
 source "amazon-ebs" "rhel" {
   ami_name        = "rhel-arm-{{timestamp}}"
   instance_type   = "t3.micro"
   region          = "us-gov-west-1"
   source_ami      = "ami-03f5c6b8195c66b04"  # Updated AMI ID for RHEL 9 ARM
   ssh_username    = "ec2-user"
-  kms_key_id      = var.kms_key_id
+  kms_key_id      = "ba7dabdd-0f5a-44aa-9a90-a36c246a29a4"  # Static KMS Key ID
 }
 
 build {
@@ -24,4 +19,4 @@ build {
       "echo 'Build finished!'",
     ]
   }
-}
\ No newline at end of file
+}