NRL-1188 name updates

Author: jackleary

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

@@ -12,7 +12,7 @@ resource "aws_athena_database" "reporting-db" {
 }
 
 resource "aws_athena_workgroup" "athena" {
-  name = var.name_prefix
+  name = "${var.name_prefix}-athena-wg"
 
   configuration {
     enforce_workgroup_configuration    = true

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

@@ -1,9 +1,9 @@
 resource "aws_s3_bucket" "athena" {
-  bucket = "athena"
+  bucket = "${var.name_prefix}-athena"
 }
 
 resource "aws_s3_bucket_policy" "athena" {
-  bucket = "athena"
+  bucket = "${var.name_prefix}-athena"
 
   policy = jsonencode({
     Version = "2012-10-17"
@@ -52,5 +52,5 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "athena" {
 }
 
 data "aws_s3_bucket" "target-data-bucket" {
-  bucket = "target-data-bucket"
+  bucket = "${var.name_prefix}-target-data-bucket"
 }

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

@@ -1,12 +1,12 @@
 # Create Glue Data Catalog Database
 resource "aws_glue_catalog_database" "raw_log_database" {
-  name         = "raw_log"
+  name         = "${var.name_prefix}-raw_log"
   location_uri = "${aws_s3_bucket.source-data-bucket.id}/"
 }
 
 # Create Glue Crawler
 resource "aws_glue_crawler" "raw_log_crawler" {
-  name          = "raw-log-crawler"
+  name          = "${var.name_prefix}-raw-log-crawler"
   database_name = aws_glue_catalog_database.raw_log_database.name
   role          = aws_iam_role.glue_service_role.name
   s3_target {
@@ -23,15 +23,15 @@ resource "aws_glue_crawler" "raw_log_crawler" {
   })
 }
 resource "aws_glue_trigger" "raw_log_trigger" {
-  name = "org-report-trigger"
+  name = "${var.name_prefix}-org-report-trigger"
   type = "ON_DEMAND"
   actions {
     crawler_name = aws_glue_crawler.raw_log_crawler.name
   }
 }
 
 resource "aws_glue_job" "glue_job" {
-  name              = "poc-glue-job"
+  name              = "${var.name_prefix}-glue-job"
   role_arn          = aws_iam_role.glue_service_role.arn
   description       = "Transfer logs from source to bucket"
   glue_version      = "4.0"

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

@@ -1,5 +1,5 @@
 resource "aws_iam_role" "glue_service_role" {
-  name = "glue_service_role"
+  name = "${var.name_prefix}-glue_service_role"
 
   assume_role_policy = jsonencode({
     "Version" : "2012-10-17",
@@ -16,7 +16,7 @@ resource "aws_iam_role" "glue_service_role" {
 }
 
 resource "aws_iam_role_policy" "glue_service_role_policy" {
-  name = "glue_service_role_policy"
+  name = "${var.name_prefix}-glue_service_role_policy"
   role = aws_iam_role.glue_service_role.name
   policy = jsonencode({
     "Version" : "2012-10-17",

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

@@ -1,10 +1,10 @@
 # S3 Bucket for Raw Data
 resource "aws_s3_bucket" "source-data-bucket" {
-  bucket = "source-data-bucket"
+  bucket = "${var.name_prefix}-source-data-bucket"
 }
 
 resource "aws_s3_bucket_policy" "source-data-bucket" {
-  bucket = "source-data-bucket"
+  bucket = "${var.name_prefix}-source-data-bucket"
 
   policy = jsonencode({
     Version = "2012-10-17"
@@ -43,11 +43,11 @@ resource "aws_s3_bucket_public_access_block" "source-data-bucket-public-access-b
 
 # S3 Bucket for Processed Data
 resource "aws_s3_bucket" "target-data-bucket" {
-  bucket = "target-data-bucket"
+  bucket = "${var.name_prefix}-target-data-bucket"
 }
 
 resource "aws_s3_bucket_policy" "target-data-bucket" {
-  bucket = "target-data-bucket"
+  bucket = "${var.name_prefix}-target-data-bucket"
 
   policy = jsonencode({
     Version = "2012-10-17"
@@ -85,11 +85,11 @@ resource "aws_s3_bucket_public_access_block" "target-data-bucket-public-access-b
 
 # S3 Bucket for Code
 resource "aws_s3_bucket" "code-bucket" {
-  bucket = "code-bucket"
+  bucket = "${var.name_prefix}-code-bucket"
 }
 
 resource "aws_s3_bucket_policy" "code-bucket" {
-  bucket = "code-bucket"
+  bucket = "${var.name_prefix}-code-bucket"
 
   policy = jsonencode({
     Version = "2012-10-17"