NRL-1188 fix tf plan errors

Author: jackleary

.gitignore

@@ -42,6 +42,9 @@ override.tf.json
 *_override.tf
 *_override.tf.json
 
+# Ignore output of data object
+terraform/account-wide-infrastructure/modules/glue/files/src.zip
+
 # Include override files you do wish to add to version control using negated pattern
 #
 # !example_override.tf

terraform/account-wide-infrastructure/dev/athena.tf

@@ -1,4 +1,5 @@
 module "dev-athena" {
-  source      = "../modules/athena"
-  name_prefix = "nhsd-nrlf--dev"
+  source             = "../modules/athena"
+  name_prefix        = "nhsd-nrlf--dev"
+  target_bucket_name = module.dev-glue.target_bucket_name
 }

terraform/account-wide-infrastructure/modules/athena/athena.tf

@@ -1,7 +1,7 @@
 resource "aws_athena_database" "reporting-db" {
   name = var.database
 
-  bucket = data.aws_s3_bucket.target-data-bucket.bucket
+  bucket = var.target_bucket_name
 
   #   encryption_configuration {
   #     encryption_option = "SSE_KMS"

terraform/account-wide-infrastructure/modules/athena/s3.tf

@@ -50,7 +50,3 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "athena" {
   }
 
 }
-
-data "aws_s3_bucket" "target-data-bucket" {
-  bucket = "${var.name_prefix}-target-data-bucket"
-}

terraform/account-wide-infrastructure/modules/athena/vars.tf

@@ -1,9 +1,13 @@
 variable "database" {
   description = "What the db will be called"
-  default     = "NRL-Reporting"
+  default     = "nrl_reporting"
 }
 
 variable "name_prefix" {
   type        = string
   description = "The prefix to apply to all resources in the module."
 }
+
+variable "target_bucket_name" {
+  type = string
+}

terraform/account-wide-infrastructure/modules/glue/outputs.tf

@@ -0,0 +1,4 @@
+output "target_bucket_name" {
+  description = "Name of destination bucket"
+  value       = aws_s3_bucket.target-data-bucket.id
+}

terraform/account-wide-infrastructure/modules/glue/s3.tf

@@ -125,7 +125,7 @@ resource "aws_s3_bucket_public_access_block" "code-bucket-public-access-block" {
   restrict_public_buckets = true
 }
 
-resource "aws_s3_bucket_object" "script" {
+resource "aws_s3_object" "script" {
   bucket = aws_s3_bucket.code-bucket.bucket
   key    = "main.py"
   source = "${path.module}/src/main.py"
@@ -139,8 +139,8 @@ data "archive_file" "python" {
   source_dir = "${path.module}/src"
 }
 
-resource "aws_s3_bucket_object" "zip" {
+resource "aws_s3_object" "zip" {
   bucket = aws_s3_bucket.code-bucket.bucket
   key    = "main.py"
-  source = data.archive_file.python
+  source = "${path.module}/files/src.zip"
 }