290759--Dot net 10 upgrade Changes

Deployment/src/Modules/APIM/azure.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.116.0"
+      version = ">=4.54.0"
     }
   }
 
-  required_version = "=1.9.6"
+  required_version = "=1.15.8"
   backend "azurerm" {
     container_name = "tfstate"
   }

Deployment/src/Modules/FulfilmentStorage/main.tf

@@ -123,13 +123,13 @@ resource "azurerm_storage_account" "large_exchange_set_storage" {
 
 resource "azurerm_storage_container" "large_exchange_set_storage_container" {
   name                  = "ess-fulfilment"
-  storage_account_name  = azurerm_storage_account.large_exchange_set_storage.name
+  storage_account_id    = azurerm_storage_account.large_exchange_set_storage.id
 }
 
 resource "azurerm_storage_queue" "large_exchange_set_storage_queue" {
   count                = var.exchange_set_config.LargeExchangeSetInstance
   name                 = "ess-${sum([1,count.index])}-fulfilment"
-  storage_account_name = azurerm_storage_account.large_exchange_set_storage.name
+  storage_account_id   = azurerm_storage_account.large_exchange_set_storage.id
 }
 
 resource "azurerm_storage_management_policy" "large_exchange_set_storage_policy" {

Deployment/src/Modules/FulfilmentWebapps/main.tf

@@ -30,7 +30,7 @@ resource "azurerm_windows_web_app" "small_exchange_set_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -70,7 +70,7 @@ resource "azurerm_windows_web_app_slot" "small_exchange_set_staging" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -124,7 +124,7 @@ resource "azurerm_windows_web_app" "medium_exchange_set_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -164,7 +164,7 @@ resource "azurerm_windows_web_app_slot" "medium_exchange_set_staging" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -218,7 +218,7 @@ resource "azurerm_windows_web_app" "large_exchange_set_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -258,7 +258,7 @@ resource "azurerm_windows_web_app_slot" "large_exchange_set_staging" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true

Deployment/src/Modules/KeyVault/main.tf

@@ -6,6 +6,7 @@ resource "azurerm_key_vault" "kv" {
   resource_group_name         = var.resource_group_name
   enabled_for_disk_encryption = true
   tenant_id                   = var.tenant_id
+  rbac_authorization_enabled  = false
 
   sku_name = "standard"
 

Deployment/src/Modules/Webapp/main.tf

@@ -27,7 +27,7 @@ resource "azurerm_windows_web_app" "webapp_service" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -73,7 +73,7 @@ resource "azurerm_windows_web_app_slot" "staging" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true

Deployment/src/Modules/azuredashboard/main.tf

@@ -2,7 +2,7 @@ data "azurerm_subscription" "current" {
 }
 
 
-resource "azurerm_dashboard" "azure-dashboard" {
+resource "azurerm_portal_dashboard" "azure-dashboard" {
   name                = var.name
   resource_group_name = var.resource_group.name
   location            = var.resource_group.location
@@ -12,4 +12,4 @@ resource "azurerm_dashboard" "azure-dashboard" {
       subscription_id = data.azurerm_subscription.current.subscription_id, 
       environment = var.environment
   })
-}
+}

Deployment/src/azure.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.116.0"
+      version = "=4.81.0"
     }
   }
 
-  required_version = "=1.9.6"
+  required_version = "=1.15.8"
   backend "azurerm" {
     container_name = "tfstate"
   }
@@ -20,4 +20,4 @@ provider "azurerm" {
   features {}
   alias = "build_agent"
   subscription_id = var.agent_subscription_id
-}
+}

Deployment/src/outputs.tf

@@ -65,4 +65,4 @@ output "web_app_slot_name" {
 
 output "web_app_slot_default_site_hostname" {
   value = module.webapp_service.slot_default_site_hostname
-}
+}

Deployment/templates/continuous-deployment-v2.yml

@@ -42,6 +42,57 @@ steps:
       TF_VAR_asp_control_webapp: $(appServicePlanControlWebApp)
       TF_VAR_scs_response_retention: $(SalesCatalogueResponseRetentionInDays)
 
+  - task: AzureCLI@2
+    displayName: 'Run windows_fx_version Update AZ Script Against All Webapps'
+    inputs:
+      azureSubscription: ${{parameters.AzureSubscription}}
+      scriptType: 'pscore'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        cd $(Pipeline.Workspace)/terraformartifact/src
+
+        $rg = terraform output -raw web_app_resource_group
+
+        #Update webapp slot windows_fx_version
+        az webapp config set `
+         --resource-group $rg `
+         --name "$env:WEB_APP_NAME" `
+         --slot "$env:WEB_APP_SLOT_NAME" `
+         --windows-fx-version "DOTNET|10.0"
+
+        #Update small fulfilment webapp slots windows_fx_version
+        $smallWebapps = terraform output -json small_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $smallWebapps) {
+          Write-Host "Processing small webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
+        #Update medium fulfilment webapp slots windows_fx_version
+        $mediumWebapps = terraform output -json medium_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $mediumWebapps) {
+          Write-Host "Processing medium webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
+        # #Update large fulfilment webapp slots windows_fx_version
+        $largeWebapps = terraform output -json large_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $largeWebapps) {
+          Write-Host "Processing large webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
   - template: fulfilment-webjob-deployment.yml
     parameters:
       AzureSubscription: ${{parameters.AzureSubscription}}

Deployment/templates/continuous-deployment.yml

@@ -42,6 +42,57 @@ steps:
       TF_VAR_asp_control_webapp: $(appServicePlanControlWebApp)
       TF_VAR_scs_response_retention: $(SalesCatalogueResponseRetentionInDays)
 
+  - task: AzureCLI@2
+    displayName: 'Run windows_fx_version Update AZ Script Against All Webapps'
+    inputs:
+      azureSubscription: ${{parameters.AzureSubscription}}
+      scriptType: 'pscore'
+      scriptLocation: 'inlineScript'
+      inlineScript: |
+        cd $(Pipeline.Workspace)/terraformartifact/src
+
+        $rg = terraform output -raw web_app_resource_group
+
+        #Update webapp slot windows_fx_version
+        az webapp config set `
+         --resource-group $rg `
+         --name "$env:WEBAPPNAME" `
+         --slot "$env:WEB_APP_SLOT_NAME" `
+         --windows-fx-version "DOTNET|10.0"
+
+        #Update small fulfilment webapp slots windows_fx_version
+        $smallWebapps = terraform output -json small_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $smallWebapps) {
+          Write-Host "Processing small webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
+        #Update medium fulfilment webapp slots windows_fx_version
+        $mediumWebapps = terraform output -json medium_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $mediumWebapps) {
+          Write-Host "Processing medium webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
+        # #Update large fulfilment webapp slots windows_fx_version
+        $largeWebapps = terraform output -json large_exchange_set_webapps | ConvertFrom-Json
+        foreach ($item in $largeWebapps) {
+          Write-Host "Processing large webapp: $($item.webappname)"
+          az webapp config set `
+           --resource-group $rg `
+           --name $item.webappname `
+           --slot "staging" `
+           --windows-fx-version "DOTNET|10.0"
+        }
+
   - template: fulfilment-webjob-deployment.yml
     parameters:
       AzureSubscription: ${{parameters.AzureSubscription}}

Deployment/templates/fulfilment-webapp-az.yml

@@ -0,0 +1,36 @@
+parameters:
+  - name: AzureSubscription
+    type: string
+  - name: BatchSize
+    type: string
+  - name: NewBatchThreshold
+    type: string
+  - name: ExchangeSetSize
+    type: string
+    values:
+      - 'small'
+      - 'medium'
+      - 'large'
+
+steps:
+  - powershell: |
+      Write-Host "##vso[task.setvariable variable=QueuesOptions.batchSize;]${{ parameters.BatchSize }}"
+      Write-Host "##vso[task.setvariable variable=QueuesOptions.newBatchThreshold;]${{ parameters.NewBatchThreshold }}"
+    displayName: Set QueuesOptions values - ${{ parameters.ExchangeSetSize }} WebJob
+
+  - task: FileTransform@2
+    displayName: File transform - ${{ parameters.ExchangeSetSize }} WebJob
+    inputs:
+      folderPath: '$(Pipeline.Workspace)/ExchangeSetService/*.zip'
+      enableXmlTransform: false
+      xmlTransformationRules: ''
+      jsonTargetFiles: '**/appsettings.json'
+
+  - task: AzureCLI@2
+    displayName: Fulfilment deployment - ${{ parameters.ExchangeSetSize }} WebJob
+    inputs:
+      azureSubscription: "${{ parameters.AzureSubscription }}"
+      scriptType: pscore
+      scriptLocation: scriptPath
+      scriptPath: '$(Pipeline.Workspace)/terraformartifact/fulfilment_webjob_deployment.ps1'
+      arguments: '-terraformJsonOutputFile $(Pipeline.Workspace)/terraformartifact/terraform_output.json -packagePath "$(Pipeline.Workspace)/ExchangeSetService" -packageName "ExchangeSetFulFilmentService.zip" -exchangeSetSize ${{ parameters.ExchangeSetSize }}'  

Deployment/terraform_conditional_run.ps1

@@ -13,7 +13,7 @@ cd $env:AGENT_BUILDDIRECTORY/terraformartifact/src
 terraform --version
 
 Write-output "Executing terraform scripts for deployment in $workSpace enviroment"
-terraform init -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=terraform.deployment.tfplan"
+terraform init -upgrade -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=terraform.deployment.tfplan"
 if ( !$? ) { echo "Something went wrong during terraform initialization"; throw "Error" }
 
 Write-output "Selecting workspace"
@@ -65,6 +65,8 @@ Write-Host "##vso[task.setvariable variable=WEB_APP_SLOT_HOST_NAME]$($terraformO
 Write-Host "##vso[task.setvariable variable=RESOURCEGROUPNAME;isOutput=true]$($terraformOutput.web_app_resource_group.value)"
 Write-Host "##vso[task.setvariable variable=WEBAPPNAME;isOutput=true]$($terraformOutput.web_app_name.value)"
 Write-Host "##vso[task.setvariable variable=EssURL;isOutput=true]$env:SERVICE_DNS_URL"
+Write-Host "##vso[task.setvariable variable=small_exchange_set_webapps;isOutput=true]$env:small_exchange_set_webapps"
+Write-Host "##vso[task.setvariable variable=medium_exchange_set_webapps;isOutput=true]$env:medium_exchange_set_webapps"
+Write-Host "##vso[task.setvariable variable=large_exchange_set_webapps;isOutput=true]$env:large_exchange_set_webapps"
 
-
-$terraformOutput | ConvertTo-Json -Depth 5 > $terraformJsonOutputFile
+$terraformOutput | ConvertTo-Json -Depth 5 > $terraformJsonOutputFile

Deployment/terraform_conditional_run_apim.ps1

@@ -13,7 +13,7 @@ Write-output "Executing terraform scripts for APIM deployment in $workSpace envi
 
 $backendConfigKey = "terraform.deployment.apim.ess.tfplan"
 Write-output "Using plan $backendConfigKey"
-terraform init -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=$backendConfigKey"
+terraform init -upgrade -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=$backendConfigKey"
 if ( !$? ) { echo "Something went wrong during terraform initialization"; throw "Error" }
 
 Write-output "Selecting workspace..."

Deployment/terraform_conditional_run_apim_v2.ps1

@@ -13,7 +13,7 @@ Write-output "Executing terraform scripts for APIM deployment in $workSpace envi
 
 $backendConfigKey = "terraform.deployment.apim.ess.v2.tfplan"
 Write-output "Using plan $backendConfigKey"
-terraform init -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=$backendConfigKey"
+terraform init -upgrade -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=$backendConfigKey"
 if ( !$? ) { echo "Something went wrong during terraform initialization"; throw "Error" }
 
 Write-output "Selecting workspace..."

Deployment/terraform_conditional_run_v2.ps1

@@ -13,7 +13,7 @@ cd $env:AGENT_BUILDDIRECTORY/terraformartifact/src
 terraform --version
 
 Write-output "Executing terraform scripts for deployment in $workSpace enviroment"
-terraform init -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=terraform.deployment.v2.tfplan"
+terraform init -upgrade -backend-config="resource_group_name=$deploymentResourceGroupName" -backend-config="storage_account_name=$deploymentStorageAccountName" -backend-config="key=terraform.deployment.v2.tfplan"
 if ( !$? ) { echo "Something went wrong during terraform initialization"; throw "Error" }
 
 Write-output "Selecting workspace"
@@ -62,6 +62,8 @@ Write-Host "##vso[task.setvariable variable=ESSManagedIdentity.ClientId]$($terra
 Write-Host "##vso[task.setvariable variable=RESOURCE_GROUP_NAME]$($terraformOutput.web_app_resource_group.value)"
 Write-Host "##vso[task.setvariable variable=WEB_APP_SLOT_NAME]$($terraformOutput.web_app_slot_name.value)"
 Write-Host "##vso[task.setvariable variable=WEB_APP_SLOT_HOST_NAME]$($terraformOutput.web_app_slot_default_site_hostname.value)"
+Write-Host "##vso[task.setvariable variable=small_exchange_set_webapps;isOutput=true]$env:small_exchange_set_webapps"
+Write-Host "##vso[task.setvariable variable=medium_exchange_set_webapps;isOutput=true]$env:medium_exchange_set_webapps"
+Write-Host "##vso[task.setvariable variable=large_exchange_set_webapps;isOutput=true]$env:large_exchange_set_webapps"
 
-
-$terraformOutput | ConvertTo-Json -Depth 5 > $terraformJsonOutputFile
+$terraformOutput | ConvertTo-Json -Depth 5 > $terraformJsonOutputFile

MockApiDeployment/src/Modules/Webapp/main.tf

@@ -17,7 +17,7 @@ resource "azurerm_windows_web_app" "fulfillment_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -43,7 +43,7 @@ resource "azurerm_windows_web_app" "scs_fss_mock_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true
@@ -69,7 +69,7 @@ resource "azurerm_windows_web_app" "ess_webapp" {
   site_config {
     application_stack {
       current_stack = "dotnet"
-      dotnet_version = "v8.0"
+      dotnet_version = "v10.0"
     }
 
     always_on         = true