Merge branch 'main' into add-waf-resource

.changeset/silent-phones-tell.md

@@ -0,0 +1,5 @@
+---
+"infrastructure": minor
+---
+
+Removed docs-redirect submodule and getting the cloudfront function code from github

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "apps/nextjs-website/.tmp-docs"]
 	path = apps/nextjs-website/.tmp-docs
 	url = https://github.com/pagopa/devportal-docs.git
-[submodule "apps/docs-redirect"]
-	path = apps/docs-redirect
-	url = https://github.com/pagopa/docs-redirect

apps/infrastructure/src/main.tf

@@ -50,6 +50,14 @@ provider "awscc" {
   region = var.aws_chatbot_region
 }
 
+data "http" "docs_redirect_cf_function_code" {
+  url = "https://raw.githubusercontent.com/pagopa/docs-redirect/refs/heads/main/src/rewriter.js"
+
+  request_headers = {
+    Accept = "text/plain"
+  }
+}
+
 # Init IaC resources ##########################################################
 module "identity" {
   source            = "./identity"
@@ -172,6 +180,8 @@ module "docs_redirect" {
     aws.us-east-1 = aws.us-east-1
   }
 
+  cloudfront_function_code = data.http.docs_redirect_cf_function_code.body
+
   environment = var.environment
   tags        = var.tags
 }

apps/infrastructure/src/modules/docs_redirect/cloudfront.tf

@@ -5,7 +5,7 @@ resource "aws_cloudfront_function" "redirect_viewer_request_handler" {
   comment = "Redirects ${var.domain_to_redirect.from} requests to the correct domain"
   # publish this version only if the env is true
   publish = true
-  code    = file("${path.root}/../../docs-redirect/src/rewriter.js")
+  code    = var.cloudfront_function_code
 }
 
 resource "aws_cloudfront_distribution" "redirect" {

apps/infrastructure/src/modules/docs_redirect/variables.tf

@@ -33,4 +33,9 @@ variable "use_custom_certificate" {
   type        = bool
   default     = true
   description = "Use custom certificate for the cloudfront distribution"
+}
+
+variable "cloudfront_function_code" {
+  type        = string
+  description = "The code of the cloudfront function"
 }