Fix variable references in Terragrunt configuration files

Author: catherinevee

infrastructure/dev/us-east-2/compute/parallel-cluster/terragrunt.hcl

@@ -79,19 +79,24 @@ inputs = {
 
   # EFA Configuration
   efa = {
-    enabled = local.efa_config.enabled
-    gdr_support = local.efa_config.enable_gpudirect
+    enabled = true
+    gdr_support = false  # Disabled for dev
   }
 
   # Tags
-  tags = merge(local.common_tags, {
+  tags = {
     Name = local.cluster_name
     Type = "ParallelCluster"
     Purpose = "HPC-Compute"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  common_tags = local.common_tags
+  common_tags = {
+    Environment = local.environment
+    Region = local.region
+  }
 }

infrastructure/dev/us-east-2/monitoring/cloudwatch/terragrunt.hcl

@@ -23,35 +23,42 @@ dependency "kms" {
 inputs = {
   # CloudWatch Log Groups
   log_groups = {
-    for name, config in local.cloudwatch_config.log_groups : name => {
-      name              = config.name
-      retention_in_days = config.retention_in_days
+    hpc_system_logs = {
+      name              = "/aws/hpc/${local.environment}/system"
+      retention_in_days = local.monitoring.cloudwatch.log_retention_days
+      kms_key_id        = dependency.kms.outputs.kms_key_arn
+    }
+    hpc_application_logs = {
+      name              = "/aws/hpc/${local.environment}/application"
+      retention_in_days = local.monitoring.cloudwatch.log_retention_days
       kms_key_id        = dependency.kms.outputs.kms_key_arn
     }
   }
 
   # CloudWatch Alarms
   alarms = {
     high_queue_depth = {
-      alarm_name          = local.cloudwatch_config.alarms.high_queue_depth.alarm_name
-      comparison_operator = local.cloudwatch_config.alarms.high_queue_depth.comparison_operator
-      evaluation_periods  = local.cloudwatch_config.alarms.high_queue_depth.evaluation_periods
-      metric_name         = local.cloudwatch_config.alarms.high_queue_depth.metric_name
-      namespace           = local.cloudwatch_config.alarms.high_queue_depth.namespace
-      period              = local.cloudwatch_config.alarms.high_queue_depth.period
-      statistic           = local.cloudwatch_config.alarms.high_queue_depth.statistic
-      threshold           = local.cloudwatch_config.alarms.high_queue_depth.threshold
-      alarm_description   = local.cloudwatch_config.alarms.high_queue_depth.alarm_description
+      alarm_name          = "hpc-${local.environment}-high-queue-depth"
+      comparison_operator = "GreaterThanThreshold"
+      evaluation_periods  = "2"
+      metric_name         = "JobsQueued"
+      namespace           = "AWS/ParallelCluster"
+      period              = "300"
+      statistic           = "Average"
+      threshold           = "100"
+      alarm_description   = "This metric monitors high queue depth"
       alarm_actions       = [dependency.kms.outputs.sns_topic_arn]
       ok_actions          = [dependency.kms.outputs.sns_topic_arn]
-      treat_missing_data  = local.cloudwatch_config.alarms.high_queue_depth.treat_missing_data
+      treat_missing_data  = "notBreaching"
     }
   }
 
   # Tags
-  tags = merge(local.common_tags, {
+  tags = {
     Name = "hpc-${local.environment}-cloudwatch"
     Type = "CloudWatch"
     Purpose = "Monitoring"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 }

infrastructure/dev/us-east-2/networking/efa-sg/terragrunt.hcl

@@ -23,17 +23,17 @@ dependency "vpc" {
 inputs = {
   cluster_name = "hpc-${local.environment}"
   vpc_id       = dependency.vpc.outputs.vpc_id
-  vpc_cidr     = local.vpc_config.cidr_block
+  vpc_cidr     = local.networking.vpc_cidr
   subnet_id    = dependency.vpc.outputs.compute_subnets[0]
-  availability_zone = local.subnet_config.compute.availability_zones[0]
+  availability_zone = local.networking.primary_az
 
   # EFA Configuration
   efa_device = "efa0"
   mtu_size   = 9000
   enable_gpudirect = false  # Disabled for dev
 
   # Instance Configuration
-  instance_type = local.instance_types.compute.hpc_optimized
+  instance_type = local.instance_types.compute
   ami_id        = data.aws_ami.hpc_optimized.id
 
   # EFA-specific settings
@@ -58,24 +58,29 @@ inputs = {
   cpu_credits = "standard"
 
   # S3 Configuration
-  s3_bucket_name = local.s3_config.data_repository.bucket_name
+  s3_bucket_name = local.storage.s3.data_repository_bucket
 
   # Monitoring Configuration
-  log_retention_days = local.cloudwatch_config.log_groups.hpc_system_logs.retention_in_days
+  log_retention_days = local.monitoring.cloudwatch.log_retention_days
   kms_key_id = aws_kms_key.hpc.arn
 
   # Alarm Configuration
   alarm_actions = [aws_sns_topic.hpc_alerts.arn]
   ok_actions    = [aws_sns_topic.hpc_alerts.arn]
 
   # Tags
-  tags = merge(local.common_tags, {
+  tags = {
     Component = "EFA-Network"
     Tier      = "HPC-Compute"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  common_tags = local.common_tags
+  common_tags = {
+    Environment = local.environment
+    Region = local.region
+  }
 }

infrastructure/dev/us-east-2/networking/vpc/terragrunt.hcl

@@ -18,19 +18,19 @@ terraform {
 inputs = {
   # VPC Module inputs
   name = "hpc-${local.environment}-vpc"
-  cidr = local.vpc_config.cidr_block
+  cidr = local.networking.vpc_cidr
 
-  azs             = local.subnet_config.private.availability_zones
-  private_subnets = local.subnet_config.private.cidr_blocks
-  public_subnets  = local.subnet_config.public.cidr_blocks
+  azs             = local.availability_zones
+  private_subnets = local.networking.subnet_cidrs.private
+  public_subnets  = local.networking.subnet_cidrs.public
 
   # Additional subnets for HPC
-  database_subnets = local.subnet_config.storage.cidr_blocks
-  compute_subnets  = local.subnet_config.compute.cidr_blocks
+  database_subnets = local.networking.subnet_cidrs.storage
+  compute_subnets  = local.networking.subnet_cidrs.compute
 
   # Enable DNS
-  enable_dns_hostnames = local.vpc_config.enable_dns_hostnames
-  enable_dns_support   = local.vpc_config.enable_dns_support
+  enable_dns_hostnames = true
+  enable_dns_support   = true
 
   # Enable NAT Gateway (single for dev)
   enable_nat_gateway = true
@@ -46,36 +46,49 @@ inputs = {
   enable_s3_endpoint = true
 
   # Tags
-  tags = merge(local.common_tags, {
+  tags = {
     Name = "hpc-${local.environment}-vpc"
     Type = "VPC"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
   # Subnet tags
-  private_subnet_tags = merge(local.common_tags, {
+  private_subnet_tags = {
     Type = "Private-Subnet"
     Tier = "Compute"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
-  public_subnet_tags = merge(local.common_tags, {
+  public_subnet_tags = {
     Type = "Public-Subnet"
     Tier = "Management"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
-  database_subnet_tags = merge(local.common_tags, {
+  database_subnet_tags = {
     Type = "Database-Subnet"
     Tier = "Storage"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
-  compute_subnet_tags = merge(local.common_tags, {
+  compute_subnet_tags = {
     Type = "Compute-Subnet"
     Tier = "HPC-Compute"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 
   # Additional variables for local Terraform resources
   environment = local.environment
   region      = local.region
-  vpc_cidr    = local.vpc_config.cidr_block
-  common_tags = local.common_tags
+  vpc_cidr    = local.networking.vpc_cidr
+  common_tags = {
+    Environment = local.environment
+    Region = local.region
+  }
 }
 

infrastructure/dev/us-east-2/storage/fsx-lustre-persistent/terragrunt.hcl

@@ -29,21 +29,21 @@ inputs = {
   name = "hpc-${local.environment}-persistent"
 
   # Storage Configuration
-  storage_capacity = local.fsx_lustre_config.persistent.storage_capacity
-  storage_type     = local.fsx_lustre_config.persistent.storage_type
-  deployment_type  = local.fsx_lustre_config.persistent.deployment_type
-  per_unit_storage_throughput = local.fsx_lustre_config.persistent.per_unit_storage_throughput
+  storage_capacity = local.storage.fsx_lustre.persistent.storage_capacity
+  storage_type     = "SSD"
+  deployment_type  = "PERSISTENT_1"
+  per_unit_storage_throughput = local.storage.fsx_lustre.persistent.per_unit_storage_throughput
 
   # Data compression
-  data_compression_type = local.fsx_lustre_config.persistent.data_compression_type
+  data_compression_type = "LZ4"
 
   # Auto import policy
-  auto_import_policy = local.fsx_lustre_config.persistent.auto_import_policy
+  auto_import_policy = "NEW_CHANGED"
 
   # Backup Configuration
-  automatic_backup_retention_days = local.fsx_lustre_config.persistent.automatic_backup_retention_days
-  daily_automatic_backup_start_time = local.fsx_lustre_config.persistent.daily_automatic_backup_start_time
-  weekly_maintenance_start_time = local.fsx_lustre_config.persistent.weekly_maintenance_start_time
+  automatic_backup_retention_days = 7  # 7 days backup for persistent
+  daily_automatic_backup_start_time = "03:00"
+  weekly_maintenance_start_time = "1:00:00"
 
   # Network Configuration
   subnet_ids         = dependency.vpc.outputs.database_subnets
@@ -53,9 +53,11 @@ inputs = {
   data_repository_path = "s3://${dependency.s3_bucket.outputs.s3_bucket_id}/persistent"
 
   # Tags
-  tags = merge(local.common_tags, local.fsx_lustre_config.persistent.tags, {
+  tags = {
     Name = "hpc-${local.environment}-persistent"
     Type = "FSx-Lustre"
     Purpose = "Persistent-Storage"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 }

infrastructure/dev/us-east-2/storage/fsx-lustre-scratch/terragrunt.hcl

@@ -29,21 +29,21 @@ inputs = {
   name = "hpc-${local.environment}-scratch"
 
   # Storage Configuration
-  storage_capacity = local.fsx_lustre_config.scratch.storage_capacity
-  storage_type     = local.fsx_lustre_config.scratch.storage_type
-  deployment_type  = local.fsx_lustre_config.scratch.deployment_type
-  per_unit_storage_throughput = local.fsx_lustre_config.scratch.per_unit_storage_throughput
+  storage_capacity = local.storage.fsx_lustre.scratch.storage_capacity
+  storage_type     = "SSD"
+  deployment_type  = "SCRATCH_1"
+  per_unit_storage_throughput = local.storage.fsx_lustre.scratch.per_unit_storage_throughput
 
   # Data compression
-  data_compression_type = local.fsx_lustre_config.scratch.data_compression_type
+  data_compression_type = "LZ4"
 
   # Auto import policy
-  auto_import_policy = local.fsx_lustre_config.scratch.auto_import_policy
+  auto_import_policy = "NEW_CHANGED"
 
   # Backup Configuration
-  automatic_backup_retention_days = local.fsx_lustre_config.scratch.automatic_backup_retention_days
-  daily_automatic_backup_start_time = local.fsx_lustre_config.scratch.daily_automatic_backup_start_time
-  weekly_maintenance_start_time = local.fsx_lustre_config.scratch.weekly_maintenance_start_time
+  automatic_backup_retention_days = 0  # No backup for scratch
+  daily_automatic_backup_start_time = "03:00"
+  weekly_maintenance_start_time = "1:00:00"
 
   # Network Configuration
   subnet_ids         = dependency.vpc.outputs.database_subnets
@@ -53,9 +53,11 @@ inputs = {
   data_repository_path = "s3://${dependency.s3_bucket.outputs.s3_bucket_id}/scratch"
 
   # Tags
-  tags = merge(local.common_tags, local.fsx_lustre_config.scratch.tags, {
+  tags = {
     Name = "hpc-${local.environment}-scratch"
     Type = "FSx-Lustre"
     Purpose = "Scratch-Storage"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 }

infrastructure/dev/us-east-2/storage/s3-data-repository/terragrunt.hcl

@@ -22,32 +22,47 @@ dependency "kms" {
 
 inputs = {
   # Bucket Configuration
-  bucket = local.s3_config.data_repository.bucket_name
+  bucket = local.storage.s3.data_repository_bucket
 
   # Versioning
   versioning = {
-    enabled = local.s3_config.data_repository.versioning_enabled
+    enabled = true
   }
 
   # Encryption
   server_side_encryption_configuration = {
     rule = {
       apply_server_side_encryption_by_default = {
-        sse_algorithm = local.s3_config.data_repository.encryption_algorithm
+        sse_algorithm = "AES256"
       }
     }
   }
 
   # Lifecycle rules
-  lifecycle_rule = local.s3_config.data_repository.lifecycle_rules
+  lifecycle_rule = [
+    {
+      id      = "transition_to_ia"
+      enabled = true
+      transition = [
+        {
+          days          = 30
+          storage_class = "STANDARD_IA"
+        }
+      ]
+    }
+  ]
 
   # Intelligent tiering
-  intelligent_tiering = local.s3_config.data_repository.intelligent_tiering
+  intelligent_tiering = {
+    enabled = true
+  }
 
   # Tags
-  tags = merge(local.common_tags, {
+  tags = {
     Name = "hpc-${local.environment}-data-repository"
     Type = "S3-Bucket"
     Purpose = "Data-Repository"
-  })
+    Environment = local.environment
+    Region = local.region
+  }
 }