From 9122b70fc20e31bd5b823a84ef77d4fc9bdf95f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Thu, 22 Apr 2021 12:49:23 +0200
Subject: [PATCH] re meta#334 bruk dev-ordbok-cache
---
.gitlab-ci.yml | 6 +++++-
aws/beta.ordbok.uib.no_stack.yaml | 14 ++++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f269cf02..7995f162 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ build-prod:
paths:
- dist
-deploy:
+deploy-dev:
image: uibit/awscli:latest
stage: deploy
only:
@@ -47,6 +47,8 @@ deploy:
"AltDomainName=dev.ordbok.uib.no"
"DomainName=beta.ordbok-dev.aws.uib.no"
"PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:2"
+ "OrdbokCacheOriginDomain=8mwl23g34a.execute-api.eu-west-1.amazonaws.com"
+ "OrdbokCacheStage=DEV"
--no-fail-on-empty-changeset
--capabilities CAPABILITY_IAM
- aws s3 rm "s3://${STACK_NAME}.aws.uib.no" --recursive
@@ -74,6 +76,8 @@ deploy-prod:
--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"
+ "OrdbokCacheOriginDomain=n5speug9cl.execute-api.eu-west-1.amazonaws.com"
+ "OrdbokCacheStage=PROD"
--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 dd8d25b0..bf5cca42 100644
--- a/aws/beta.ordbok.uib.no_stack.yaml
+++ b/aws/beta.ordbok.uib.no_stack.yaml
@@ -37,6 +37,16 @@ Parameters:
Type: String
Description: ARN to lambda function in us-east-1 used to rewrite paths
+ OrdbokCacheOriginDomain:
+ Type: String
+ Description: Domain name for ordbok cache
+
+ OrdbokCacheStage:
+ Type: String
+ AllowedValues:
+ - DEV
+ - PROD
+
###############################################################################
Resources:
###############################################################################
@@ -109,8 +119,8 @@ Resources:
S3OriginConfig:
OriginAccessIdentity: !Sub "origin-access-identity/cloudfront/${CloudFrontOriginIdentity}"
- Id: OrdbokCache
- DomainName: "n5speug9cl.execute-api.eu-west-1.amazonaws.com"
- OriginPath: "/PROD"
+ DomainName: !Ref OrdbokCacheOriginDomain
+ OriginPath: !Sub "/${OrdbokCacheStage}"
CustomOriginConfig:
OriginProtocolPolicy: https-only
OriginKeepaliveTimeout: 60
--
GitLab