Skip to content
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

Update data.gov.uk #52

Merged
merged 11 commits into from
Jan 26, 2024
Merged

Update data.gov.uk #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b1cc207
Use a dynamic block for DGU domain
AgaDufrat Jan 23, 2024
3c273dd
Remove obsolete conditions from DGU
AgaDufrat Jan 25, 2024
2fb8e33
Remove unnecessary vcl_hash subroutine from DGU
AgaDufrat Jan 25, 2024
d8a8b0e
Don't use deprecated `grace` variable
AgaDufrat Jan 25, 2024
8f87f1b
Use correct name for DGU backend
AgaDufrat Jan 25, 2024
9ab84b3
Add datagovuk-integration module
AgaDufrat Jan 25, 2024
2714a0d
Add datagovuk_staging and datagovuk_production variables
AgaDufrat Jan 25, 2024
4f6a885
Import datagovuk-integration state to TF Cloud
AgaDufrat Jan 25, 2024
c726670
Add data.gov.uk to www.data.gov.uk redirect location header
AgaDufrat Jan 26, 2024
005a0f0
Add Force TLS request setting for DGU
AgaDufrat Jan 26, 2024
a9c5893
Add $ENV to www.$ENV redirect synthetic response for DGU
AgaDufrat Jan 26, 2024
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
2 changes: 2 additions & 0 deletions .terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 17 additions & 9 deletions datagovuk.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@ variable "datagovuk_integration" {
type = string
}

# module "datagovuk-integration" {
# source = "./modules/datagovuk"
module "datagovuk-integration" {
source = "./modules/datagovuk"

# configuration = {
# environment = "integration"
# git_hash = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA
# probe = "/"
# }
configuration = {
environment = "integration"
git_hash = var.TFC_CONFIGURATION_VERSION_GIT_COMMIT_SHA
probe = "/"
}

# secrets = yamldecode(var.datagovuk_integration)
# }
secrets = yamldecode(var.datagovuk_integration)
}

variable "datagovuk_staging" {
type = string
}

variable "datagovuk_production" {
type = string
}
22 changes: 4 additions & 18 deletions modules/datagovuk/datagovuk.vcl.tftpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
backend F_origin {
backend F_cname_find_eks_${environment}_govuk_digital {
.connect_timeout = 5s;
.dynamic = true;
.port = "${origin_port}";
Expand Down Expand Up @@ -98,7 +98,7 @@ sub vcl_recv {
}

# Serve from stale for 24 hours if origin is sick
set req.grace = 24h;
set req.max_stale_if_error = 24h;

# Default backend.
set req.backend = F_origin;
Expand Down Expand Up @@ -126,14 +126,9 @@ sub vcl_fetch {

set beresp.http.Fastly-Backend-Name = req.http.Fastly-Backend-Name;

if ((beresp.status >= 500 && beresp.status <= 599) && req.restarts < 3 && (req.request == "GET" || req.request == "HEAD") && !beresp.http.No-Fallback) {
set beresp.saintmode = 5s;
return (restart);
}

if (req.restarts == 0) {
# Keep stale for origin
set beresp.grace = 24h;
set beresp.stale_if_error = 24h;
}

if(req.restarts > 0 ) {
Expand All @@ -154,7 +149,7 @@ sub vcl_fetch {

if (beresp.status == 500 || beresp.status == 503) {
set beresp.ttl = 1s;
set beresp.grace = 5s;
set beresp.stale_if_error = 5s;
return (deliver);
}

Expand Down Expand Up @@ -200,11 +195,6 @@ sub vcl_error {
}
}

# Assume we've hit vcl_error() because the backend is unavailable
if (req.restarts < 2) {
return (restart);
}

synthetic {"
<!DOCTYPE html>
<html>
Expand All @@ -230,8 +220,4 @@ sub vcl_error {

sub vcl_pass {
#FASTLY pass
}

sub vcl_hash {
#FASTLY hash
}
28 changes: 26 additions & 2 deletions modules/datagovuk/service.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ resource "fastly_service_vcl" "service" {
name = "${title(local.template_values["environment"])} data.gov.uk"
comment = ""

domain {
name = local.template_values["hostname"]
dynamic "domain" {
for_each = lookup(local.template_values, "hostnames", [])
iterator = each
content {
name = each.value
}
}

vcl {
Expand Down Expand Up @@ -93,6 +97,26 @@ resource "fastly_service_vcl" "service" {
}
}

header {
name = "${local.template_values["environment"]}.data.gov.uk to www.${local.template_values["environment"]}.data.gov.uk redirect location header"
action = "set"
type = "response"
destination = "http.Location"
source = "\"https://www.${local.template_values["environment"]}.data.gov.uk\" + req.url"
response_condition = "${local.template_values["environment"]}.data.gov.uk to www.${local.template_values["environment"]}.data.gov.uk redirect response condition"
}

response_object {
name = "${local.template_values["environment"]}.data.gov.uk to www.${local.template_values["environment"]}.data.gov.uk redirect synthetic response"
status = 301
request_condition = "${local.template_values["environment"]}.data.gov.uk to www.${local.template_values["environment"]}.data.gov.uk redirect request condition"
}

request_setting {
name = "Force TLS"
force_ssl = true
}

dynamic "logging_splunk" {
for_each = {
for splunk in lookup(var.secrets, "splunk", []) : splunk.name => splunk
Expand Down