From 00b5e80b011a86ff27074326bc0ae6a77ee3dde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Wed, 21 Apr 2021 14:19:38 +0200
Subject: [PATCH] spesifiserer lambdaversjon
---
.gitlab-ci.yml | 2 ++
aws/beta.ordbok.uib.no_stack.yaml | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce83a02e..8df4db4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,7 @@ deploy:
--parameter-overrides "CertificateArn=${CERT_ARN}"
"DomainName=dev.ordbok.uib.no"
"AltDomainName=beta.ordbok-dev.aws.uib.no"
+ "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:7"
--no-fail-on-empty-changeset
--capabilities CAPABILITY_IAM
- aws s3 rm "s3://${STACK_NAME}.aws.uib.no" --recursive
@@ -71,6 +72,7 @@ deploy-prod:
- aws cloudformation deploy --stack-name ${STACK_NAME}
--template-file "aws/beta.ordbok.uib.no_stack.yaml"
--parameter-overrides "CertificateArn=${CERT_ARN}"
+ "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:11"
--no-fail-on-empty-changeset
--capabilities CAPABILITY_IAM
- aws s3 rm "s3://${STACK_NAME}.aws.uib.no" --recursive
diff --git a/aws/beta.ordbok.uib.no_stack.yaml b/aws/beta.ordbok.uib.no_stack.yaml
index 3aa46737..995d57bd 100644
--- a/aws/beta.ordbok.uib.no_stack.yaml
+++ b/aws/beta.ordbok.uib.no_stack.yaml
@@ -33,6 +33,9 @@ Parameters:
CertificateArn:
Type: String
+ PathRewriteLambdaARN:
+ Type: QueryString
+ Description: ARN to lambda function in us-east-1 used to rewrite paths
###############################################################################
Resources:
@@ -123,7 +126,7 @@ Resources:
LambdaFunctionAssociations:
- EventType: viewer-request
IncludeBody: false
- LambdaFunctionARN: !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:path_rewrite"
+ LambdaFunctionARN: !Ref PathRewriteLambdaARN
ForwardedValues:
QueryString: 'false'
Cookies:
@@ -144,7 +147,7 @@ Resources:
LambdaFunctionAssociations:
- EventType: viewer-request
IncludeBody: false
- LambdaFunctionARN: !Sub "arn:aws:lambda:us-east-1:${AWS::AccountId}:function:path_rewrite"
+ LambdaFunctionARN: !Ref PathRewriteLambdaARN
ForwardedValues:
QueryString: true
Cookies:
--
GitLab