Merge pull request #42 from dddsw/2026

Deployment fixes

Author: slang25

.github/workflows/DeployBlazorClient.yml

@@ -9,7 +9,7 @@ jobs:
     environment: dev
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Build And Deploy

.github/workflows/DeployBranchPush.yml

@@ -10,7 +10,8 @@ jobs:
     uses: ./.github/workflows/DeployEverything.yml
     with:
       env: "dev"
-    secrets: 
+    secrets:
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
       AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
       TERRAFORM_STATE_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}

.github/workflows/DeployEverything.yml

@@ -7,6 +7,8 @@ on:
         default: "Test"
         type: string
     secrets:
+      AZURE_SUBSCRIPTION_ID:
+        required: true
       AZURE_CREDENTIALS:
         required: true
       AZURE_STATIC_WEB_APPS_API_TOKEN:
@@ -21,9 +23,13 @@ on:
 env:
   AZURE_WEBAPP_PACKAGE_PATH: PocketDDD.Server.WebAPI/publish
   CONFIGURATION: Release
-  DOTNET_CORE_VERSION: 8.0.x
+  DOTNET_CORE_VERSION: 10.0.x
   WORKING_DIRECTORY: PocketDDD.Server/PocketDDD.Server.WebAPI
 
+permissions:
+  contents: read
+  id-token: write
+
 jobs:
   deploy_terraform:
     runs-on: ubuntu-latest
@@ -36,16 +42,17 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Log in with Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
     - name: Setup terraform
-      uses: hashicorp/setup-terraform@v3
+      uses: hashicorp/setup-terraform@v4
     - run: |
         terraform init -backend-config="key=${{ inputs.env }}.terraform.tfstate"
 
         terraform apply -auto-approve -var-file ../tfvars/${{ inputs.env }}.tfvars -var 'cloudflare_account_id=${{ secrets.CLOUDFLARE_ACCOUNT_ID }}'
       env:
+        ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
         ARM_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
         CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
 
@@ -79,7 +86,7 @@ jobs:
     needs: [deploy_terraform, build_api_server]
     steps:
     - name: Log in with Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
     - name: Download artifact from build job
@@ -88,7 +95,7 @@ jobs:
         name: webapp
         path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
     - name: Deploy to Azure WebApp
-      uses: azure/webapps-deploy@v2
+      uses: azure/webapps-deploy@v3
       with:
         app-name: pocketddd-${{ inputs.env }}-api-server-web-app
         package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
@@ -99,11 +106,11 @@ jobs:
     name: Build and Deploy Blazor Client
     needs: deploy_terraform
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Log in with Azure
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           creds: '${{ secrets.AZURE_CREDENTIALS }}'
 

.github/workflows/DeployMainBranch.yml

@@ -11,7 +11,8 @@ jobs:
     uses: ./.github/workflows/DeployEverything.yml
     with:
       env: "Production"
-    secrets: 
+    secrets:
+      AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
       AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
       TERRAFORM_STATE_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}

.github/workflows/DeployServerWebAPI.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ env.DOTNET_CORE_VERSION }}
     - name: Restore
@@ -37,7 +37,7 @@ jobs:
     needs: build
     steps:
     - name: Log in with Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
     - name: Download artifact from build job
@@ -46,7 +46,7 @@ jobs:
         name: webapp
         path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
     - name: Deploy to Azure WebApp
-      uses: azure/webapps-deploy@v2
+      uses: azure/webapps-deploy@v3
       with:
         app-name: pocketddd-dev-api-server
         package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}

terraform/api_server.tf

@@ -15,7 +15,7 @@ resource "azurerm_linux_web_app" "api_server_web_app" {
 
   site_config {
     application_stack {
-      dotnet_version = "8.0"
+      dotnet_version = "10.0"
     }
     always_on = var.api_always_on
   }

terraform/blazor_client.tf

@@ -21,11 +21,10 @@ resource "azurerm_key_vault_secret" "blazor_client_deployment_token" {
 }
 
 data "cloudflare_zone" "dns_zone" {
-  account_id = var.cloudflare_account_id
-  name       = "dddsouthwest.com"
+  zone_id = "4c52c7e174b32da4b4786d3dba3d955f"
 }
 
-resource "cloudflare_record" "cname_record" {
+resource "cloudflare_dns_record" "cname_record" {
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = local.subdomain
   content = azurerm_static_web_app.blazor-client.default_host_name
@@ -35,6 +34,6 @@ resource "cloudflare_record" "cname_record" {
 
 resource "azurerm_static_web_app_custom_domain" "custom_domain" {
   static_web_app_id = azurerm_static_web_app.blazor-client.id
-  domain_name       = cloudflare_record.cname_record.hostname
+  domain_name       = cloudflare_dns_record.cname_record.name
   validation_type   = "cname-delegation"
 }

terraform/terraform.tf

@@ -1,4 +1,6 @@
 terraform {
+  required_version = ">= 1.10.0"
+  
   backend "azurerm" {
     resource_group_name  = "pocketddd-terraform-state"
     storage_account_name = "pocketdddterraformstate"
@@ -7,15 +9,15 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.100.0"
+      version = "~> 4.10.0"
     }
     random = {
       source  = "hashicorp/random"
-      version = "3.6.1"
+      version = "~> 3.7.0"
     }
     cloudflare = {
       source  = "cloudflare/cloudflare"
-      version = "~> 4.0"
+      version = "~> 5.0"
     }
   }
 }

tfvars/dev.tfvars

@@ -1,7 +1,7 @@
 env                 = "dev"
 sql_db_sku          = "Basic"
 sql_max_storage     = "2"
-api_app_service_sku = "F1"
+api_app_service_sku = "B1"
 api_always_on       = false
 client_sku_tier     = "Free"
 client_sku_size     = "Free"