diff --git a/server/main.bicep b/server/main.bicep index e8928e6a..c11160c1 100644 --- a/server/main.bicep +++ b/server/main.bicep @@ -43,9 +43,6 @@ param autoCompleteMergeStrategy string = 'Squash' @description('Whether to automatically approve created pull requests.') param autoApprove bool = false -@description('Name of the resource group where jobs will be created.') -param jobsResourceGroupName string = resourceGroup().name - @description('Password for Webhooks, ServiceHooks, and Notifications from Azure DevOps.') #disable-next-line secure-secrets-in-params // need sensible defaults param notificationsPassword string = uniqueString('service-hooks', resourceGroup().id) // e.g. zecnx476et7xm (13 characters) @@ -287,11 +284,7 @@ resource app 'Microsoft.App/containerApps@2023-05-01' = { value: 'https://${name}.${appEnvironment.properties.defaultDomain}/webhooks/azure' } { name: 'Workflow__SubscriptionPassword', secretRef: 'notifications-password' } - { - name: 'Workflow__ResourceGroupId' - // Format: /subscriptions/{subscription-id}/resourceGroups/{resource-group-name} - value: '${subscription().id}/resourceGroups/${jobsResourceGroupName}' - } + { name: 'Workflow__ResourceGroupId', value: resourceGroup().id } { name: 'Workflow__LogAnalyticsWorkspaceId' value: logAnalyticsWorkspace.properties.customerId diff --git a/server/main.json b/server/main.json index 3e9158a5..05dea92e 100644 --- a/server/main.json +++ b/server/main.json @@ -97,13 +97,6 @@ "description": "Whether to automatically approve created pull requests." } }, - "jobsResourceGroupName": { - "type": "string", - "defaultValue": "[resourceGroup().name]", - "metadata": { - "description": "Name of the resource group where jobs will be created." - } - }, "notificationsPassword": { "type": "string", "defaultValue": "[uniqueString('service-hooks', resourceGroup().id)]", @@ -440,7 +433,7 @@ }, { "name": "Workflow__ResourceGroupId", - "value": "[format('{0}/resourceGroups/{1}', subscription().id, parameters('jobsResourceGroupName'))]" + "value": "[resourceGroup().id]" }, { "name": "Workflow__LogAnalyticsWorkspaceId",