diff --git a/.gitignore b/.gitignore index 0d78fcb..2ae3bab 100644 --- a/.gitignore +++ b/.gitignore @@ -431,4 +431,9 @@ buildNumber.properties *.iml *.iws *.ipr -out/ \ No newline at end of file +out/ + +# Bicep-generated ARM template JSON files +**/infra/**/*.json +!**/infra/**/*.parameters.json +!**/infra/**/abbreviations.json diff --git a/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/app/dts.bicep b/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/app/dts.bicep +++ b/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/main.bicep b/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/main.bicep index 569cf33..8bceb3e 100644 --- a/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/main.bicep +++ b/samples/durable-functions/dotnet/AiAgentTravelPlanOrchestrator/infra/main.bicep @@ -118,7 +118,7 @@ var functionAppName = !empty(apiServiceName) ? apiServiceName : '${abbrs.webSite var deploymentStorageContainerName = 'app-package-${take(functionAppName, 32)}-${take(toLower(uniqueString(functionAppName, resourceToken)), 7)}' var name = toLower('${aiHubName}') var projectName = toLower('${aiProjectName}') -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param dtsName string = '' param taskHubName string = '' diff --git a/samples/durable-functions/dotnet/HelloCities/infra/app/dts.bicep b/samples/durable-functions/dotnet/HelloCities/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/durable-functions/dotnet/HelloCities/infra/app/dts.bicep +++ b/samples/durable-functions/dotnet/HelloCities/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/durable-functions/dotnet/HelloCities/infra/main.bicep b/samples/durable-functions/dotnet/HelloCities/infra/main.bicep index 2d6d897..42ae879 100644 --- a/samples/durable-functions/dotnet/HelloCities/infra/main.bicep +++ b/samples/durable-functions/dotnet/HelloCities/infra/main.bicep @@ -49,7 +49,7 @@ param functionSkuTier string = 'ElasticPremium' // Uses main.parameters.json fir param functionReservedPlan bool = true // Set to false to get a Windows OS plan param dtsLocation string = location -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param durableFunctionServiceName string = '' diff --git a/samples/durable-functions/dotnet/OrderProcessor/infra/app/dts.bicep b/samples/durable-functions/dotnet/OrderProcessor/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/durable-functions/dotnet/OrderProcessor/infra/app/dts.bicep +++ b/samples/durable-functions/dotnet/OrderProcessor/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/durable-functions/dotnet/OrderProcessor/infra/main.bicep b/samples/durable-functions/dotnet/OrderProcessor/infra/main.bicep index 83284db..b580764 100644 --- a/samples/durable-functions/dotnet/OrderProcessor/infra/main.bicep +++ b/samples/durable-functions/dotnet/OrderProcessor/infra/main.bicep @@ -50,7 +50,7 @@ param functionSkuTier string = 'ElasticPremium' // Uses main.parameters.json fir param functionReservedPlan bool = true // Set to false to get a Windows OS plan param dtsLocation string = location -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param durableFunctionServiceName string = '' diff --git a/samples/durable-functions/dotnet/PdfSummarizer/infra/app/dts.bicep b/samples/durable-functions/dotnet/PdfSummarizer/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/durable-functions/dotnet/PdfSummarizer/infra/app/dts.bicep +++ b/samples/durable-functions/dotnet/PdfSummarizer/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/durable-functions/dotnet/PdfSummarizer/infra/main.bicep b/samples/durable-functions/dotnet/PdfSummarizer/infra/main.bicep index 349cfce..9fabf89 100644 --- a/samples/durable-functions/dotnet/PdfSummarizer/infra/main.bicep +++ b/samples/durable-functions/dotnet/PdfSummarizer/infra/main.bicep @@ -50,7 +50,7 @@ param functionSkuTier string = 'ElasticPremium' // Uses main.parameters.json fir param functionReservedPlan bool = true // Set to false to get a Windows OS plan param dtsLocation string = location -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param documentIntelligenceSkuName string // Set in main.parameters.json diff --git a/samples/durable-functions/python/pdf-summarizer/infra/app/dts.bicep b/samples/durable-functions/python/pdf-summarizer/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/durable-functions/python/pdf-summarizer/infra/app/dts.bicep +++ b/samples/durable-functions/python/pdf-summarizer/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/durable-functions/python/pdf-summarizer/infra/main.bicep b/samples/durable-functions/python/pdf-summarizer/infra/main.bicep index 8ceee8c..bc6201b 100644 --- a/samples/durable-functions/python/pdf-summarizer/infra/main.bicep +++ b/samples/durable-functions/python/pdf-summarizer/infra/main.bicep @@ -50,7 +50,7 @@ param functionSkuTier string = 'ElasticPremium' // Uses main.parameters.json fir param functionReservedPlan bool = true // Set to false to get a Windows OS plan param dtsLocation string = location -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param documentIntelligenceSkuName string // Set in main.parameters.json diff --git a/samples/infra/app/dts.bicep b/samples/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/infra/app/dts.bicep +++ b/samples/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/infra/main.bicep b/samples/infra/main.bicep index 3770525..8ce28c8 100644 --- a/samples/infra/main.bicep +++ b/samples/infra/main.bicep @@ -20,7 +20,7 @@ param containerAppsEnvName string = '' param containerAppsAppName string = '' param containerRegistryName string = '' param dtsLocation string = 'centralus' -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param dtsName string = '' param taskHubName string = '' diff --git a/samples/scenarios/AutoscalingInACA/infra/app/dts.bicep b/samples/scenarios/AutoscalingInACA/infra/app/dts.bicep index 5a08700..6280e5a 100644 --- a/samples/scenarios/AutoscalingInACA/infra/app/dts.bicep +++ b/samples/scenarios/AutoscalingInACA/infra/app/dts.bicep @@ -4,7 +4,7 @@ param tags object = {} param name string param taskhubname string param skuName string -param skuCapacity int +param skuCapacity int = 0 resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { location: location @@ -12,9 +12,11 @@ resource dts 'Microsoft.DurableTask/schedulers@2025-11-01' = { name: name properties: { ipAllowlist: ipAllowlist - sku: { + sku: skuName == 'Dedicated' ? { name: skuName capacity: skuCapacity + } : { + name: skuName } } } diff --git a/samples/scenarios/AutoscalingInACA/infra/main.bicep b/samples/scenarios/AutoscalingInACA/infra/main.bicep index 3770525..8ce28c8 100644 --- a/samples/scenarios/AutoscalingInACA/infra/main.bicep +++ b/samples/scenarios/AutoscalingInACA/infra/main.bicep @@ -20,7 +20,7 @@ param containerAppsEnvName string = '' param containerAppsAppName string = '' param containerRegistryName string = '' param dtsLocation string = 'centralus' -param dtsSkuName string = 'Dedicated' +param dtsSkuName string = 'Consumption' param dtsCapacity int = 1 param dtsName string = '' param taskHubName string = ''