From 8f1ab220f45866ca41301b755db674d37a569941 Mon Sep 17 00:00:00 2001
From: arnol377 <david.j.arnold.jr@census.gov>
Date: Tue, 21 Jan 2025 12:52:41 -0500
Subject: [PATCH] Refactor Terraform workflows and lock file

- Remove branch restriction for workflow triggers
- Update concurrency settings in workflows
- Update AWS provider version in .terraform.lock.hcl
- Move amazon_linux module to separate file
---
 .../workflows/terraform-apply-csvd-dev-ew.yml |  3 --
 .../workflows/terraform-plan-csvd-dev-ew.yml  |  3 --
 .terraform.lock.hcl                           | 32 +++++++++----------
 linux.tf.tmp => amazon_linux.tf               |  0
 main.tf                                       |  2 +-
 5 files changed, 17 insertions(+), 23 deletions(-)
 rename linux.tf.tmp => amazon_linux.tf (100%)

diff --git a/.github/workflows/terraform-apply-csvd-dev-ew.yml b/.github/workflows/terraform-apply-csvd-dev-ew.yml
index 2f98403..899e403 100644
--- a/.github/workflows/terraform-apply-csvd-dev-ew.yml
+++ b/.github/workflows/terraform-apply-csvd-dev-ew.yml
@@ -1,9 +1,6 @@
 name: Csvd-Dev-Ew - Terraform Apply
 
 on:
-  push:
-    branches:
-      - main
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/terraform-plan-csvd-dev-ew.yml b/.github/workflows/terraform-plan-csvd-dev-ew.yml
index 620b2fa..bc813ac 100644
--- a/.github/workflows/terraform-plan-csvd-dev-ew.yml
+++ b/.github/workflows/terraform-plan-csvd-dev-ew.yml
@@ -1,9 +1,6 @@
 name: Csvd-Dev-Ew - Terraform Plan
 
 on:
-  pull_request:
-    branches:
-      - main
   workflow_dispatch:
 
 concurrency:
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index 422fb94..a5a344c 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -2,25 +2,25 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "5.83.1"
+  version     = "5.84.0"
   constraints = ">= 4.20.1"
   hashes = [
-    "h1:vInFMDq9oMs53/i+7IU8hZgmTLhFfng8L8kbuALZxSI=",
-    "zh:0313253c78f195973752c4d1f62bfdd345a9c99c1bc7a612a8c1f1e27d51e49e",
-    "zh:108523f3e9ebc93f7d900c51681f6edbd3f3a56b8a62b0afc31d8214892f91e0",
-    "zh:175b9bf2a00bea6ac1c73796ad77b0e00dcbbde166235017c49377d7763861d8",
-    "zh:1c8bf55b8548bbad683cd6d7bdb03e8840a00b2422dc1529ffb9892820657130",
-    "zh:22338f09bae62d5ff646de00182417f992548da534fee7d98c5d0136d4bd5d7a",
-    "zh:92de1107ec43de60612be5f6255616f16a9cf82d88df1af1c0471b81f3a82c16",
+    "h1:dwpeFUdcxgXVAc0JSqO57xf0/r2qOBLPloombCQWFz8=",
+    "zh:078f77438aba6ec8bf9154b7d223e5c71c48d805d6cd3bcf9db0cc1e82668ac3",
+    "zh:1f6591ff96be00501e71b792ed3a5a14b21ff03afec9a1c4a3fd9300e6e5b674",
+    "zh:2ab694e022e81dd74485351c5836148a842ed71cf640664c9d871cb517b09602",
+    "zh:33c8ccb6e3dc496e828a7572dd981366c6271075c1189f249b9b5236361d7eff",
+    "zh:6f31068ebad1d627e421c72ccdaafe678c53600ca73714e977bf45ff43ae5d17",
+    "zh:7488623dccfb639347cae66f9001d39cf06b92e8081975235a1ac3a0ac3f44aa",
+    "zh:7f042b78b9690a8725c95b91a70fc8e264011b836605bcc342ac297b9ea3937d",
+    "zh:88b56ac6c7209dc0a775b79975a371918f3aed8f015c37d5899f31deff37c61a",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:9c7bfb7afea330e6d90e1466125a8cba3db1ed4043c5da52f737459c89290a6e",
-    "zh:ba59b374d477e5610674b70f5abfe0408e8f809390347372751384151440d3d0",
-    "zh:bd1c433966002f586d63cb1e3e16326991f238bc6beeb2352be36ec651917b0b",
-    "zh:ca2b4d1d02651c15261fffa4b142e45def9a22c6069353f0f663fd2046e268f8",
-    "zh:d8ed98c748f7a3f1a72277cfee9afe346aca39ab319d17402277852551d8f14a",
-    "zh:ed3d8bc89de5f35f3c5f4802ff7c749fda2e2be267f9af4a850694f099960a72",
-    "zh:f698732a4391c3f4d7079b4aaa52389da2a460cac5eed438ed688f147d603689",
-    "zh:f9f51b17f2978394954e9f6ab9ef293b8e11f1443117294ccf87f7f8212b3439",
+    "zh:a1979ba840d704af0932f8de5f541cbb4caa9b6bbd25ed552a24e6772175ba07",
+    "zh:b058c0533dae580e69d1adbc1f69e6a80632374abfc10e8634d06187a108e87b",
+    "zh:c88610af9cf957f8dcf4382e0c9ca566ef10e3290f5de01d4d90b2d81b078aa8",
+    "zh:e9562c055a2247d0c287772b55abef468c79f8d66a74780fe1c5e5dae1a284a9",
+    "zh:f7a7c71d28441d925a25c08c4485c015b2d9f0338bc9707443e91ff8e161d3d9",
+    "zh:fee533e81976d0900aa6fa443dc54ef171cbd901847f28a6e8edb1d161fa6fde",
   ]
 }
 
diff --git a/linux.tf.tmp b/amazon_linux.tf
similarity index 100%
rename from linux.tf.tmp
rename to amazon_linux.tf
diff --git a/main.tf b/main.tf
index 7d336e4..e9b8c36 100644
--- a/main.tf
+++ b/main.tf
@@ -19,7 +19,7 @@ data "aws_iam_policy_document" "assets_bucket_policy_document" {
     principals {
       type = "AWS"
       identifiers = [
-        # module.amazon_linux.iam_arn,
+        module.amazon_linux.iam_arn,
         # module.rhel.iam_arn,
         # module.docker.iam_arn,
         # module.windows.iam_arn,