functioning terraform

yifen9 · yifen9 · commit 29944f7842ec · 2025-09-06T11:31:07.000+02:00
diff --git a/.devcontainer/.gitignore b/.devcontainer/.gitignore
@@ -0,0 +1 @@
+dev.env
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,12 @@
+FROM node:20-bookworm
+
+RUN set -eux; \
+  apt-get update; \
+  apt-get install -y --no-install-recommends wget gnupg lsb-release ca-certificates software-properties-common; \
+  wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor >/usr/share/keyrings/hashicorp-archive-keyring.gpg; \
+  echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" \
+    >/etc/apt/sources.list.d/hashicorp.list; \
+  apt-get update; \
+  apt-get install -y terraform; \
+  terraform -v; \
+  rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml
@@ -1,11 +1,16 @@
 services:
   unitn-oj:
-    image: node:20-bookworm
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: unitn-oj-dev
     container_name: unitn-oj
     working_dir: /workspace
     ports:
       - "4173:4173"
       - "8080:8080"
+    env_file:
+      - dev.env
     volumes:
       - "..:/workspace"
     command: >
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,6 +6,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "jeff-hykin.better-dockerfile-syntax",
         "ms-vscode.vscode-typescript-next",
         "jacano.vscode-pnpm",
         "antfu.vite",
@@ -14,7 +15,8 @@
         "bradlc.vscode-tailwindcss",
         "biomejs.biome",
         "hashicorp.terraform",
-        "marcoroth.turbo-lsp"
+        "marcoroth.turbo-lsp",
+        "hashicorp.hcl"
       ]
     }
   }
diff --git a/biome.json b/biome.json
@@ -6,7 +6,7 @@
 		"useIgnoreFile": true
 	},
 	"files": {
-		"includes": ["backend/**/*", "frontend/**/*", "tests/**/*"]
+		"includes": ["backend/**/*", "frontend/**/*", "infra/**/*", "tests/**/*"]
 	},
 	"assist": {
 		"enabled": true,
diff --git a/frontend/package.json b/frontend/package.json
@@ -8,7 +8,6 @@
 		"db:apply:local": "wrangler d1 migrations apply DB --local",
 		"db:seed:local": "wrangler d1 execute DB --local --file d1/seed/dev_seed.sql",
 		"db:init:local": "pnpm db:apply:local && pnpm db:seed:local",
-		"db:init": "pnpm db:init:local",
 		"prepare": "svelte-kit sync",
 		"build": "vite build",
 		"preview": "vite preview",
diff --git a/frontend/wrangler.jsonc b/frontend/wrangler.jsonc
@@ -1,40 +1,32 @@
 {
-	"name": "unitn-oj-frontend",
+  "name": "unitn-oj-frontend",
 
-	"compatibility_date": "2024-09-23",
-	"compatibility_flags": ["nodejs_compat"],
+  "compatibility_date": "2025-09-06",
+  "compatibility_flags": ["nodejs_compat"],
 
-	"pages_build_output_dir": ".svelte-kit/cloudflare",
+  "pages_build_output_dir": ".svelte-kit/cloudflare",
 
-	"dev": {
-		"ip": "0.0.0.0",
-		"port": 8080,
-		"local_protocol": "http"
-	},
+  "dev": {
+    "ip": "0.0.0.0",
+    "port": 8080,
+    "local_protocol": "http"
+  },
 
-	"d1_databases": [
-		{
-			"binding": "DB",
-			"database_name": "unitn_oj_local",
-			"database_id": "LOCAL",
-			"migrations_dir": "d1/migrations"
-		}
-	],
+  "d1_databases": [
+    {
+      "binding": "DB",
+      "database_name": "unitn_oj_local",
+      "database_id": "LOCAL",
+      "migrations_dir": "d1/migrations"
+    }
+  ],
 
-	"queues": {
-		"producers": [
-			{
-				"queue": "submissions",
-				"binding": "QUEUE_SUBMISSIONS"
-			}
-		]
-	},
-
-	"vars": {
-		"APP_ENV": "dev",
-		"AUTH_ALLOWED_DOMAIN": "studenti.unitn.it",
-		"AUTH_TOKEN_TTL_SECONDS": "300",
-		"AUTH_SESSION_TTL_SECONDS": "604800",
-		"AUTH_SESSION_SECRET": "dev-secret"
-	}
+  "queues": {
+    "producers": [
+      {
+        "queue": "unitn-oj-submissions-dev",
+        "binding": "QUEUE_SUBMISSIONS"
+      }
+    ]
+  }
 }
diff --git a/infra/terraform/.gitignore b/infra/terraform/.gitignore
@@ -0,0 +1,2 @@
+.terraform
+terraform.tfstate.d
diff --git a/infra/terraform/.terraform.lock.hcl b/infra/terraform/.terraform.lock.hcl
diff --git a/infra/terraform/dev.tfvars b/infra/terraform/dev.tfvars
@@ -1,4 +1,2 @@
-account_id   = "cf_account_id_dev"
-zone_id      = "cf_zone_id_dev"
 project_name = "unitn-oj-dev"
-queue_name   = "unitn-oj-submissions-dev"
+queue_name   = "unitn-oj-submissions-dev"
diff --git a/infra/terraform/main.tf b/infra/terraform/main.tf
@@ -1,15 +1,18 @@
 resource "cloudflare_pages_project" "frontend" {
-  account_id = var.account_id
-  name       = "${var.project_name}-pages"
+  account_id        = var.account_id
+  name              = var.project_name
   production_branch = "main"
 }
 
 resource "cloudflare_d1_database" "db" {
   account_id = var.account_id
-  name       = "${var.project_name}-d1"
+  name       = var.project_name
+  read_replication = {
+    mode = "disabled"
+  }
 }
 
 resource "cloudflare_queue" "submissions" {
-  account_id      = var.account_id
-  queue_name      = var.queue_name
+  account_id = var.account_id
+  queue_name = var.queue_name
 }
diff --git a/infra/terraform/outputs.tf b/infra/terraform/outputs.tf
@@ -1,3 +1,11 @@
-output "pages_project_name" { value = cloudflare_pages_project.frontend.name }
-output "d1_db_id"          { value = cloudflare_d1_database.db.id }
-output "queue_name"        { value = cloudflare_queue.submissions.queue_name }
+output "pages_project_name" {
+    value = cloudflare_pages_project.frontend.name
+}
+
+output "d1_db_id"          {
+    value = cloudflare_d1_database.db.id
+}
+
+output "queue_name"        {
+    value = cloudflare_queue.submissions.queue_name
+}
diff --git a/infra/terraform/prod.tfvars b/infra/terraform/prod.tfvars
@@ -1,4 +1,3 @@
 account_id   = "cf_account_id_prod"
-zone_id      = "cf_zone_id_prod"
 project_name = "unitn-oj"
 queue_name   = "unitn-oj-submissions"
diff --git a/infra/terraform/variables.tf b/infra/terraform/variables.tf
@@ -1,10 +1,16 @@
 variable "cf_api_token" {
-  type        = string
-  description = "Cloudflare API token with required scopes"
-  sensitive   = true
+  type = string
+  sensitive = true
 }
-variable "account_id" { type = string }
-variable "zone_id"    { type = string }
 
-variable "project_name" { type = string }
-variable "queue_name"   { type = string }
+variable "account_id" {
+  type = string
+}
+
+variable "project_name" {
+  type = string
+}
+
+variable "queue_name" {
+  type = string
+}
diff --git a/infra/terraform/versions.tf b/infra/terraform/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 5.2"
+      version = "~> 5"
     }
   }
 }
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
   "packageManager": "pnpm@8.15.5",
   "type": "module",
   "scripts": {
+    "db:migrate:remote": "pnpm --filter frontend wrangler d1 migrations apply unitn-oj-dev --remote -y",
     "build": "pnpm -r build",
     "dev": "pnpm --filter frontend dev",
     "lint": "biome check",

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`"customizations": {`
`7`	`7`	`"vscode": {`
`8`	`8`	`"extensions": [`
	`9`	`+ "jeff-hykin.better-dockerfile-syntax",`
`9`	`10`	`"ms-vscode.vscode-typescript-next",`
`10`	`11`	`"jacano.vscode-pnpm",`
`11`	`12`	`"antfu.vite",`
`@@ -14,7 +15,8 @@`
`14`	`15`	`"bradlc.vscode-tailwindcss",`
`15`	`16`	`"biomejs.biome",`
`16`	`17`	`"hashicorp.terraform",`
`17`		`- "marcoroth.turbo-lsp"`
	`18`	`+ "marcoroth.turbo-lsp",`
	`19`	`+ "hashicorp.hcl"`
`18`	`20`	`]`
`19`	`21`	`}`
`20`	`22`	`}`