NRL-1479 Add athena views to deployment

Author: jackleary

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

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

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

@@ -20,13 +20,13 @@ resource "aws_athena_workgroup" "athena" {
 resource "aws_athena_named_query" "rep_consumer" {
   name      = "rep_consumer"
   workgroup = aws_athena_workgroup.athena.id
-  database  = module.dev-glue.glue_database
+  database  = var.glue_database
   query     = file("${path.module}/sql/rep_consumer.sql")
 }
 
 resource "aws_athena_named_query" "rep_producer" {
   name      = "rep_producer"
   workgroup = aws_athena_workgroup.athena.id
-  database  = module.dev-glue.glue_database
+  database  = var.glue_database
   query     = file("${path.module}/sql/rep_producer.sql")
 }

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

@@ -1,8 +1,3 @@
-variable "database" {
-  description = "What the db will be called"
-  default     = "nrl_reporting"
-}
-
 variable "name_prefix" {
   type        = string
   description = "The prefix to apply to all resources in the module."
@@ -11,3 +6,8 @@ variable "name_prefix" {
 variable "target_bucket_name" {
   type = string
 }
+
+variable "glue_database" {
+  type        = string
+  description = "The Glue database in use"
+}