diff --git a/README.md b/README.md index 5dfc340..aa80221 100644 --- a/README.md +++ b/README.md @@ -121,21 +121,11 @@ Los servicios que deben ser corregidos (asociados a la entrega del TP3) son los Bellver, Ezequiel 61268 - 25% - - - Burgos, Satiago Eduardo - 55193 - 25% + 50% Lo Coco, Santiago 61301 - 25% - - - Oillataguerre, Amparo - 58714 - 25% + 50% diff --git a/run.sh b/run.sh index 23dbcdb..2d57fed 100644 --- a/run.sh +++ b/run.sh @@ -8,23 +8,37 @@ usage: ${0##*/} [command] -p Show changes required by the current terraform config. -a Create or update infraestructure. -d Destroy infraestructure. + -l Create zip files of the lambdas. EOF exit 1 } RUN= -while getopts "hvpad" OPTION; do +while getopts "hvpadl" OPTION; do case $OPTION in a) RUN=apply ;; v) RUN=validate ;; p) RUN=plan ;; d) RUN=destroy ;; + l) RUN=lambda ;; *) usage ;; esac done dir="$PWD" +if [ "$RUN" = 'lambda' ]; then + cd "$dir/terraform/resources/lambda" || exit + lambdas=$(find -H . -maxdepth 1 -mindepth 1 -type d -printf "%f\n") + for lambda in $lambdas; do + cd $lambda || exit + zip $lambda.zip lambda_handler.py + mv $lambda.zip .. + cd .. + done + exit +fi + cd "$dir/terraform/organization" || exit terraform init diff --git a/terraform/modules/eventbridge/variables.tf b/terraform/modules/eventbridge/variables.tf deleted file mode 100644 index fac0c0b..0000000 --- a/terraform/modules/eventbridge/variables.tf +++ /dev/null @@ -1,9 +0,0 @@ -# ------------------------------------------------------------------------------ -# Amazon EventBridge variables -# ------------------------------------------------------------------------------ - -variable "tags" { - description = "A mapping of tags to assign to the resource" - type = map(string) - default = {} -} \ No newline at end of file diff --git a/terraform/modules/lambda/outputs.tf b/terraform/modules/lambda/outputs.tf index 0ef54e6..3fc4ec3 100644 --- a/terraform/modules/lambda/outputs.tf +++ b/terraform/modules/lambda/outputs.tf @@ -2,9 +2,14 @@ # Lambda outputs # -------------------------------------------------------------------- +output "function_invoke_arn" { + description = "The invoke ARN of the Lambda Function" + value = aws_lambda_function.this.invoke_arn +} + output "function_arn" { description = "The ARN of the Lambda Function" - value = aws_lambda_function.this.invoke_arn + value = aws_lambda_function.this.arn } output "function_name" { diff --git a/terraform/modules/stepfunctions/main.tf b/terraform/modules/stepfunctions/main.tf new file mode 100644 index 0000000..e4c249b --- /dev/null +++ b/terraform/modules/stepfunctions/main.tf @@ -0,0 +1,12 @@ +# ------------------------------------------------------------------------------ +# Amazon Step Functions +# ------------------------------------------------------------------------------ + +resource "aws_sfn_state_machine" "this" { + name = var.name + + definition = var.definition + role_arn = var.role_arn + + type = upper(var.type) +} \ No newline at end of file diff --git a/terraform/modules/eventbridge/main.tf b/terraform/modules/stepfunctions/outputs.tf similarity index 52% rename from terraform/modules/eventbridge/main.tf rename to terraform/modules/stepfunctions/outputs.tf index c37907f..8a81d3f 100644 --- a/terraform/modules/eventbridge/main.tf +++ b/terraform/modules/stepfunctions/outputs.tf @@ -1,3 +1,8 @@ # ------------------------------------------------------------------------------ -# Amazon EventBridge +# Amazon Step Function outputs # ------------------------------------------------------------------------------ + +output "name" { + description = "The name of the Step Function" + value = aws_sfn_state_machine.this.name +} diff --git a/terraform/modules/stepfunctions/variables.tf b/terraform/modules/stepfunctions/variables.tf new file mode 100644 index 0000000..8935298 --- /dev/null +++ b/terraform/modules/stepfunctions/variables.tf @@ -0,0 +1,29 @@ +# ------------------------------------------------------------------------------ +# Amazon Step Function variables +# ------------------------------------------------------------------------------ + +variable "tags" { + description = "A mapping of tags to assign to the resource" + type = map(string) + default = {} +} + +variable "name" { + description = "The state machine name." + type = string +} + +variable "definition" { + description = "The Step Function definition." + type = string +} + +variable "type" { + description = "Determines whether a Standard or Express state machine is created.." + type = string +} + +variable "role_arn" { + description = "The Step Function role." + type = string +} diff --git a/terraform/modules/eventbridge/versions.tf b/terraform/modules/stepfunctions/versions.tf similarity index 100% rename from terraform/modules/eventbridge/versions.tf rename to terraform/modules/stepfunctions/versions.tf diff --git a/terraform/organization/apigw.tf b/terraform/organization/apigw.tf index ebe1a39..4df3c86 100644 --- a/terraform/organization/apigw.tf +++ b/terraform/organization/apigw.tf @@ -14,7 +14,7 @@ module "apigw" { lambda = [ { - function_arn = module.lambda["lambdaDB"].function_arn + function_arn = module.lambda["lambdaDB"].function_invoke_arn function_name = module.lambda["lambdaDB"].function_name source_arn = "arn:aws:execute-api:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}" } @@ -40,7 +40,7 @@ module "apigw" { integration_http_method = "POST", type = "AWS_PROXY", credentials = null, - uri = module.lambda["lambdaDB"].function_arn, + uri = module.lambda["lambdaDB"].function_invoke_arn, request_parameters = {}, request_templates = {}, }, diff --git a/terraform/organization/datasources.tf b/terraform/organization/datasources.tf index 366de28..35aa384 100644 --- a/terraform/organization/datasources.tf +++ b/terraform/organization/datasources.tf @@ -51,3 +51,17 @@ data "aws_iam_policy_document" "sns" { resources = ["arn:aws:sns:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:${module.sns.name}"] } } + +data "aws_iam_policy_document" "stepfunctions" { + statement { + effect = "Allow" + actions = [ + "states:StartExecution", + ] + principals { + type = "AWS" + identifiers = ["*"] + } + resources = ["arn:aws:states:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:stateMachine:${module.stepfunctions.name}"] + } +} diff --git a/terraform/organization/locals.tf b/terraform/organization/locals.tf index 0d8cd22..b55560c 100644 --- a/terraform/organization/locals.tf +++ b/terraform/organization/locals.tf @@ -57,7 +57,7 @@ locals { role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole" handler = "lambda_handler.main" runtime = "python3.9", - security_group_ids = aws_security_group.dynamodb_sg.id + security_group_ids = aws_security_group.stepfunctions_sg.id }, lambdaDB = { package = "${local.path}/lambda/lambdaDB.zip" @@ -75,6 +75,30 @@ locals { runtime = "python3.9", security_group_ids = aws_security_group.sns_sg.id } + lambdaGET = { + package = "${local.path}/lambda/lambdaGET.zip" + function_name = "AWSLambdaHandlerGETg3" + role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole" + handler = "lambda_handler.main" + runtime = "python3.7", + security_group_ids = aws_security_group.sns_sg.id + } + lambdaUpdate = { + package = "${local.path}/lambda/lambdaUpdate.zip" + function_name = "AWSLambdaHandlerUpdateg3" + role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole" + handler = "lambda_handler.main" + runtime = "python3.9", + security_group_ids = aws_security_group.dynamodb_sg.id + } + lambdaError = { + package = "${local.path}/lambda/lambdaError.zip" + function_name = "AWSLambdaHandlerSNSErrorg3" + role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole" + handler = "lambda_handler.main" + runtime = "python3.9", + security_group_ids = aws_security_group.sns_sg.id + } } private_inbound = [ @@ -91,9 +115,9 @@ locals { { rule_number = 100 rule_action = "allow" - from_port = 443 - to_port = 443 - protocol = "tcp" + from_port = 0 + to_port = 65535 + protocol = 6 cidr_block = "0.0.0.0/0" } ] diff --git a/terraform/organization/stepfunctions.tf b/terraform/organization/stepfunctions.tf new file mode 100644 index 0000000..ac643cc --- /dev/null +++ b/terraform/organization/stepfunctions.tf @@ -0,0 +1,66 @@ +module "stepfunctions" { + source = "../modules/stepfunctions" + + providers = { + aws = aws.aws + } + + name = "AWSStepFunctions-g3" + role_arn = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole" + definition = <