updated to use account id from data source and region from variables file

Author: JayJamieson

Dockerfile

@@ -1,15 +1,15 @@
-FROM amazonlinux:latest
+FROM amazonlinux:2.0.20230727.0
 
 RUN yum install -y tar xz gzip gcc
 
-RUN curl -L -o golang.tar.gz https://go.dev/dl/go1.20.7.linux-amd64.tar.gz
+RUN curl -L -o golang.tar.gz https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
 
-RUN  rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz
+RUN rm -rf /usr/local/go && tar -C /usr/local -xzf golang.tar.gz
 
 WORKDIR /project
 
 COPY go.mod go.sum ./
-
 RUN /usr/local/go/bin/go mod download -x
 
+RUN /usr/local/go/bin/go install github.com/mattn/go-sqlite3
 ENV PATH="${PATH}:/usr/local/go/bin"

README.md

@@ -15,6 +15,7 @@ This repository contains example lambda handler integration with API gateway. Te
 ## Setup (optional)
 
 ### Docker
+
 Although not require specifically to run go in lambdas, can be useful to avoid compatibility issues
 when using cgo bindings or third party libraries using cgo such as sqlite3.
 

go.mod

@@ -1,5 +1,5 @@
 module github.com/JayJamieson/go-lambda
 
-go 1.20
+go 1.21
 
 require github.com/aws/aws-lambda-go v1.41.0

infrastructure/api-gateway.tf

@@ -54,7 +54,7 @@ resource "aws_lambda_permission" "api_gateway_lambda" {
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.go_lambda.function_name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "arn:aws:execute-api:ap-southeast-2:834849242330:${aws_api_gateway_rest_api.lambda_api.id}/*"
+  source_arn    = "arn:aws:execute-api:${var.region}:${data.aws_caller_identity.current.account_id}:${aws_api_gateway_rest_api.lambda_api.id}/*"
 }
 
 resource "aws_api_gateway_usage_plan" "lambda_api_usage" {

infrastructure/main.tf

@@ -11,6 +11,8 @@ provider "aws" {
   region = var.region
 }
 
+data "aws_caller_identity" "current" {}
+
 data "archive_file" "lambda" {
   type        = "zip"
   source_file  = "bootstrap"
@@ -59,7 +61,7 @@ resource "aws_iam_policy" "lambda_execution_policy" {
         Action = ["logs:CreateLogGroup"]
         Effect = "Allow"
         Resource = [
-          "arn:aws:logs:ap-southeast-2:834849242330:*"
+          "arn:aws:logs:${var.region}:${data.aws_caller_identity.current.account_id}:*"
         ]
       },
       {
@@ -68,7 +70,7 @@ resource "aws_iam_policy" "lambda_execution_policy" {
           "logs:CreateLogStream",
           "logs:PutLogEvents"
         ],
-        Resource = "arn:aws:logs:ap-southeast-2:834849242330:log-group:*"
+        Resource = "arn:aws:logs:${var.region}:${data.aws_caller_identity.current.account_id}:log-group:*"
       }
     ]
   })