ci: move pages tf logic to use modules (#66)

deployment/.env

@@ -0,0 +1,4 @@
+export TF_VAR_cloudflare_account_id="op://tf/cloudflare/account_id"
+export TF_VAR_cloudflare_api_token="op://tf/cloudflare/api_token"
+export TF_VAR_tf_state_postgres_conn_str="op://tf/tf_state/postgres_conn_str"
+export TF_VAR_env=$ENVIRONMENT

deployment/modules/cloudflare/static-pages/.terraform.lock.hcl

@@ -5,20 +5,7 @@ provider "registry.opentofu.org/cloudflare/cloudflare" {
   version     = "4.46.0"
   constraints = "4.46.0"
   hashes = [
-    "h1:3U4N3bbMacXTAdyaEwT305kETMETh1jZmGApmN6gdyE=",
-    "h1:3fhZhGNgtS9ugcZ2CIH6kk8LzN6yPxqOdkDUZqkP3+w=",
-    "h1:JWluJxBRSr8GVUhWVv83xse9SmbpwCLctCDddMXUnVk=",
-    "h1:KDHwakGt+3iBKXaoALCCAolPaJgpEHbkh3BfjnpuqoM=",
     "h1:QFFZshAvwr9L5TQmsNQC6/sDqokk5pjbP8Ae4BQqMLQ=",
-    "h1:Qdi+vXwzDNii7ytSaOQtnlqhjZ3ZlRoUkFoi6CD2COI=",
-    "h1:TPcJXcVb/+C91hUuu8CEn98QUoNgLtnHfd4sgAOV+5k=",
-    "h1:WDy5wiNroXaCnw+r8rJnCP+J1RVsm2Qu3AOZ/iV4lLo=",
-    "h1:hMuL+dwHj3JbePqYcDrn/ZQN9R0WzeJX0AIDJ02Iteo=",
-    "h1:hQKCaUEARzJKbFt1CePP06E/+CiHWe/H6lc1AwK7y6w=",
-    "h1:l4DQ3WXmSzR/GBel3m2CRKWtaziVjBoxvUgL63t1GK0=",
-    "h1:nN9uVSLyrb/DjfZl6rPtCq5j0TX+6WypzNDexdzCQ08=",
-    "h1:rAX7njl6lKT9XIKMk6pLjVi7u/42wafRolWWgMHMkI0=",
-    "h1:t2IQYNu8YNykqYlEB+TTX+XpUd5z2flwGw8km9UgbnQ=",
     "zh:2ee426ef3389022db0026792fdc4f2980dcf2600e31adf5a31b4bddfa8d68343",
     "zh:2f993edb23df55dc1c18150fa187d80aa7d87e6439698ee34b6a6aad23ac2dd7",
     "zh:3d6601333975e55979b1b454e50ff9a482ce4e0269dd6c72a50202163a8f4463",

deployment/modules/cloudflare/static-pages/domain.tf

@@ -1,26 +0,0 @@
-resource "cloudflare_pages_domain" "immich_app_branch_domain" {
-  account_id   = var.cloudflare_account_id
-  project_name = data.terraform_remote_state.cloudflare_account.outputs.static_pages_project_names[var.app_url]
-  domain       = local.domain
-}
-
-resource "cloudflare_record" "immich_app_branch_subdomain" {
-  name    = local.domain
-  proxied = true
-  ttl     = 1
-  type    = "CNAME"
-  value   = local.is_main ? data.terraform_remote_state.cloudflare_account.outputs.static_pages_project_subdomains[var.app_url] : "${replace(var.prefix_name, "/\\/|\\./", "-")}.${data.terraform_remote_state.cloudflare_account.outputs.static_pages_project_subdomains[var.app_url]}"
-  zone_id = data.terraform_remote_state.cloudflare_account.outputs.immich_app_zone_id
-}
-
-output "immich_app_branch_subdomain" {
-  value = cloudflare_record.immich_app_branch_subdomain.hostname
-}
-
-output "immich_app_branch_pages_hostname" {
-  value = cloudflare_record.immich_app_branch_subdomain.value
-}
-
-output "pages_project_name" {
-  value = cloudflare_pages_domain.immich_app_branch_domain.project_name
-}

deployment/modules/cloudflare/static-pages/locals.tf

@@ -1,5 +0,0 @@
-locals {
-  is_main = var.prefix_name == "main"
-  domain_prefix =  !local.is_main && contains(["branch", "pr"], var.prefix_event_type) ? "${var.prefix_name}.preview." : ""
-  domain = "${local.domain_prefix}${var.app_url}"
-}

deployment/modules/cloudflare/static-pages/pages.tf

@@ -0,0 +1,28 @@
+module "static_pages" {
+  source = "git::https://github.com/immich-app/devtools.git//tf/shared/modules/cloudflare-pages?ref=main"
+
+  cloudflare_api_token          = data.terraform_remote_state.api_keys_state.outputs.terraform_key_cloudflare_docs
+  cloudflare_account_id         = data.terraform_remote_state.cloudflare_account.outputs.cloudflare_account_id
+
+  pages_project = data.terraform_remote_state.cloudflare_account.outputs.pages_projects["${var.app_name}.immich.app"]
+
+  app_name = var.app_name
+  stage    = var.stage
+  env      = var.env
+}
+
+output "pages_branch" {
+  value = module.static_pages.pages_branch
+}
+
+output "immich_subdomain" {
+  value = module.static_pages.branch_subdomain
+}
+
+output "pages_branch_subdomain" {
+  value = module.static_pages.pages_branch_subdomain
+}
+
+output "pages_project_name" {
+  value = module.static_pages.pages_project_name
+}

deployment/modules/cloudflare/static-pages/providers.tf

@@ -1,3 +0,0 @@
-provider "cloudflare" {
-  api_token = data.terraform_remote_state.api_keys_state.outputs.terraform_key_cloudflare_docs
-}

deployment/modules/cloudflare/static-pages/terragrunt.hcl

@@ -11,7 +11,8 @@ include {
 }
 
 locals {
-  prefix_name = get_env("TF_VAR_prefix_name")
+  env = get_env("TF_VAR_env")
+  stage = get_env("TF_VAR_stage")
   app_name = replace(get_env("TF_VAR_app_name"), "-", "_")
 }
 
@@ -19,7 +20,7 @@ remote_state {
   backend = "pg"
 
   config = {
-    conn_str = get_env("TF_STATE_POSTGRES_CONN_STR")
-    schema_name = "prod_cloudflare_immich_app_${local.app_name}_${local.prefix_name}"
+    conn_str = get_env("TF_VAR_tf_state_postgres_conn_str")
+    schema_name = "prod_cloudflare_immich_app_${local.app_name}_${local.env}${local.stage}"
   }
 }

deployment/modules/cloudflare/static-pages/variables.tf

@@ -1,6 +1,4 @@
-variable "cloudflare_account_id" {}
 variable "tf_state_postgres_conn_str" {}
-
-variable "prefix_name" {}
-variable "prefix_event_type" {}
-variable "app_url" {}
+variable "stage" {}
+variable "env" {}
+variable "app_name" {}

deployment/state.hcl

@@ -1,8 +1,5 @@
 locals {
-  cloudflare_account_id = get_env("CLOUDFLARE_ACCOUNT_ID")
-  cloudflare_api_token  = get_env("CLOUDFLARE_API_TOKEN")
-
-  tf_state_postgres_conn_str = get_env("TF_STATE_POSTGRES_CONN_STR")
+  tf_state_postgres_conn_str = get_env("TF_VAR_tf_state_postgres_conn_str")
 }
 
 remote_state {
@@ -14,7 +11,5 @@ remote_state {
 }
 
 inputs = {
-  cloudflare_account_id      = local.cloudflare_account_id
-  cloudflare_api_token       = local.cloudflare_api_token
   tf_state_postgres_conn_str = local.tf_state_postgres_conn_str
 }