fix: variable and datasource usage and values

Author: g-otn

.terraform.lock.hcl

@@ -10,7 +10,7 @@ resource "aws_apigatewayv2_authorizer" "lambda_authorizer_client" {
   authorizer_type  = "REQUEST"
   authorizer_uri   = aws_lambda_function.authorizer_client.invoke_arn
   identity_sources = ["$request.header.Authorization"]
-  name             = "SOAT-TC_Lambda_Authorizer_Client"
+  name             = "SOAT-TC_API_Gateway_Authorizer__Lambda_Authorizer_Client"
 
   authorizer_payload_format_version = "2.0"
   enable_simple_responses           = true
@@ -30,20 +30,20 @@ resource "aws_apigatewayv2_integration" "lambda_identification_nationalid" {
 }
 
 // ----- Routes -----
+// Routes should be declared on terraform-network whenever possible. The routes below
+// depend on terraform-computing resources, they are declared here to avoid cyclic dependencies.
 
 resource "aws_apigatewayv2_route" "client_identification" {
   api_id    = local.api_id
   route_key = "POST /identification/clients/identification"
 
-  // Identification Lambda integration
   target = "integrations/${aws_apigatewayv2_integration.lambda_identification_nationalid.id}"
 }
 
 resource "aws_apigatewayv2_route" "order_checkout_and_listing" {
   api_id    = local.api_id
   route_key = "ANY /order/orders" // due to Servlet Filter urlPatterns not supporting specific HTTP methods
 
-  // Client Lambda Authorizer authorization
   authorizer_id      = aws_apigatewayv2_authorizer.lambda_authorizer_client.id
   authorization_type = "CUSTOM"
   target             = "integrations/${local.proxy_to_alb_id}"
@@ -53,7 +53,8 @@ resource "aws_apigatewayv2_route" "order_confirmation" {
   api_id    = local.api_id
   route_key = "POST /payment/payments/initialize"
 
-  // Client Lambda Authorizer authorization
-  target = "integrations/${local.proxy_to_alb_id}"
+  authorizer_id      = aws_apigatewayv2_authorizer.lambda_authorizer_client.id
+  authorization_type = "CUSTOM"
+  target             = "integrations/${local.proxy_to_alb_id}"
 
 }

api_gateway.tf

@@ -12,7 +12,7 @@ variable "order_svc_db_password" {
 variable "order_svc_db_name" {
   description = "Order Service RDS Database instance name"
   type        = string
-  default     = "postgres"
+  default     = "order_db"
 }
 
 // ---
@@ -31,5 +31,5 @@ variable "payment_svc_db_password" {
 variable "payment_svc_db_name" {
   description = "Payment Service RDS Database instance name"
   type        = string
-  default     = "postgres"
+  default     = "payment_db"
 }

database_variables.tf

@@ -24,14 +24,15 @@ resource "aws_lambda_function" "identification_nationalid" {
   description   = "Generates Client JWT using National ID"
   role          = data.aws_iam_role.lab_role.arn
   handler       = "index.handler"
+  timeout       = 10 # debug
 
   source_code_hash = data.archive_file.lambda_identification_nationalid.output_base64sha256
 
   runtime = "nodejs20.x"
 
   environment {
     variables = {
-      BACKEND_URL     = local.alb_url
+      BACKEND_URL     = "${local.alb_url}/identification"
       JWT_PRIVATE_KEY = var.client_jwt_private_key
     }
   }
@@ -60,8 +61,7 @@ resource "aws_lambda_function" "authorizer_client" {
 
   environment {
     variables = {
-      BACKEND_URL     = local.alb_url
-      JWT_PRIVATE_KEY = var.client_jwt_private_key
+      JWT_PUBLIC_KEY = var.client_jwt_public_key
     }
   }
 

lambda.tf

@@ -1,5 +1,5 @@
 locals {
-  alb_url           = data.tfe_outputs.network.values.lb_lb.dns_name
+  alb_url           = "http://${data.tfe_outputs.network.values.lb_lb.dns_name}"
   dynamodb_endpoint = "dynamodb.${var.aws_region}.amazonaws.com"
   sqs_endpoint      = data.tfe_outputs.network.values.vpc_endpoint_sqs.dns_entry[0].dns_name