Skip to content

Commit

Permalink
fix: edge lambdas can't be ecr repos :(
Browse files Browse the repository at this point in the history
  • Loading branch information
jsterner30 committed Apr 15, 2024
1 parent 2035a3b commit f1ab341
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 69 deletions.
36 changes: 8 additions & 28 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ jobs:
with:
node-version: ${{ env.node_version }}

- name: npm install in enhanced-headers
working-directory: edge-lambdas/enhanced-headers
run: npm ci --prefer-offline

- name: npm install in eager-redirect
working-directory: edge-lambdas/eager-redirect
run: npm ci --prefer-offline

- name: Copy main-config.yml to /webhooks and /assembler
run: cp ./main-config.yml ./assembler/main-config.yml && cp ./main-config.yml ./webhooks/main-config.yml

Expand Down Expand Up @@ -134,34 +142,6 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push the Eager Redirect Docker image
env:
EAGER_REDIRECT_ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
EAGER_REDIRECT_ECR_REPO: ${{ matrix.env.eager_redirect_ecr_repo_name }}
EAGER_REDIRECT_IMAGE_TAG: ${{ steps.date.outputs.timestamp }}
uses: docker/build-push-action@v3
with:
context: edge-lambdas/eager-redirect
provenance: false
push: true
tags: ${{ env.EAGER_REDIRECT_ECR_REGISTRY }}/${{ env.EAGER_REDIRECT_ECR_REPO }}:${{ env.EAGER_REDIRECT_IMAGE_TAG }}
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push the Enhanced Headers Docker image
env:
ENHANCED_HEADERS_ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
ENHANCED_HEADERS_ECR_REPO: ${{ matrix.env.enhanced_headers_ecr_repo_name }}
ENHANCED_HEADERS_IMAGE_TAG: ${{ steps.date.outputs.timestamp }}
uses: docker/build-push-action@v3
with:
context: edge-lambdas/eager-redirect
provenance: false
push: true
tags: ${{ env.ENHANCED_HEADERS_ECR_REGISTRY }}/${{ env.ENHANCED_HEADERS_ECR_REPO }}:${{ env.ENHANCED_HEADERS_IMAGE_TAG }}
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push the Webhook Docker image
env:
WEBHOOKS_ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
Expand Down
13 changes: 0 additions & 13 deletions edge-lambdas/eager-redirect/Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions edge-lambdas/enhanced-headers/Dockerfile

This file was deleted.

23 changes: 15 additions & 8 deletions iac/modules/app/eager-redirect.tf
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
resource "aws_lambda_function" "eager_redirect_func" {
function_name = "${var.cdn_name}-edge-eager-redirect-${var.env}"
role = aws_iam_role.edge_lambda_execution_role.arn
package_type = "Image"
image_uri = "${data.aws_ecr_repository.eager_redirect_ecr_repo.repository_url}:${var.image_tag}"
publish = true
memory_size = 512
timeout = 20
data "archive_file" "eager_redirect_func" {
type = "zip"
source_dir = "../../../edge-lambdas/eager-redirect"
output_path = "../../../edge-lambdas/eager-redirect.zip"
}

resource "aws_lambda_function" "eager_redirect_func" {
function_name = "${var.cdn_name}-edge-eager-redirect-${var.env}"
filename = data.archive_file.eager_redirect_func.output_path
handler = "index.handler"
runtime = "nodejs16.x"
memory_size = 512
timeout = 20
role = aws_iam_role.edge_lambda_execution_role.arn
publish = true
source_code_hash = data.archive_file.eager_redirect_func.output_base64sha256 # forces terraform to push the zip files when they change
}
# ==================== CloudWatch ====================

resource "aws_cloudwatch_log_group" "eager_redirect_log_group" {
Expand Down
22 changes: 15 additions & 7 deletions iac/modules/app/enhanced-headers.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
data "archive_file" "enhanced_header_func" {
type = "zip"
source_dir = "../../../edge-lambdas/enhanced-headers"
output_path = "../../../edge-lambdas/enhanced-headers.zip"
}

resource "aws_lambda_function" "enhanced_headers_func" {
function_name = "${var.cdn_name}-edge-enhanced-headers-${var.env}"
role = aws_iam_role.edge_lambda_execution_role.arn
package_type = "Image"
image_uri = "${data.aws_ecr_repository.enhanced_headers_ecr_repo.repository_url}:${var.image_tag}"
publish = true
memory_size = 128
timeout = 20
function_name = "${var.cdn_name}-edge-enhanced-headers-${var.env}"
filename = data.archive_file.enhanced_header_func.output_path
handler = "index.handler"
runtime = "nodejs16.x"
memory_size = 128
timeout = 20
role = aws_iam_role.edge_lambda_execution_role.arn
publish = true
source_code_hash = data.archive_file.enhanced_header_func.output_base64sha256 # forces terraform to push the zip files when they change
}

# ==================== CloudWatch ====================
Expand Down
File renamed without changes.

0 comments on commit f1ab341

Please sign in to comment.