Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding condition on s3 event bridge #257

Merged
merged 6 commits into from
Nov 22, 2024
Merged

Adding condition on s3 event bridge #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b258d41
Adding condition on s3 event bridge
amarouane-ABDELHAK Nov 13, 2024
eb5e32c
Adding condition on s3 event bridge
amarouane-ABDELHAK Nov 14, 2024
4909f43
Fix some missing variables
amarouane-ABDELHAK Nov 14, 2024
87a08e2
Remove .env file
amarouane-ABDELHAK Nov 15, 2024
cf19bd3
Remove .env file
amarouane-ABDELHAK Nov 15, 2024
1335a92
Remove the airflow config to be created by CICD
amarouane-ABDELHAK Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions sm2a/infrastructure/configuration/airflow.cfg
View file
Open in desktop

This file was deleted.

24 changes: 12 additions & 12 deletions sm2a/infrastructure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ resource "random_password" "password" {


module "sma-base" {
source = "https://github.com/NASA-IMPACT/self-managed-apache-airflow/releases/download/v1.1.4/self-managed-apache-airflow.zip"
source = "https://github.com/NASA-IMPACT/self-managed-apache-airflow/releases/download/v1.1.5/self-managed-apache-airflow.zip"
project = var.project_name
airflow_db = var.airflow_db
fernet_key = var.fernet_key
Expand All @@ -28,22 +28,22 @@ module "sma-base" {
public_subnets_tagname = var.public_subnets_tagname
vpc_id = var.vpc_id
state_bucketname = var.state_bucketname
desired_max_workers_count = var.workers_configuration[var.stage].max_desired_workers
desired_max_workers_count = var.desired_max_workers_count
airflow_admin_password = random_password.password.result
airflow_admin_username = "admin"
rds_publicly_accessible = var.rds_publicly_accessible
permission_boundaries_arn = var.permission_boundaries_arn
custom_worker_policy_statement = var.custom_worker_policy_statement
worker_cpu = var.workers_configuration[var.stage].cpu
worker_memory = var.workers_configuration[var.stage].memory
worker_cpu = tonumber(var.workers_cpu)
worker_memory = tonumber(var.workers_memory)
number_of_schedulers = var.number_of_schedulers
scheduler_cpu = var.scheduler_cpu
scheduler_memory = var.scheduler_memory
rds_engine_version = var.rds_configuration[var.stage].rds_engine_version
rds_instance_class = var.rds_configuration[var.stage].rds_instance_class
rds_allocated_storage = var.rds_configuration[var.stage].rds_allocated_storage
rds_max_allocated_storage = var.rds_configuration[var.stage].rds_max_allocated_storage
workers_logs_retention_days = var.workers_configuration[var.stage].workers_logs_retention_days
scheduler_cpu = tonumber(var.scheduler_cpu)
scheduler_memory = tonumber(var.scheduler_memory)
rds_engine_version = var.rds_engine_version
rds_instance_class = var.rds_instance_class
rds_allocated_storage = tonumber(var.rds_allocated_storage)
rds_max_allocated_storage = tonumber(var.rds_max_allocated_storage)
workers_logs_retention_days = tonumber(var.workers_logs_retention_days)

extra_airflow_task_common_environment = [
{
Expand All @@ -52,7 +52,7 @@ module "sma-base" {
},
{
name = "AIRFLOW__CORE__DEFAULT_TASK_RETRIES"
value = var.workers_configuration[var.stage].task_retries
value = var.workers_task_retries
},
{
name = "GH_CLIENT_ID"
Expand Down
21 changes: 13 additions & 8 deletions sm2a/infrastructure/s3_event_bridge_lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ data "archive_file" "python_lambda_package" {


resource "aws_lambda_function" "lambda" {
count = var.eis_storage_bucket_name != null ? 1 : 0

provider = aws.aws_current
filename = "/tmp/s3_event_bridge_to_sfn_execute.zip"
Expand All @@ -127,17 +128,19 @@ resource "aws_lambda_function" "lambda" {
variables = {
TARGET_DAG_ID = var.target_dag_id
SM2A_SECRET_MANAGER_NAME = var.sm2a_secret_manager_name
STORAGE_BUCKET = var.storage_bucket_name
S3_FILTER_PREFIX = var.s3_invoke_filter_prefix
STORAGE_BUCKET = var.eis_storage_bucket_name
S3_FILTER_PREFIX = var.eis_s3_invoke_filter_prefix
}
}
}

resource "aws_cloudwatch_log_group" "group" {

count = var.eis_storage_bucket_name != null ? 1 : 0


provider = aws.aws_current
name = "/aws/lambda/${aws_lambda_function.lambda.function_name}"
name = "/aws/lambda/${aws_lambda_function.lambda[count.index].function_name}"
retention_in_days = 5
}

Expand All @@ -146,25 +149,27 @@ resource "aws_cloudwatch_log_group" "group" {
#####################################################

resource "aws_lambda_permission" "s3_invoke" {
count = var.eis_storage_bucket_name != null ? 1 : 0

provider = aws.aws_current
action = "lambda:InvokeFunction"
function_name = aws_lambda_function.lambda.function_name
function_name = aws_lambda_function.lambda[count.index].function_name
principal = "s3.amazonaws.com"
statement_id = "AllowInvocationFromS3Bucket-veda-${var.stage}"
source_arn = "arn:aws:s3:::${var.storage_bucket_name}"
source_arn = "arn:aws:s3:::${var.eis_storage_bucket_name}"
}




resource "aws_s3_bucket_notification" "bucket_notification" {
bucket = var.storage_bucket_name
count = var.eis_storage_bucket_name != null ? 1 : 0
bucket = var.eis_storage_bucket_name

lambda_function {
lambda_function_arn = aws_lambda_function.lambda.arn
lambda_function_arn = aws_lambda_function.lambda[count.index].arn
events = ["s3:ObjectCreated:*"]
filter_prefix = var.s3_invoke_filter_prefix
filter_prefix = var.eis_s3_invoke_filter_prefix
filter_suffix = ".gpkg"
}

Expand Down
138 changes: 42 additions & 96 deletions sm2a/infrastructure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,102 +65,10 @@ variable "subdomain" {
default = "null"
}


variable "rds_configuration" {
type = object({
dev = object({
rds_instance_class = string,
rds_allocated_storage = number,
rds_max_allocated_storage = number,
rds_engine_version = string
})
staging = object({
rds_instance_class = string,
rds_allocated_storage = number,
rds_max_allocated_storage = number,
rds_engine_version = string
})
prod = object({
rds_instance_class = string,
rds_allocated_storage = number,
rds_max_allocated_storage = number,
rds_engine_version = string
})

})
default = {
dev = {
rds_instance_class = "db.t4g.medium",
rds_allocated_storage = 20,
rds_max_allocated_storage = 100,
rds_engine_version = "13"
},
staging = {
rds_instance_class = "db.t4g.large",
rds_allocated_storage = 40,
rds_max_allocated_storage = 100,
rds_engine_version = "13"
},
prod = {
rds_instance_class = "db.r5.xlarge",
rds_allocated_storage = 100,
rds_max_allocated_storage = 200,
rds_engine_version = "13"
}
}
}

variable "workers_configuration" {
type = object({
dev = object({
cpu = number,
memory = number,
max_desired_workers = string,
task_retries = string,
workers_logs_retention_days = number

})
staging = object({
cpu = number,
memory = number,
max_desired_workers = string,
task_retries = string,
workers_logs_retention_days = number
})
prod = object({
cpu = number,
memory = number,
max_desired_workers = string,
task_retries = string,
workers_logs_retention_days = number
})
})
default = {
dev = {
cpu = 2048,
memory = 4096,
max_desired_workers = "5"
task_retries = "0"
workers_logs_retention_days = 1
},
staging = {
cpu = 4096,
memory = 8192,
max_desired_workers = "10",
task_retries = "1",
workers_logs_retention_days = 1
},
prod = {
cpu = 8192,
memory = 16384,
max_desired_workers = "30",
task_retries = "1",
workers_logs_retention_days = 14
}
}
variable "desired_max_workers_count" {
default = "5"
}


variable "gh_app_client_id" {

}
Expand Down Expand Up @@ -214,15 +122,53 @@ variable "stac_url" {
}

variable "vector_secret_name" {
type = string
default = null
}

variable "storage_bucket_name" {
variable "eis_storage_bucket_name" {
type = string
default = null
}

variable "s3_invoke_filter_prefix" {
variable "eis_s3_invoke_filter_prefix" {
type = string
default = null
}
variable "sm2a_secret_manager_name" {
type = string
default = null
}

variable "target_dag_id" {
type = string
default = null
}


variable "workers_cpu" {
default = 2048
}
variable "workers_memory" {
default = 4096
}

variable "rds_engine_version" {
default = "13"
}
variable "rds_instance_class" {
default = "db.t4g.medium"
}
variable "rds_allocated_storage" {
default = 20
}
variable "rds_max_allocated_storage" {
default = 200
}
variable "workers_logs_retention_days" {
default = 1
}

variable "workers_task_retries" {
default = "1"
}