feat: latest most minimal diff :D

python · Sep 5, 2024 · 1b88cfb · 1b88cfb
1 parent 5bda132
commit 1b88cfb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl
diff --git a/infra/cdn/main.tf b/infra/cdn/main.tf
@@ -4,7 +4,7 @@ resource "fastly_service_vcl" "python_org" {
   http3              = false
   stale_if_error     = false
   stale_if_error_ttl = 43200
-  activate           = true
+  activate           = false
 
   domain {
     name = var.domain
@@ -32,13 +32,14 @@ resource "fastly_service_vcl" "python_org" {
     connect_timeout       = 1000
     first_byte_timeout    = 30000
     between_bytes_timeout = 10000
-    override_host         = "www.python.org"
+    override_host         = var.subdomain == "test.python.org" ? "www.python.org" : null
   }
 
   backend {
     name                  = "loadbalancer"
     address               = "lb.nyc1.psf.io"
-    shield                = "iad-va-us"
+    port                  = 20004
+    shield                = "lga-ny-us"
     healthcheck           = "HAProxy Status"
     auto_loadbalance      = false
     use_ssl               = true
@@ -51,7 +52,7 @@ resource "fastly_service_vcl" "python_org" {
     connect_timeout       = 1000
     first_byte_timeout    = 15000
     between_bytes_timeout = 10000
-    override_host         = var.domain == "test.python.org" ? "www.python.org" : null
+    override_host         = var.subdomain == "test.python.org" ? "www.python.org" : null
   }
 
   acl {
@@ -82,7 +83,7 @@ resource "fastly_service_vcl" "python_org" {
   condition {
     name      = "HSTS w/ subdomains"
     priority  = 10
-    statement = "req.http.host == \"${var.domain}\""
+    statement = "req.http.host == \"${var.subdomain}\""
     type      = "RESPONSE"
   }
   condition {
@@ -191,7 +192,7 @@ resource "fastly_service_vcl" "python_org" {
     name               = "www redirect"
     priority           = 10
     response_condition = "apex redirect"
-    source             = "\"https://www.\" + req.http.host + req.url"
+    source             = "\"https://${var.subdomain}\" + req.url"
     type               = "response"
   }
   header {
@@ -255,10 +256,10 @@ resource "fastly_service_vcl" "python_org" {
     name             = "psf-fastly-logs"
     bucket_name      = "psf-fastly-logs-eu-west-1"
     domain           = "s3-eu-west-1.amazonaws.com"
-    path             = "/${replace(var.domain, ".", "-")}/%Y/%m/%d/"
+    path             = "/${replace(var.subdomain, ".", "-")}/%Y/%m/%d/"
     period           = 3600
     gzip_level       = 9
-    format           = "%%h \"%%{now}V\" %%l \"%%{req.request}V %%{req.url}V\" %%{req.proto}V %%>s %%{resp.http.Content-Length}V %%{resp.http.age}V \"%%{resp.http.x-cache}V\" \"%%{resp.http.x-cache-hits}V\" \"%%{req.http.content-type}V\" \"%%{req.http.accept-language}V\" \"%%{cstr_escape(req.http.user-agent)}V\""
+    format           = "%h \"%%{now}V\" %l \"%%{req.request}V %%{req.url}V\" %%{req.proto}V %>s %%{resp.http.Content-Length}V %%{resp.http.age}V \"%%{resp.http.x-cache}V\" \"%%{resp.http.x-cache-hits}V\" \"%%{req.http.content-type}V\" \"%%{req.http.accept-language}V\" \"%%{cstr_escape(req.http.user-agent)}V\""
     timestamp_format = "%Y-%m-%dT%H:%M:%S.000"
     redundancy       = "standard"
     format_version   = 2
@@ -271,7 +272,7 @@ resource "fastly_service_vcl" "python_org" {
     name    = "syslog"
     address = "cdn-logs.nyc1.psf.io"
     port    = 514
-    format  = "%%h \"%%{now}V\" %%l \"%%{req.request}V %%{req.url}V\" %%{req.proto}V %%>s %%{resp.http.Content-Length}V %%{resp.http.age}V \"%%{resp.http.x-cache}V\" \"%%{resp.http.x-cache-hits}V\" \"%%{req.http.content-type}V\" \"%%{req.http.accept-language}V\" \"%%{cstr_escape(req.http.user-agent)}V\""
+    format  = "%h \"%%{now}V\" %l \"%%{req.request}V %%{req.url}V\" %%{req.proto}V %>s %%{resp.http.Content-Length}V %%{resp.http.age}V \"%%{resp.http.x-cache}V\" \"%%{resp.http.x-cache-hits}V\" \"%%{req.http.content-type}V\" \"%%{req.http.accept-language}V\" \"%%{cstr_escape(req.http.user-agent)}V\""
   }
 
   product_enablement {
@@ -296,15 +297,15 @@ resource "fastly_service_vcl" "python_org" {
 
     response {
       content      = <<-EOT
-                <html>
-                        <head>
-                                <title>Too Many Requests</title>
-                        </head>
-                        <body>
-                                <p>Too Many Requests</p>
-                        </body>
-                </html>
-            EOT
+      <html>
+        <head>
+          <title>Too Many Requests</title>
+        </head>
+        <body>
+          <p>Too Many Requests</p>
+        </body>
+      </html>
+      EOT
       content_type = "text/html"
       status       = 429
     }
@@ -341,6 +342,4 @@ resource "fastly_service_vcl" "python_org" {
     response          = "Forbidden"
     status            = 403
   }
-
-  force_destroy = true
 }
diff --git a/infra/cdn/variables.tf b/infra/cdn/variables.tf
@@ -25,6 +25,10 @@ variable "domain" {
   type        = string
   description = "The domain name of the service."
 }
+variable "subdomain" {
+  type        = string
+  description = "The subdomain of the service."
+}
 variable "extra_domains" {
   type        = list(string)
   description = "Extra domains to add to the service."

diff --git a/infra/main.tf b/infra/main.tf
@@ -1,8 +1,9 @@
 module "fastly_production" {
   source = "./cdn"
 
-  name            = "Python.org"
+  name            = "www.python.org"
   domain          = "python.org"
+  subdomain       = "www.python.org"
   extra_domains   = ["www.python.org"]
   backend_address = "pythondotorg.ingress.us-east-2.psfhosted.computer"
   default_ttl     = 3600
@@ -18,7 +19,8 @@ module "fastly_staging" {
 
   name            = "test.python.org"
   domain          = "test.python.org"
-  extra_domains   = []
+  subdomain       = "www.test.python.org"
+  extra_domains   = ["www.test.python.org"]
   # TODO: adjust to test-pythondotorg when done testing NGWAF
   backend_address = "pythondotorg.ingress.us-east-2.psfhosted.computer"
   default_ttl     = 3600