From dd1e82e4699d962ee7034f3a9d00ec570cdc07a8 Mon Sep 17 00:00:00 2001
From: gjclark <gjclark@alaska.edu>
Date: Tue, 11 Jun 2024 11:44:45 -0800
Subject: [PATCH 1/2] refactor: use aws_s3_object instead of
 aws_s3_bucket_object

---
 terraform/main.tf | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/terraform/main.tf b/terraform/main.tf
index dc2ef340..f181c3f5 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -22,21 +22,21 @@ resource "aws_s3_bucket" "lambda_source" {
   tags = merge(var.tags, { DAR = "YES" })
 }
 
-resource "aws_s3_bucket_object" "lambda_source" {
+resource "aws_s3_object" "lambda_source" {
   bucket = aws_s3_bucket.lambda_source.bucket
   key    = "${filemd5(local.lambda_source_filename)}.zip"
   source = local.lambda_source_filename
   etag   = filemd5(local.lambda_source_filename)
 }
 
-resource "aws_s3_bucket_object" "lambda_code_dependency_archive" {
+resource "aws_s3_object" "lambda_code_dependency_archive" {
   bucket = aws_s3_bucket.lambda_source.bucket
   key    = "${filemd5(local.dependency_layer_filename)}.zip"
   source = local.dependency_layer_filename
   etag   = filemd5(local.dependency_layer_filename)
 }
 
-resource "aws_s3_bucket_object" "cloudformation_template" {
+resource "aws_s3_object" "cloudformation_template" {
   bucket = aws_s3_bucket.lambda_source.bucket
   key    = "${filemd5(local.cloudformation_template_filename)}.yaml"
   source = local.cloudformation_template_filename
@@ -45,12 +45,12 @@ resource "aws_s3_bucket_object" "cloudformation_template" {
 
 resource "aws_cloudformation_stack" "thin_egress_app" {
   depends_on = [
-    aws_s3_bucket_object.lambda_source,
-    aws_s3_bucket_object.lambda_code_dependency_archive,
-    aws_s3_bucket_object.cloudformation_template
+    aws_s3_object.lambda_source,
+    aws_s3_object.lambda_code_dependency_archive,
+    aws_s3_object.cloudformation_template
   ]
   name         = substr(var.stack_name, 0, 36)
-  template_url = "https://s3.amazonaws.com/${aws_s3_bucket_object.lambda_source.bucket}/${aws_s3_bucket_object.cloudformation_template.key}"
+  template_url = "https://s3.amazonaws.com/${aws_s3_object.lambda_source.bucket}/${aws_s3_object.cloudformation_template.key}"
   capabilities = ["CAPABILITY_NAMED_IAM"]
   parameters = {
     AuthBaseUrl                     = var.auth_base_url
@@ -67,9 +67,9 @@ resource "aws_cloudformation_stack" "thin_egress_app" {
     HtmlTemplateDir                 = var.html_template_dir
     JwtAlgo                         = var.jwt_algo
     JwtKeySecretName                = var.jwt_secret_name
-    LambdaCodeDependencyArchive     = aws_s3_bucket_object.lambda_code_dependency_archive.key
-    LambdaCodeS3Bucket              = aws_s3_bucket_object.lambda_source.bucket
-    LambdaCodeS3Key                 = aws_s3_bucket_object.lambda_source.key
+    LambdaCodeDependencyArchive     = aws_s3_object.lambda_code_dependency_archive.key
+    LambdaCodeS3Bucket              = aws_s3_object.lambda_source.bucket
+    LambdaCodeS3Key                 = aws_s3_object.lambda_source.key
     LambdaTimeout                   = var.lambda_timeout
     LambdaMemory                    = var.lambda_memory
     Loglevel                        = var.log_level

From d0c2d3c61442c9214daa69800d706629d73a6d84 Mon Sep 17 00:00:00 2001
From: gjclark <gjclark@alaska.edu>
Date: Wed, 12 Jun 2024 12:33:00 -0800
Subject: [PATCH 2/2] feat: Add a providers.tf

---
 .gitignore             | 1 -
 terraform/providers.tf | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 terraform/providers.tf

diff --git a/.gitignore b/.gitignore
index 5750a8d9..07be84ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 
 # Tools
 .terraform
-/terraform/providers.tf
 terraform.tfstate*
 *.tfvars
 /thin_egress_app/.chalice
diff --git a/terraform/providers.tf b/terraform/providers.tf
new file mode 100644
index 00000000..9bcc73a9
--- /dev/null
+++ b/terraform/providers.tf
@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 4.0"
+    }
+  }
+}