feat: working tf plana

Author: JacobCoffee

infra/Makefile

@@ -5,8 +5,3 @@ fmt:
 .PHONY: check
 check:
 	@terraform validate
-
-.PHONY: yolo
-yolo:
-	@echo "Wise, you are not..."
-	@terraform apply -auto-approve

infra/cdn/README.md

@@ -34,7 +34,7 @@ module "fastly_production" {
   datadog_key         = var.DATADOG_API_KEY
   fastly_key          = var.FASTLY_API_KEY
   fastly_header_token = var.FASTLY_HEADER_TOKEN
-  fastly_s3_logging   = var.fastly_s3_logging
+  s3_logging_keys     = var.fastly_s3_logging
 }
 ```
 

infra/cdn/main.tf

@@ -45,7 +45,7 @@ resource "fastly_service_vcl" "python_org" {
     ssl_check_cert        = true
     ssl_cert_hostname     = "lb.psf.io"
     ssl_sni_hostname      = "lb.psf.io"
-    ssl_ca_cert           = file("${path.module}/cdn/certs/psf.io.pem")
+    ssl_ca_cert           = file("${path.module}/certs/psf.io.pem")
     weight                = 100
     max_conn              = 200
     connect_timeout       = 1000

infra/main.tf

@@ -16,7 +16,7 @@ module "fastly_production" {
 module "fastly_staging" {
   source = "./cdn"
 
-  name            = "test.Python.org"
+  name            = "test.python.org"
   domain          = "test.python.org"
   extra_domains   = []
   # TODO: adjust to test-pythondotorg when done testing NGWAF

infra/variables.tf

@@ -14,7 +14,7 @@ variable "DATADOG_API_KEY" {
   sensitive   = true
 }
 variable "fastly_s3_logging" {
-  type        = string
+  type        = map(string)
   description = "S3 bucket keys for Fastly logging"
   sensitive   = true
 }