Skip to content

feat(local-artifact): optionally upload artifact zip files directly to Lambda instead of S3 #3

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 29, 2022
Merged

feat(local-artifact): optionally upload artifact zip files directly to Lambda instead of S3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions artifact.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data "archive_file" "artifact_dir" {
}
# Upload the zipped artifact to S3
resource "aws_s3_object" "artifact_dir" {
count = var.local_artifact == null ? 0 : var.local_artifact.type == "dir" ? 1 : 0
count = var.local_artifact == null ? 0 : var.local_artifact.type == "dir" && var.local_artifact.s3_bucket != null ? 1 : 0

bucket = var.local_artifact.s3_bucket
key = "${local.s3_artifact_prefix}/handler.zip"
Expand All @@ -48,7 +48,7 @@ resource "aws_s3_object" "artifact_dir" {

# Upload the pre-existing artifact zip to S3
resource "aws_s3_object" "artifact_zip" {
count = var.local_artifact == null ? 0 : var.local_artifact.type == "zip" ? 1 : 0
count = var.local_artifact == null ? 0 : var.local_artifact.type == "zip" && var.local_artifact.s3_bucket != null ? 1 : 0

bucket = var.local_artifact.s3_bucket
key = "${local.s3_artifact_prefix}/${basename(var.local_artifact.path)}"
Expand All @@ -65,5 +65,6 @@ resource "aws_s3_object" "artifact_zip" {

locals {
# Choose the correct artifact according to the input definition
artifact = var.local_artifact == null ? data.aws_s3_object.artifact[0] : var.local_artifact.type == "zip" ? aws_s3_object.artifact_zip[0] : aws_s3_object.artifact_dir[0]
artifact = try(data.aws_s3_object.artifact[0], aws_s3_object.artifact_zip[0], aws_s3_object.artifact_dir[0], null)
artifact_file = var.local_artifact != null && local.artifact == null ? try(data.archive_file.artifact_dir[0].output_path, var.local_artifact.path, null) : null
}
9 changes: 5 additions & 4 deletions lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ resource "aws_lambda_function" "this" {
size = var.ephemeral_storage
}

s3_bucket = local.artifact.bucket
s3_key = local.artifact.key
s3_object_version = local.artifact.version_id
source_code_hash = coalesce(try(local.artifact.source_code_hash, null), base64encode(local.artifact.etag))
s3_bucket = try(local.artifact.bucket, null)
s3_key = try(local.artifact.key, null)
s3_object_version = try(local.artifact.version_id, null)
source_code_hash = coalesce(try(local.artifact.source_code_hash, null), try(base64encode(local.artifact.etag), null), try(filebase64sha256(local.artifact_file), null))
filename = local.artifact == null ? local.artifact_file : null

dynamic "dead_letter_config" {
for_each = var.dead_letter_arn != null ? [var.dead_letter_arn] : []
Expand Down
5 changes: 5 additions & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ variable "local_artifact" {
condition = var.local_artifact == null || try(var.local_artifact.type, "") != "zip" || can(regex("\\.zip$", var.local_artifact.path))
error_message = "Invalid file for type=\"zip\"."
}

validation {
condition = var.local_artifact == null || try(var.local_artifact.s3_bucket, null) != null || try(var.local_artifact.s3_prefix, null) == null
error_message = "Invalid \"local_artifact\", \"s3_bucket\" should not be null when \"s3_prefix\" is provided."
}
}
variable "s3_artifact" {
description = "Pre-existing artifact stored in S3. Version ID is recommended but optional (provide version_id = null to omit it)."
Expand Down