From 1b135599b54f53f2301cdd7dba8e23c08737236a Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 12:38:52 +0800 Subject: [PATCH 1/9] fix: terraform --- .github/workflows/build.yml | 2 -- .github/workflows/deploy.yml | 2 ++ deploy/Terraform/main.tf | 11 +++++++---- deploy/Terraform/sql-database.tf | 8 ++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d180709..6a07e5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,8 +6,6 @@ name: Build evently on: pull_request: branches: [ "main" ] - push: - branches: [ "main" ] # important for azure/login permissions: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 22fd97e..be21b2a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,6 +3,8 @@ on: push: branches: [ "main" ] + pull_request: + branches: [ "main" ] # important for azure/login permissions: diff --git a/deploy/Terraform/main.tf b/deploy/Terraform/main.tf index c70ae85..b3f042d 100644 --- a/deploy/Terraform/main.tf +++ b/deploy/Terraform/main.tf @@ -4,10 +4,13 @@ terraform { source = "hashicorp/azurerm" version = "4.45.0" } - docker = { - source = "kreuzwerker/docker" - version = "3.0.2" - } + } + + backend "azurerm" { + resource_group_name = "rg-sharedinfra-sea" # Resource group for the storage account + storage_account_name = "sasharedinfrasea" + container_name = "evently-dev-sea" + key = "tfstate/terraform.tfstate" } } diff --git a/deploy/Terraform/sql-database.tf b/deploy/Terraform/sql-database.tf index bf6cfa6..74951e4 100644 --- a/deploy/Terraform/sql-database.tf +++ b/deploy/Terraform/sql-database.tf @@ -12,10 +12,10 @@ resource "azurerm_mssql_server" "sql_server" { } resource "azurerm_mssql_database" "db" { - name = "evently" - server_id = azurerm_mssql_server.sql_server.id - sku_name = "Basic" # Cheapest option: 5 DTUs - max_size_gb = 2 # Minimum size for Basic tier + name = "evently" + server_id = azurerm_mssql_server.sql_server.id + sku_name = "Basic" # Cheapest option: 5 DTUs + max_size_gb = 2 # Minimum size for Basic tier } resource "azurerm_mssql_firewall_rule" "allow_azure_services" { From 93d5776ab0ad7edd3513d35526951732cdcb09b6 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 13:20:23 +0800 Subject: [PATCH 2/9] fix: tf --- deploy/Terraform/billing-alert.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Terraform/billing-alert.tf b/deploy/Terraform/billing-alert.tf index 05404cc..5137cd2 100644 --- a/deploy/Terraform/billing-alert.tf +++ b/deploy/Terraform/billing-alert.tf @@ -9,7 +9,7 @@ resource "azurerm_consumption_budget_subscription" "evently_budget" { time_grain = "Monthly" time_period { - start_date = "2025-09-01T00:00:00Z" + start_date = formatdate("YYYY-MM-01T00:00:00Z", plantimestamp()) } notification { From d8706b5c8b6b0982b5fc509b10eb2d7e5a17f6a2 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 13:35:49 +0800 Subject: [PATCH 3/9] fix: tf --- deploy/Terraform/billing-alert.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Terraform/billing-alert.tf b/deploy/Terraform/billing-alert.tf index 5137cd2..bb12077 100644 --- a/deploy/Terraform/billing-alert.tf +++ b/deploy/Terraform/billing-alert.tf @@ -9,7 +9,7 @@ resource "azurerm_consumption_budget_subscription" "evently_budget" { time_grain = "Monthly" time_period { - start_date = formatdate("YYYY-MM-01T00:00:00Z", plantimestamp()) + start_date = formatdate("YYYY-MM-01-00:00:00Z", plantimestamp()) } notification { From 82dd4f0156c8a35b944610b5c06988383207a053 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 13:40:52 +0800 Subject: [PATCH 4/9] fix: tf --- deploy/Terraform/billing-alert.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Terraform/billing-alert.tf b/deploy/Terraform/billing-alert.tf index bb12077..aee9f6d 100644 --- a/deploy/Terraform/billing-alert.tf +++ b/deploy/Terraform/billing-alert.tf @@ -9,7 +9,7 @@ resource "azurerm_consumption_budget_subscription" "evently_budget" { time_grain = "Monthly" time_period { - start_date = formatdate("YYYY-MM-01-00:00:00Z", plantimestamp()) + start_date = formatdate("YYYY-MM-01'T'00:00:00Z", plantimestamp()) } notification { From 2bde9b44d35779c39ae9ff359947614a932b629d Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 13:49:35 +0800 Subject: [PATCH 5/9] fix: tf --- deploy/Terraform/container-app.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Terraform/container-app.tf b/deploy/Terraform/container-app.tf index 61831f3..4f549d8 100644 --- a/deploy/Terraform/container-app.tf +++ b/deploy/Terraform/container-app.tf @@ -62,7 +62,7 @@ resource "azurerm_user_assigned_identity" "uami" { resource "azurerm_role_assignment" "acr_pull" { principal_id = azurerm_user_assigned_identity.uami.principal_id - role_definition_name = "AcrPull" + role_definition_name = "Contributor" scope = azurerm_container_registry.acr.id } From 17cdc03f27156939b9f41f3321c52537a719d662 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 17:05:27 +0800 Subject: [PATCH 6/9] chore: update --- deploy/Terraform/.terraform.lock.hcl | 22 ---------------------- deploy/Terraform/container-app.tf | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/deploy/Terraform/.terraform.lock.hcl b/deploy/Terraform/.terraform.lock.hcl index 2ad06fa..df27825 100644 --- a/deploy/Terraform/.terraform.lock.hcl +++ b/deploy/Terraform/.terraform.lock.hcl @@ -39,25 +39,3 @@ provider "registry.terraform.io/hashicorp/null" { "zh:ed0fe2acdb61330b01841fa790be00ec6beaac91d41f311fb8254f74eb6a711f", ] } - -provider "registry.terraform.io/kreuzwerker/docker" { - version = "3.0.2" - constraints = "3.0.2" - hashes = [ - "h1:DcRxJArfX6EiATluWeCBW7HoD6usz9fMoTK2U3dmyPk=", - "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f", - "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95", - "zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138", - "zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da", - "zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2", - "zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06", - "zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1", - "zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710", - "zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005", - "zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d", - "zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792", - "zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387", - "zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62", - "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d", - ] -} diff --git a/deploy/Terraform/container-app.tf b/deploy/Terraform/container-app.tf index 4f549d8..61831f3 100644 --- a/deploy/Terraform/container-app.tf +++ b/deploy/Terraform/container-app.tf @@ -62,7 +62,7 @@ resource "azurerm_user_assigned_identity" "uami" { resource "azurerm_role_assignment" "acr_pull" { principal_id = azurerm_user_assigned_identity.uami.principal_id - role_definition_name = "Contributor" + role_definition_name = "AcrPull" scope = azurerm_container_registry.acr.id } From 9af6351577b66ea5385fdf7653effe2b5e3a6d28 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 17:52:11 +0800 Subject: [PATCH 7/9] fix: fmt --- deploy/Terraform/container-app.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/Terraform/container-app.tf b/deploy/Terraform/container-app.tf index 61831f3..1d873af 100644 --- a/deploy/Terraform/container-app.tf +++ b/deploy/Terraform/container-app.tf @@ -82,6 +82,8 @@ resource "azurerm_container_app" "app" { server = azurerm_container_registry.acr.login_server identity = azurerm_user_assigned_identity.uami.id } + + depends_on = [azurerm_role_assignment.acr_pull, azurerm_mssql_database.db] # needed for container app to access other Microsoft Entra protected resources # https://learn.microsoft.com/en-us/azure/container-apps/managed-identity?tabs=portal%2Cdotnet From 9a8bd2c511c120c5c46c9e9a3e8480317917cdd1 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 17:56:46 +0800 Subject: [PATCH 8/9] chore: revert gh action --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be21b2a..22fd97e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,8 +3,6 @@ on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] # important for azure/login permissions: From 6fce636a1bf7baddc529f9033e6c490909504485 Mon Sep 17 00:00:00 2001 From: eugbyte Date: Sat, 4 Oct 2025 17:57:50 +0800 Subject: [PATCH 9/9] chore: gh action --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a07e5d..d180709 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,8 @@ name: Build evently on: pull_request: branches: [ "main" ] + push: + branches: [ "main" ] # important for azure/login permissions: