Skip to content

Commit 0096fef

Browse files
committed
update
1 parent 3780444 commit 0096fef

File tree

8 files changed

+6
-36
lines changed

8 files changed

+6
-36
lines changed

.github/workflows/deploy-prod.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,7 @@ jobs:
112112
- uses: actions/checkout@v4
113113
env:
114114
HUSKY: "0"
115-
- uses: aws-actions/setup-sam@v2
116-
with:
117-
use-installer: true
118-
- name: Set up Python 3.11
119-
uses: actions/setup-python@v5
120-
with:
121-
python-version: 3.11
115+
122116
- name: Download Build files
123117
uses: actions/download-artifact@v4
124118
with:

.github/workflows/deploy-qa.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,6 @@ jobs:
126126
with:
127127
name: build
128128

129-
- uses: aws-actions/setup-sam@v2
130-
with:
131-
use-installer: true
132-
133-
- name: Set up Python 3.11
134-
uses: actions/setup-python@v5
135-
with:
136-
python-version: 3.11
137129

138130
- uses: aws-actions/configure-aws-credentials@v4
139131
with:

.github/workflows/manual-prod.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
- build
9898
environment: "AWS PROD"
9999
steps:
100-
- name: Set up Node for testing
100+
- name: Setup Node
101101
uses: actions/setup-node@v4
102102
with:
103103
node-version: 22.x
@@ -110,13 +110,7 @@ jobs:
110110
- uses: actions/checkout@v4
111111
env:
112112
HUSKY: "0"
113-
- uses: aws-actions/setup-sam@v2
114-
with:
115-
use-installer: true
116-
- name: Set up Python 3.11
117-
uses: actions/setup-python@v5
118-
with:
119-
python-version: 3.11
113+
120114
- name: Download Build files
121115
uses: actions/download-artifact@v4
122116
with:

terraform/envs/prod/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ module "frontend" {
9292
CorePublicDomain = var.CorePublicDomain
9393
IcalPublicDomain = var.IcalPublicDomain
9494
LinkryKvArn = aws_cloudfront_key_value_store.linkry_kv.arn
95-
LinkryKvId = aws_cloudfront_key_value_store.linkry_kv.id
9695
LinkryPublicDomain = var.LinkryPublicDomain
9796
}
9897

terraform/envs/qa/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ module "frontend" {
9393
IcalPublicDomain = var.IcalPublicDomain
9494
LinkryPublicDomain = var.LinkryPublicDomain
9595
LinkryKvArn = aws_cloudfront_key_value_store.linkry_kv.arn
96-
LinkryKvId = aws_cloudfront_key_value_store.linkry_kv.id
9796
}
9897
// QA only - setup Route 53 records
9998
resource "aws_route53_record" "frontend" {

terraform/modules/frontend/main.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ resource "aws_cloudfront_function" "linkry_redirect" {
210210
runtime = "cloudfront-js-2.0"
211211
code = <<EOT
212212
import cf from 'cloudfront';
213-
const kvsId = '${var.LinkryKvId}';
214-
const kvs = cf.kvs(kvsId);
213+
const kvs = cf.kvs();
215214
216215
async function handler(event) {
217216
const request = event.request;
@@ -303,7 +302,7 @@ resource "aws_cloudfront_distribution" "linkry_cloudfront_distribution" {
303302
viewer_protocol_policy = "redirect-to-https"
304303
allowed_methods = ["GET", "HEAD"]
305304
cached_methods = ["GET", "HEAD"]
306-
305+
cache_policy_id = "4135ea2d-6df8-44a3-9df3-4b5a84be39ad"
307306
function_association {
308307
event_type = "viewer-request"
309308
function_arn = aws_cloudfront_function.linkry_redirect.arn

terraform/modules/frontend/variables.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,3 @@ variable "OriginVerifyKey" {
4141
variable "LinkryKvArn" {
4242
type = string
4343
}
44-
variable "LinkryKvId" {
45-
type = string
46-
}

terraform/modules/lambdas/main.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,16 @@ resource "aws_iam_role" "entra_role" {
5656
}
5757

5858
resource "aws_iam_role" "sqs_consumer_role" {
59-
name = "${local.core_sqs_consumer_lambda_name}-role"
59+
name = "${local.core_api_lambda_name}-role"
6060
assume_role_policy = jsonencode({
6161
Version = "2012-10-17"
6262
Statement = [
6363
{
6464
Action = "sts:AssumeRole"
6565
Effect = "Allow"
66-
Sid = ""
6766
Principal = {
6867
Service = "lambda.amazonaws.com"
6968
}
70-
Condition = {
71-
ArnEqualsIfExists = "arn:aws:lambda:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:function:${local.core_sqs_consumer_lambda_name}"
72-
}
7369
},
7470
]
7571
})

0 commit comments

Comments
 (0)