diff --git a/infrastructure/arm/environment.template.json b/infrastructure/arm/environment.template.json index 3e088788e..cc8edda9b 100644 --- a/infrastructure/arm/environment.template.json +++ b/infrastructure/arm/environment.template.json @@ -232,6 +232,22 @@ "maxDeliveryCount": 2 } }, + { + "type": "Microsoft.ServiceBus/namespaces/queues", + "apiVersion": "2017-04-01", + "name": "[concat(variables('sb-name'), '/scheduled-weekly-project-report')]", + "location": "North Europe", + "dependsOn": [ + "[resourceId('Microsoft.ServiceBus/namespaces', variables('sb-name'))]" + ], + "properties": { + "maxSizeInMegabytes": 1024, + "duplicateDetectionHistoryTimeWindow": "P1D", + "defaultMessageTimeToLive": "PT1H", + "deadLetteringOnMessageExpiration": true, + "maxDeliveryCount": 2 + } + }, /* SECRETS */ { diff --git a/pipelines/templates/deploy-summary-function-pr-template.yml b/pipelines/templates/deploy-summary-function-pr-template.yml index 55de5ca6b..72afcec93 100644 --- a/pipelines/templates/deploy-summary-function-pr-template.yml +++ b/pipelines/templates/deploy-summary-function-pr-template.yml @@ -50,6 +50,7 @@ steps: $settings = @{ clientId = "${{ parameters.clientId }}" departmentFilter = "PRD" + projectTypeFilter = "PRD" secretIds = @{ clientSecret = "https://$envVaultName.vault.azure.net:443/secrets/AzureAd--ClientSecret" serviceBus = "https://$envVaultName.vault.azure.net:443/secrets/Connectionstrings--ServiceBus" @@ -63,12 +64,14 @@ steps: notifications = "https://fusion-s-notification-$fusionEnvironment.azurewebsites.net" context = "https://fusion-s-context-$fusionEnvironment.azurewebsites.net" portal = "https://fusion-s-portal-$fusionEnvironment.azurewebsites.net" + roles = "https://fusion-s-roles-$fusionEnvironment.azurewebsites.net" } resources = @{ fusion = "${{ parameters.fusionResource }}" } queues = @{ departmentSummaryWeeklyQueue = "scheduled-weekly-department-report" + projectSummaryWeeklyQueue = "scheduled-weekly-project-report" } } diff --git a/pipelines/templates/deploy-summary-function-template.yml b/pipelines/templates/deploy-summary-function-template.yml index f3b5d6448..f03d00709 100644 --- a/pipelines/templates/deploy-summary-function-template.yml +++ b/pipelines/templates/deploy-summary-function-template.yml @@ -48,6 +48,7 @@ steps: $settings = @{ clientId = "${{ parameters.clientId }}" departmentFilter = "PRD" + projectTypeFilter = "PRD" secretIds = @{ clientSecret = Get-SecretsId -secret AzureAd--ClientSecret serviceBus = Get-SecretsId -secret Connectionstrings--ServiceBus @@ -61,12 +62,14 @@ steps: notifications = "https://fusion-s-notification-$fusionEnvironment.azurewebsites.net" context = "https://fusion-s-context-$fusionEnvironment.azurewebsites.net" portal = "https://fusion-s-portal-$fusionEnvironment.azurewebsites.net" + roles = "https://fusion-s-roles-$fusionEnvironment.azurewebsites.net" } resources = @{ fusion = "${{ parameters.fusionResource }}" } queues = @{ departmentSummaryWeeklyQueue = "scheduled-weekly-department-report" + projectSummaryWeeklyQueue = "scheduled-weekly-project-report" } } diff --git a/src/Fusion.Summary.Functions/Deployment/function.template.json b/src/Fusion.Summary.Functions/Deployment/function.template.json index f74b9a60f..8701b01e0 100644 --- a/src/Fusion.Summary.Functions/Deployment/function.template.json +++ b/src/Fusion.Summary.Functions/Deployment/function.template.json @@ -162,6 +162,10 @@ "name": "Endpoints_summary", "value": "[parameters('settings').endpoints.summary]" }, + { + "name": "Endpoints_roles", + "value": "[parameters('settings').endpoints.roles]" + }, { "name": "Endpoints_Resources_Fusion", "value": "[parameters('settings').resources.fusion]" @@ -170,9 +174,17 @@ "name": "department_summary_weekly_queue", "value": "[parameters('settings').queues.departmentSummaryWeeklyQueue]" }, + { + "name": "project_summary_weekly_queue", + "value": "[parameters('settings').queues.projectSummaryWeeklyQueue]" + }, { "name": "departmentFilter", "value": "[parameters('settings').departmentFilter]" + }, + { + "name": "projectTypeFilter", + "value": "[parameters('settings').projectTypeFilter]" } ] }