Variable name fix

default.tfvars

@@ -92,18 +92,18 @@ cirrus_dashboard_inputs   = {
 
 ##### INFRASTRUCTURE FLAGS ####
 # To disable each flag: set to 'false'; to enable: set to 'true'
-deploy_vpc                          = false
-deploy_vpc_search                   = true
-deploy_log_archive                  = true
-deploy_alarms                       = false
-deploy_stac_opensearch_serverless   = true
-deploy_stac_server                  = true
-deploy_analytics                    = true
-deploy_titiler                      = true
-deploy_console_ui                   = true
-deploy_cirrus_dashboard             = true
-deploy_local_stac_server_artifacts  = false
-deploy_sample_data_bucket           = false
+deploy_vpc                                = false
+deploy_vpc_search                         = true
+deploy_log_archive                        = true
+deploy_alarms                             = false
+deploy_stac_server_opensearch_serverless  = true
+deploy_stac_server                        = true
+deploy_analytics                          = true
+deploy_titiler                            = true
+deploy_console_ui                         = true
+deploy_cirrus_dashboard                   = true
+deploy_local_stac_server_artifacts        = false
+deploy_sample_data_bucket                 = false
 
 
 ##### STAC SAMPLE DATA ####

filmdrop.tf

@@ -6,37 +6,37 @@ module "filmdrop" {
     aws.main = aws.main
   }
 
-  environment                         = var.environment
-  project_name                        = var.project_name
-  vpc_id                              = var.vpc_id
-  vpc_cidr                            = var.vpc_cidr
-  public_subnets_cidr_map             = var.public_subnets_cidr_map
-  private_subnets_cidr_map            = var.private_subnets_cidr_map
-  security_group_id                   = var.security_group_id
-  sns_topics_map                      = var.sns_topics_map
-  cloudwatch_warning_alarms_map       = var.cloudwatch_warning_alarms_map
-  cloudwatch_critical_alarms_map      = var.cloudwatch_critical_alarms_map
-  sns_warning_subscriptions_map       = var.sns_warning_subscriptions_map
-  sns_critical_subscriptions_map      = var.sns_critical_subscriptions_map
-  s3_access_log_bucket                = var.s3_access_log_bucket
-  s3_logs_archive_bucket              = var.s3_logs_archive_bucket
-  domain_zone                         = var.domain_zone
-  stac_server_inputs                  = var.stac_server_inputs
-  titiler_inputs                      = var.titiler_inputs
-  analytics_inputs                    = var.analytics_inputs
-  console_ui_inputs                   = var.console_ui_inputs
-  cirrus_dashboard_inputs             = var.cirrus_dashboard_inputs
-  deploy_vpc                          = var.deploy_vpc
-  deploy_vpc_search                   = var.deploy_vpc_search
-  deploy_log_archive                  = var.deploy_log_archive
-  deploy_alarms                       = var.deploy_alarms
-  deploy_stac_server                  = var.deploy_stac_server
-  deploy_stac_opensearch_serverless   = var.deploy_stac_opensearch_serverless
-  deploy_analytics                    = var.deploy_analytics
-  deploy_titiler                      = var.deploy_titiler
-  deploy_console_ui                   = var.deploy_console_ui
-  deploy_cirrus_dashboard             = var.deploy_cirrus_dashboard
-  deploy_local_stac_server_artifacts  = var.deploy_local_stac_server_artifacts
-  deploy_sample_data_bucket           = var.deploy_sample_data_bucket
-  project_sample_data_bucket_name     = var.project_sample_data_bucket_name
+  environment                               = var.environment
+  project_name                              = var.project_name
+  vpc_id                                    = var.vpc_id
+  vpc_cidr                                  = var.vpc_cidr
+  public_subnets_cidr_map                   = var.public_subnets_cidr_map
+  private_subnets_cidr_map                  = var.private_subnets_cidr_map
+  security_group_id                         = var.security_group_id
+  sns_topics_map                            = var.sns_topics_map
+  cloudwatch_warning_alarms_map             = var.cloudwatch_warning_alarms_map
+  cloudwatch_critical_alarms_map            = var.cloudwatch_critical_alarms_map
+  sns_warning_subscriptions_map             = var.sns_warning_subscriptions_map
+  sns_critical_subscriptions_map            = var.sns_critical_subscriptions_map
+  s3_access_log_bucket                      = var.s3_access_log_bucket
+  s3_logs_archive_bucket                    = var.s3_logs_archive_bucket
+  domain_zone                               = var.domain_zone
+  stac_server_inputs                        = var.stac_server_inputs
+  titiler_inputs                            = var.titiler_inputs
+  analytics_inputs                          = var.analytics_inputs
+  console_ui_inputs                         = var.console_ui_inputs
+  cirrus_dashboard_inputs                   = var.cirrus_dashboard_inputs
+  deploy_vpc                                = var.deploy_vpc
+  deploy_vpc_search                         = var.deploy_vpc_search
+  deploy_log_archive                        = var.deploy_log_archive
+  deploy_alarms                             = var.deploy_alarms
+  deploy_stac_server                        = var.deploy_stac_server
+  deploy_stac_server_opensearch_serverless  = var.deploy_stac_server_opensearch_serverless
+  deploy_analytics                          = var.deploy_analytics
+  deploy_titiler                            = var.deploy_titiler
+  deploy_console_ui                         = var.deploy_console_ui
+  deploy_cirrus_dashboard                   = var.deploy_cirrus_dashboard
+  deploy_local_stac_server_artifacts        = var.deploy_local_stac_server_artifacts
+  deploy_sample_data_bucket                 = var.deploy_sample_data_bucket
+  project_sample_data_bucket_name           = var.project_sample_data_bucket_name
 }

inputs.tf

@@ -258,7 +258,7 @@ variable deploy_stac_server {
   description = "Deploy FilmDrop Stac-Server"
 }
 
-variable deploy_stac_opensearch_serverless {
+variable deploy_stac_server_opensearch_serverless {
   type        = bool
   default     = true
   description = "Deploy FilmDrop Stac-Server with OpenSearch Serverless. If False, Stac-server will be deployed with a classic OpenSearch domain."

modules/stac-server/api.tf

@@ -34,13 +34,13 @@ resource "aws_lambda_function" "stac_server_api" {
         : var.stac_server_pre_hook_lambda_arn
       )
       POST_HOOK                        = var.stac_server_post_hook_lambda_arn
-      OPENSEARCH_CREDENTIALS_SECRET_ID = var.deploy_stac_opensearch_serverless ? "" : aws_secretsmanager_secret.opensearch_stac_user_password_secret.arn
+      OPENSEARCH_CREDENTIALS_SECRET_ID = var.deploy_stac_server_opensearch_serverless ? "" : aws_secretsmanager_secret.opensearch_stac_user_password_secret.arn
       COLLECTION_TO_INDEX_MAPPINGS     = var.collection_to_index_mappings
     }
   }
 
   dynamic "vpc_config" {
-    for_each = { for i, j in [var.deploy_stac_opensearch_serverless] : i => j if var.deploy_stac_opensearch_serverless != true }
+    for_each = { for i, j in [var.deploy_stac_server_opensearch_serverless] : i => j if var.deploy_stac_server_opensearch_serverless != true }
 
     content {
       subnet_ids         = var.vpc_subnet_ids

modules/stac-server/api_auth.tf

@@ -17,7 +17,7 @@ resource "aws_lambda_function" "stac_server_api_auth_pre_hook" {
   }
 
   dynamic "vpc_config" {
-    for_each = { for i, j in [var.deploy_stac_opensearch_serverless] : i => j if var.deploy_stac_opensearch_serverless != true }
+    for_each = { for i, j in [var.deploy_stac_server_opensearch_serverless] : i => j if var.deploy_stac_server_opensearch_serverless != true }
 
     content {
       subnet_ids         = var.vpc_subnet_ids

modules/stac-server/data.tf

@@ -21,6 +21,6 @@ resource "random_string" "user_init_lambda_zip_poke" {
 
 locals {
   name_prefix         = "fd-${var.project_name}-${var.stac_api_stage}"
-  opensearch_endpoint = var.deploy_stac_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
-  opensearch_domain   = var.deploy_stac_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].dashboard_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].domain_name
+  opensearch_endpoint = var.deploy_stac_server_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
+  opensearch_domain   = var.deploy_stac_server_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].dashboard_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].domain_name
 }

modules/stac-server/ingest.tf

@@ -14,13 +14,13 @@ resource "aws_lambda_function" "stac_server_ingest" {
     variables = {
       LOG_LEVEL                        = var.log_level
       OPENSEARCH_HOST                  = var.opensearch_host != "" ? var.opensearch_host : local.opensearch_endpoint
-      OPENSEARCH_CREDENTIALS_SECRET_ID = var.deploy_stac_opensearch_serverless ? "" : aws_secretsmanager_secret.opensearch_stac_user_password_secret.arn
+      OPENSEARCH_CREDENTIALS_SECRET_ID = var.deploy_stac_server_opensearch_serverless ? "" : aws_secretsmanager_secret.opensearch_stac_user_password_secret.arn
       COLLECTION_TO_INDEX_MAPPINGS     = var.collection_to_index_mappings
     }
   }
 
   dynamic "vpc_config" {
-    for_each = { for i, j in [var.deploy_stac_opensearch_serverless] : i => j if var.deploy_stac_opensearch_serverless != true }
+    for_each = { for i, j in [var.deploy_stac_server_opensearch_serverless] : i => j if var.deploy_stac_server_opensearch_serverless != true }
 
     content {
       subnet_ids         = var.vpc_subnet_ids
@@ -102,7 +102,7 @@ resource "aws_lambda_permission" "stac_server_ingest_sqs_lambda_permission" {
 resource "null_resource" "stac_server_ingest_create_indices" {
   triggers = {
     stac_server_ingest = aws_lambda_function.stac_server_ingest.function_name
-    opensearch_host    = var.opensearch_host != "" ? var.opensearch_host : var.deploy_stac_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
+    opensearch_host    = var.opensearch_host != "" ? var.opensearch_host : var.deploy_stac_server_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
   }
 
   provisioner "local-exec" {

modules/stac-server/inputs.tf

@@ -305,7 +305,7 @@ variable "opensearch_cluster_dedicated_master_count" {
   default     = 3
 }
 
-variable deploy_stac_opensearch_serverless {
+variable deploy_stac_server_opensearch_serverless {
   type        = bool
   default     = true
   description = "Deploy FilmDrop Stac-Server with OpenSearch Serverless. If False, Stac-server will be deployed with a classic OpenSearch domain."

modules/stac-server/opensearch_domain.tf

@@ -3,7 +3,7 @@ resource "random_id" "suffix" {
 }
 
 resource "aws_opensearch_domain" "stac_server_opensearch_domain" {
-  count           = var.deploy_stac_opensearch_serverless ? 0 : 1
+  count           = var.deploy_stac_server_opensearch_serverless ? 0 : 1
   domain_name     = lower(var.opensearch_stac_server_domain_name_override == null ? "${local.name_prefix}-stac-server" : var.opensearch_stac_server_domain_name_override)
   engine_version  = var.opensearch_version
 
@@ -96,7 +96,7 @@ CONFIG
 }
 
 resource "aws_security_group" "opensearch_security_group" {
-  count       = var.deploy_stac_opensearch_serverless ? 0 : 1
+  count       = var.deploy_stac_server_opensearch_serverless ? 0 : 1
   name        = "${local.name_prefix}-stac-server"
   description = "OpenSearch Security Group"
   vpc_id      = var.vpc_id
@@ -268,7 +268,7 @@ resource "aws_lambda_function" "stac_server_opensearch_user_initializer" {
   }
 
   dynamic "vpc_config" {
-    for_each = { for i, j in [var.deploy_stac_opensearch_serverless] : i => j if var.deploy_stac_opensearch_serverless != true }
+    for_each = { for i, j in [var.deploy_stac_server_opensearch_serverless] : i => j if var.deploy_stac_server_opensearch_serverless != true }
 
     content {
       subnet_ids         = var.vpc_subnet_ids
@@ -288,10 +288,10 @@ resource "aws_lambda_function" "stac_server_opensearch_user_initializer" {
 }
 
 resource "null_resource" "invoke_stac_server_opensearch_user_initializer" {
-  count     = var.deploy_stac_opensearch_serverless ? 0 : 1
+  count     = var.deploy_stac_server_opensearch_serverless ? 0 : 1
   triggers  = {
     INITIALIZER_LAMBDA                 = aws_lambda_function.stac_server_opensearch_user_initializer.function_name
-    OPENSEARCH_HOST                    = var.deploy_stac_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
+    OPENSEARCH_HOST                    = var.deploy_stac_server_opensearch_serverless ? aws_opensearchserverless_collection.stac_server_opensearch_serverless_collection[0].collection_endpoint : aws_opensearch_domain.stac_server_opensearch_domain[0].endpoint
     OPENSEARCH_MASTER_CREDS_SECRET_ARN = aws_secretsmanager_secret.opensearch_master_password_secret.arn
     OPENSEARCH_USER_CREDS_SECRET_ARN   = aws_secretsmanager_secret.opensearch_stac_user_password_secret.arn
     REGION                             = data.aws_region.current.name

modules/stac-server/opensearch_serverless.tf

@@ -1,5 +1,5 @@
 resource "aws_opensearchserverless_security_policy" "stac_server_opensearch_serverless_encryption_policy" {
-  count   = var.deploy_stac_opensearch_serverless ? 1 : 0
+  count   = var.deploy_stac_server_opensearch_serverless ? 1 : 0
   name    = lower(var.opensearch_stac_server_domain_name_override == null ? "${local.name_prefix}-stac-server-ep" : var.opensearch_stac_server_domain_name_override)
   type    = "encryption"
   policy  = jsonencode({
@@ -16,7 +16,7 @@ resource "aws_opensearchserverless_security_policy" "stac_server_opensearch_serv
 }
 
 resource "aws_opensearchserverless_security_policy" "stac_server_opensearch_serverless_network_policy" {
-  count   = var.deploy_stac_opensearch_serverless ? 1 : 0
+  count   = var.deploy_stac_server_opensearch_serverless ? 1 : 0
   name    = lower(var.opensearch_stac_server_domain_name_override == null ? "${local.name_prefix}-stac-np" : var.opensearch_stac_server_domain_name_override)
   type    = "network"
   policy  = jsonencode([
@@ -48,7 +48,7 @@ resource "aws_opensearchserverless_security_policy" "stac_server_opensearch_serv
 }
 
 resource "aws_opensearchserverless_access_policy" "stac_server_opensearch_serverless_access_policy" {
-  count   = var.deploy_stac_opensearch_serverless ? 1 : 0
+  count   = var.deploy_stac_server_opensearch_serverless ? 1 : 0
   name    = lower(var.opensearch_stac_server_domain_name_override == null ? "${local.name_prefix}-stac-ap" : var.opensearch_stac_server_domain_name_override)
   type    = "data"
   policy  = jsonencode([
@@ -86,7 +86,7 @@ resource "aws_opensearchserverless_access_policy" "stac_server_opensearch_server
 }
 
 resource "aws_opensearchserverless_collection" "stac_server_opensearch_serverless_collection" {
-  count   = var.deploy_stac_opensearch_serverless ? 1 : 0
+  count   = var.deploy_stac_server_opensearch_serverless ? 1 : 0
   name    = lower(var.opensearch_stac_server_domain_name_override == null ? "${local.name_prefix}-stac-server" : var.opensearch_stac_server_domain_name_override)
 
   depends_on = [

profiles/core/inputs.tf

@@ -294,7 +294,7 @@ variable deploy_sample_data_bucket {
   description = "Deploy FilmDrop STAC sample data bucket"
 }
 
-variable deploy_stac_opensearch_serverless {
+variable deploy_stac_server_opensearch_serverless {
   type        = bool
   default     = true
   description = "Deploy FilmDrop Stac-Server with OpenSearch Serverless. If False, Stac-server will be deployed with a classic OpenSearch domain."

profiles/core/main.tf

@@ -45,7 +45,7 @@ module "stac-server" {
   project_name                      = var.project_name
   s3_logs_archive_bucket            = module.base_infra.s3_logs_archive_bucket
   domain_zone                       = var.domain_zone
-  deploy_stac_opensearch_serverless = var.deploy_stac_opensearch_serverless
+  deploy_stac_server_opensearch_serverless = var.deploy_stac_server_opensearch_serverless
 
   depends_on = [
     module.setup

profiles/stac-server/inputs.tf

@@ -100,7 +100,7 @@ variable "log_bucket_domain_name" {
   default     = ""
 }
 
-variable deploy_stac_opensearch_serverless {
+variable deploy_stac_server_opensearch_serverless {
   type        = bool
   default     = true
   description = "Deploy FilmDrop Stac-Server with OpenSearch Serverless. If False, Stac-server will be deployed with a classic OpenSearch domain."

profiles/stac-server/main.tf

@@ -17,7 +17,7 @@ module "stac-server" {
   opensearch_ebs_volume_size                  = var.stac_server_inputs.opensearch_ebs_volume_size
   project_name                                = var.project_name
   stac_server_s3_bucket_arns                  = var.stac_server_inputs.stac_server_and_titiler_s3_arns
-  deploy_stac_opensearch_serverless           = var.deploy_stac_opensearch_serverless
+  deploy_stac_server_opensearch_serverless           = var.deploy_stac_server_opensearch_serverless
 }
 
 module "cloudfront_api_gateway_endpoint" {