Increase Lambda Function Timeout to 10 seconds for first time starts (#…

…625) * Increase Lambda Function Timeout to 10 seconds for first time starts * Bump Ruby Version to 3.3 * Update Hashicorp version to allow upgrade to ruby3.3 * Don't bundle money-rails (which installs like half of rails)
thewca · Jul 17, 2024 · fea979c · fea979c
1 parent 0f5cbee
commit fea979c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/app/models/registration.rb b/app/models/registration.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'time'
-require 'money-rails'
 
 class Registration
   include Dynamoid::Document
@@ -105,8 +104,7 @@ def payment_amount
   def payment_amount_human_readable
     payment_details = payment_lane&.lane_details
     unless payment_details.nil?
-      money = Money.from_cents(payment_details['amount_lowest_denominator'], payment_details['currency_code'])
-      "#{money.format} (#{money.currency.name})"
+      MoneyFormat.format_human_readable(payment_details['amount_lowest_denominator'], payment_details['currency_code'])
     end
   end
 

diff --git a/infra/lambda/Gemfile b/infra/lambda/Gemfile
@@ -2,11 +2,10 @@
 
 source 'https://rubygems.org'
 
-ruby '3.2.2'
+ruby '3.3.0'
 
 gem 'dynamoid', '3.8.0'
 gem 'aws-sdk-dynamodb'
 gem 'aws-sdk-sqs'
-gem 'money-rails'
 gem 'superconfig'
 gem 'zeitwerk'
diff --git a/infra/main.tf b/infra/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.11"
+      version = "~> 5.58"
     }
   }
 

diff --git a/infra/staging/lambda.tf b/infra/staging/lambda.tf
@@ -3,8 +3,9 @@ resource "aws_lambda_function" "registration_status_lambda" {
   function_name    = "${var.name_prefix}-poller-lambda-staging"
   role             = aws_iam_role.lambda_role.arn
   handler          = "registration_status.lambda_handler"
-  runtime          = "ruby3.2"
+  runtime          = "ruby3.3"
   source_code_hash = filebase64sha256("./lambda/registration_status.zip")
+  timeout = 10
   environment {
     variables = {
       QUEUE_URL = aws_sqs_queue.this.url

diff --git a/infra/worker/lambda.tf b/infra/worker/lambda.tf
@@ -3,8 +3,9 @@ resource "aws_lambda_function" "registration_status_lambda" {
   function_name    = "${var.name_prefix}-poller-lambda-prod"
   role             = aws_iam_role.lambda_role.arn
   handler          = "registration_status.lambda_handler"
-  runtime          = "ruby3.2"
+  runtime          = "ruby3.3"
   source_code_hash = filebase64sha256("./lambda/registration_status.zip")
+  timeout = 10
   environment {
     variables = {
       QUEUE_URL = var.shared_resources.queue.url

diff --git a/lib/money_format.rb b/lib/money_format.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'money-rails'
+
+module MoneyFormat
+  def self.format_human_readable(amount_lowest_denominator, currency_code)
+    money = Money.from_cents(amount_lowest_denominator, currency_code)
+    "#{money.format} (#{money.currency.name})"
+  end
+end