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.

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

feat: alternative vpc configuration for workflows api #145

Merged
merged 2 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ PREFIX=${APP_NAME}-${STAGE}
AWS_REGION=us-west-2
VPC_ID=<Fill Me>
AWS_PROFILE=<Fill Me>
SUBNET_IDS='["<Private Subnet 1>", "<Private Subnet 2>"]'
SUBNET_TAGNAME=<Fill Me>
STATE_BUCKET_NAME=<Fill Me>
STATE_BUCKET_KEY=<Fill Me>
Expand Down
32 changes: 32 additions & 0 deletions infrastructure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,17 @@ resource "aws_iam_policy" "lambda_access" {
"arn:aws:airflow:${var.aws_region}:${local.account_id}:environment/${var.prefix}-mwaa"
],
Effect: "Allow"
},
{
"Effect": "Allow",
"Action": [
"ec2:DescribeNetworkInterfaces",
"ec2:CreateNetworkInterface",
"ec2:DeleteNetworkInterface",
"ec2:DescribeInstances",
"ec2:AttachNetworkInterface"
],
"Resource": "*"
}
],
})
Expand All @@ -196,6 +207,21 @@ resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
}

resource "aws_security_group" "workflows_api_handler_sg" {
name = "${var.prefix}_workflows_security_group"
description = "Security group for Lambda function"

vpc_id = var.vpc_id

egress {
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
ipv6_cidr_blocks = ["::/0"]
}
}

# Function to build the JWKS URL
locals {
build_jwks_url = "${format("https://cognito-idp.%s.amazonaws.com/%s/.well-known/jwks.json", local.aws_region, var.userpool_id)}"
Expand All @@ -206,6 +232,12 @@ resource "aws_lambda_function" "workflows_api_handler" {
package_type = "Image"
timeout = 30
image_uri = "${aws_ecr_repository.workflows_api_lambda_repository.repository_url}:latest"

vpc_config {
subnet_ids = var.subnet_ids
security_group_ids = [aws_security_group.workflows_api_handler_sg.id]
}

environment {
variables = {
WORKFLOWS_CLIENT_SECRET_ID = var.cognito_app_secret
Expand Down
1 change: 1 addition & 0 deletions infrastructure/terraform.tfvars.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
aws_region="${AWS_REGION}"
prefix="${PREFIX}"
vpc_id="${VPC_ID}"
subnet_ids=$SUBNET_IDS
subnet_tagname="${SUBNET_TAGNAME}"
iam_policy_permissions_boundary_name="${PERMISSIONS_BOUNDARY_POLICY_NAME:-null}"
stage="${STAGE:-dev}"
Expand Down
6 changes: 6 additions & 0 deletions infrastructure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
variable "subnet_tagname" {
description = "Private subnet tagname to use for MWAA"
}

variable "subnet_ids" {
type = list(string)
description = "Private subnets to be used for workflows api lambdas"
}

variable "vpc_id" {
description = "Account VPC to use"
}
Expand Down