Revert lambda/k8s environment sync due to size limit errors (#421)

* feat: use lambda layer and newrelic lambda handler wrapper (#415) * feat: use lambda layer and cloudwatch for newrelic logs * feat: send to cloudwatch for now * chore: remove lambda layer integration * chore: remove layer * feat: go back to layer and wrapping the handler * chore: remove layer * chore: more envs * chore: remove duplicate env * chore: remove unused variables * chore: remove unused secretmanager
cds-snc · Mar 21, 2022 · f14ac08 · f14ac08
1 parent 7c05d78
commit f14ac08
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 43 deletions.
diff --git a/aws/common/outputs.tf b/aws/common/outputs.tf
@@ -57,9 +57,3 @@ output "s3_bucket_csv_upload_bucket_arn" {
 output "s3_bucket_csv_upload_bucket_name" {
   value = aws_s3_bucket.csv_bucket.bucket
 }
-
-output "environment_variables_current_secret_string" {
-  description = "Environment variables shared between EKS and Lambda"
-  value       = data.aws_secretsmanager_secret_version.current.secret_string
-  sensitive   = true
-}
diff --git a/aws/common/secretsmanager.tf b/aws/common/secretsmanager.tf
@@ -5,7 +5,3 @@ resource "aws_secretsmanager_secret" "environment_variables" {
     CostCenter = "notification-canada-ca-${var.env}"
   }
 }
-
-data "aws_secretsmanager_secret_version" "current" {
-  secret_id = aws_secretsmanager_secret.environment_variables.id
-}
diff --git a/aws/lambda-api/lambda.tf b/aws/lambda-api/lambda.tf
@@ -1,28 +1,3 @@
-locals {
-  lambda_environment_variables = {
-    AWS_REGION                            = null # Reserved key that is currently not supported for modification in lambdas. Setting to null will remove this value from the env
-    DOCUMENT_DOWNLOAD_API_HOST            = var.document_download_api_host
-    SQLALCHEMY_DATABASE_URI               = jsondecode(var.manifest_environment_variables)["POSTGRES_SQL"]
-    NOTIFICATION_QUEUE_PREFIX             = var.notification_queue_prefix
-    NOTIFY_EMAIL_DOMAIN                   = jsondecode(var.manifest_environment_variables)["BASE_DOMAIN"]
-    NOTIFY_ENVIRONMENT                    = jsondecode(var.manifest_environment_variables)["ENVIRONMENT"]
-    REDIS_ENABLED                         = var.redis_enabled
-    NEW_RELIC_LAMBDA_HANDLER              = "application.handler"
-    NEW_RELIC_ACCOUNT_ID                  = var.new_relic_account_id
-    NEW_RELIC_APP_NAME                    = var.new_relic_app_name
-    NEW_RELIC_DISTRIBUTED_TRACING_ENABLED = var.new_relic_distribution_tracing_enabled
-    NEW_RELIC_LICENSE_KEY                 = var.new_relic_license_key
-    NEW_RELIC_MONITOR_MODE                = var.new_relic_monitor_mode
-    NEW_RELIC_EXTENSION_LOGS_ENABLED      = true
-    NEW_RELIC_LAMBDA_EXTENSION_ENABLED    = true
-    FF_CLOUDWATCH_METRICS_ENABLED         = var.ff_cloudwatch_metrics_enabled
-  }
-  # Merge the common environment variables with the lambda specific ones.
-  # The second argument in the merge will override any values in the first argument that has the same key
-  merged_environment_variables = sensitive(merge(jsondecode(var.manifest_environment_variables), local.lambda_environment_variables))
-}
-
-
 resource "aws_lambda_function" "api" {
   function_name = "api-lambda"
   role          = aws_iam_role.api.arn
@@ -46,7 +21,41 @@ resource "aws_lambda_function" "api" {
     subnet_ids = var.vpc_private_subnets
   }
   environment {
-    variables = local.merged_environment_variables
+    variables = {
+      ADMIN_CLIENT_SECRET                   = var.admin_client_secret
+      ADMIN_CLIENT_USER_NAME                = var.admin_client_user_name
+      ASSET_DOMAIN                          = var.asset_domain
+      ASSET_UPLOAD_BUCKET_NAME              = var.asset_upload_bucket_name
+      AUTH_TOKENS                           = var.auth_tokens
+      AWS_PINPOINT_REGION                   = var.aws_pinpoint_region
+      CSV_UPLOAD_BUCKET_NAME                = var.csv_upload_bucket_name
+      DANGEROUS_SALT                        = var.dangerous_salt
+      DOCUMENTS_BUCKET                      = var.documents_bucket
+      ENVIRONMENT                           = var.env
+      MLWR_HOST                             = var.mlwr_host
+      NEW_RELIC_LAMBDA_HANDLER              = "application.handler"
+      NEW_RELIC_ACCOUNT_ID                  = var.new_relic_account_id
+      NEW_RELIC_APP_NAME                    = var.new_relic_app_name
+      NEW_RELIC_DISTRIBUTED_TRACING_ENABLED = var.new_relic_distribution_tracing_enabled
+      NEW_RELIC_LICENSE_KEY                 = var.new_relic_license_key
+      NEW_RELIC_MONITOR_MODE                = var.new_relic_monitor_mode
+      NEW_RELIC_EXTENSION_LOGS_ENABLED      = true
+      NEW_RELIC_LAMBDA_EXTENSION_ENABLED    = true
+      NOTIFICATION_QUEUE_PREFIX             = var.notification_queue_prefix
+      NOTIFY_EMAIL_DOMAIN                   = var.domain
+      NOTIFY_ENVIRONMENT                    = var.env
+      REDIS_ENABLED                         = var.redis_enabled
+      REDIS_URL                             = var.redis_url
+      SECRET_KEY                            = var.secret_key
+      SQLALCHEMY_DATABASE_READER_URI        = var.sqlalchemy_database_reader_uri
+      SQLALCHEMY_DATABASE_URI               = var.sqlalchemy_database_uri
+      SQLALCHEMY_POOL_SIZE                  = var.sqlalchemy_pool_size
+      DOCUMENT_DOWNLOAD_API_HOST            = var.document_download_api_host
+      FF_BATCH_INSERTION                    = var.ff_batch_insertion
+      FF_REDIS_BATCH_SAVING                 = var.ff_redis_batch_saving
+      FF_CLOUDWATCH_METRICS_ENABLED         = var.ff_cloudwatch_metrics_enabled
+      FF_NOTIFICATION_CELERY_PERSISTENCE    = var.ff_notification_celery_persistence
+    }
   }
 
   lifecycle {

diff --git a/aws/lambda-api/variables.tf b/aws/lambda-api/variables.tf
@@ -153,11 +153,6 @@ variable "new_relic_account_id" {
   type = string
 }
 
-variable "manifest_environment_variables" {
-  type      = string
-  sensitive = true
-}
-
 variable "ff_batch_insertion" {
   type = bool
 }

diff --git a/env/production/lambda-api/terragrunt.hcl b/env/production/lambda-api/terragrunt.hcl
@@ -82,7 +82,6 @@ inputs = {
   certificate_arn                        = dependency.dns.outputs.aws_acm_notification_canada_ca_arn
   sns_alert_warning_arn                  = dependency.common.outputs.sns_alert_warning_arn
   sns_alert_critical_arn                 = dependency.common.outputs.sns_alert_critical_arn
-  manifest_environment_variables         = dependency.common.outputs.environment_variables_current_secret_string
   ff_batch_insertion                     = "true"
   ff_redis_batch_saving                  = "true"
   ff_cloudwatch_metrics_enabled          = "true"

diff --git a/env/staging/lambda-api/terragrunt.hcl b/env/staging/lambda-api/terragrunt.hcl
@@ -76,7 +76,6 @@ inputs = {
   certificate_arn                        = dependency.dns.outputs.aws_acm_notification_canada_ca_arn
   sns_alert_warning_arn                  = dependency.common.outputs.sns_alert_warning_arn
   sns_alert_critical_arn                 = dependency.common.outputs.sns_alert_critical_arn
-  manifest_environment_variables         = dependency.common.outputs.environment_variables_current_secret_string
   ff_batch_insertion                     = "true"
   ff_redis_batch_saving                  = "true"
   ff_cloudwatch_metrics_enabled          = "true"