diff --git a/.github/workflows/DeployBranchPush.yml b/.github/workflows/DeployBranchPush.yml index f170b0d..e361e3c 100644 --- a/.github/workflows/DeployBranchPush.yml +++ b/.github/workflows/DeployBranchPush.yml @@ -16,4 +16,3 @@ jobs: AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} TERRAFORM_STATE_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} diff --git a/.github/workflows/DeployEverything.yml b/.github/workflows/DeployEverything.yml index 351fb1d..b3e8016 100644 --- a/.github/workflows/DeployEverything.yml +++ b/.github/workflows/DeployEverything.yml @@ -17,8 +17,6 @@ on: required: true CLOUDFLARE_TOKEN: required: true - CLOUDFLARE_ACCOUNT_ID: - required: true env: AZURE_WEBAPP_PACKAGE_PATH: PocketDDD.Server.WebAPI/publish @@ -48,9 +46,9 @@ jobs: - name: Setup terraform uses: hashicorp/setup-terraform@v4 - run: | - terraform init -backend-config="key=${{ inputs.env }}.terraform.tfstate" + # 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 }}' + # terraform apply -auto-approve -var-file ../tfvars/${{ inputs.env }}.tfvars env: ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} ARM_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} diff --git a/.github/workflows/DeployMainBranch.yml b/.github/workflows/DeployMainBranch.yml index 2aada2e..c2fdb8e 100644 --- a/.github/workflows/DeployMainBranch.yml +++ b/.github/workflows/DeployMainBranch.yml @@ -4,7 +4,7 @@ on: push: branches: - 'main' - - 'fixProdDeployment' + - 'russ-prod-fixes' jobs: deploy_to_production: @@ -17,4 +17,3 @@ jobs: AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} TERRAFORM_STATE_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} - CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Program.cs b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Program.cs index 2224bf1..c7280da 100644 --- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Program.cs +++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Program.cs @@ -14,7 +14,12 @@ builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.Configuration["apiUrl"]!) }); builder.Services.AddMudServices(); -builder.Services.AddFluxor(o => o.ScanAssemblies(typeof(Program).Assembly).UseReduxDevTools()); +builder.Services.AddFluxor(o => +{ + o.ScanAssemblies(typeof(Program).Assembly); + if (builder.HostEnvironment.IsDevelopment()) + o.UseReduxDevTools(); +}); builder.Services.AddBlazoredLocalStorage(); if (builder.Configuration.GetValue("fakeBackend") == false) diff --git a/README.md b/README.md index f63febe..740e983 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ From the `terraform` directory run init, plan, then apply if happy with the chan ``` cd ./terraform -terraform init -backend-config="dev.terraform.tfstate" +terraform init -backend-config='key="dev.terraform.tfstate"' terraform plan -var-file ../tfvars/dev.tfvars terraform apply -var-file ../tfvars/dev.tfvars ``` \ No newline at end of file diff --git a/terraform/blazor_client.tf b/terraform/blazor_client.tf index 8e9fa94..6c99c5f 100644 --- a/terraform/blazor_client.tf +++ b/terraform/blazor_client.tf @@ -28,12 +28,16 @@ data "cloudflare_zone" "dns_zone" { resource "cloudflare_dns_record" "cname_record" { zone_id = data.cloudflare_zone.dns_zone.id - name = local.subdomain + name = "${local.subdomain}.dddsouthwest.com" content = azurerm_static_web_app.blazor-client.default_host_name type = "CNAME" ttl = 1 # 1 = automatic (proxied) - proxied = true # Disable Cloudflare proxy, Azure can handle SSL + proxied = false # Disable Cloudflare proxy, Azure can handle SSL comment = "Blazor client custom domain - SSL handled by Cloudflare and Azure auto-provisioned certificate" + + lifecycle { + ignore_changes = [ proxied ] + } } resource "azurerm_static_web_app_custom_domain" "custom_domain" { diff --git a/terraform/terraform.tf b/terraform/terraform.tf index 5a94bc8..782ae55 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10.0" + required_version = ">= 1.13.4" backend "azurerm" { resource_group_name = "pocketddd-terraform-state" diff --git a/terraform/variables.tf b/terraform/variables.tf index 91aca1d..9f6fc92 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -45,8 +45,3 @@ variable "client_sku_size" { nullable = false type = string } - -variable "cloudflare_account_id" { - nullable = false - type = string -} diff --git a/tfvars/Production.tfvars b/tfvars/Production.tfvars index 07aaa71..94aa023 100644 --- a/tfvars/Production.tfvars +++ b/tfvars/Production.tfvars @@ -1,16 +1,16 @@ env = "production" -sql_db_sku = "Basic" -sql_max_storage = "2" -api_app_service_sku = "B1" -api_always_on = false -client_sku_tier = "Free" -client_sku_size = "Free" +region = "UK West" +# sql_db_sku = "Basic" +# sql_max_storage = "2" +# api_app_service_sku = "B1" +# api_always_on = false +# client_sku_tier = "Free" +# client_sku_size = "Free" # Real prod values -# env = "prod" -# sql_db_sku = "S0" -# sql_max_storage = "10" -# api_app_service_sku = "B1" -# api_always_on = true -# client_sku_tier = "Standard" -# client_sku_size = "Standard" \ No newline at end of file +sql_db_sku = "S0" +sql_max_storage = "10" +api_app_service_sku = "B1" +api_always_on = true +client_sku_tier = "Standard" +client_sku_size = "Standard" \ No newline at end of file