feat: support FlexConsumption in serverfarm(Azure#3316)

pankajagrawal16 · Oct 4, 2024 · 4f2e323 · 4f2e323
1 parent 02948b8
commit 4f2e323
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/avm/res/web/serverfarm/README.md b/avm/res/web/serverfarm/README.md
@@ -731,6 +731,7 @@ The name of the SKU will Determine the tier, size, family of the App Service Pla
   'B1'
   'P1v3'
   'I1v2'
+  'FC1'
   ```
 
 ### Parameter: `tags`

diff --git a/avm/res/web/serverfarm/main.bicep b/avm/res/web/serverfarm/main.bicep
@@ -14,6 +14,7 @@ param name string
   'B1'
   'P1v3'
   'I1v2'
+  'FC1'
   '''
 })
 param skuName string = 'P1v3'
@@ -129,7 +130,8 @@ resource appServicePlan 'Microsoft.Web/serverfarms@2022-09-01' = {
   tags: tags
   sku: {
     name: skuName
-    capacity: skuCapacity
+    capacity: skuName == 'FC1' ? null : skuCapacity
+    tier: skuName == 'FC1' ? 'FlexConsumption' : null
   }
   properties: {
     workerTierName: workerTierName

diff --git a/avm/res/web/serverfarm/main.json b/avm/res/web/serverfarm/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.30.3.12046",
-      "templateHash": "12599229174633311842"
+      "version": "0.30.23.60470",
+      "templateHash": "489102920669919211"
     },
     "name": "App Service Plan",
     "description": "This module deploys an App Service Plan.",
@@ -205,7 +205,7 @@
       "type": "string",
       "defaultValue": "P1v3",
       "metadata": {
-        "example": "  'F1'\n  'B1'\n  'P1v3'\n  'I1v2'\n  ",
+        "example": "  'F1'\n  'B1'\n  'P1v3'\n  'I1v2'\n  'FC1'\n  ",
         "description": "Optional. The name of the SKU will Determine the tier, size, family of the App Service Plan. This defaults to P1v3 to leverage availability zones."
       }
     },
@@ -379,7 +379,8 @@
       "tags": "[parameters('tags')]",
       "sku": {
         "name": "[parameters('skuName')]",
-        "capacity": "[parameters('skuCapacity')]"
+        "capacity": "[if(equals(parameters('skuName'), 'FC1'), null(), parameters('skuCapacity'))]",
+        "tier": "[if(equals(parameters('skuName'), 'FC1'), 'FlexConsumption', null())]"
       },
       "properties": {
         "workerTierName": "[parameters('workerTierName')]",
-Original file line number
+Diff line change
@@ Expand Up @@
       'B1'
       'P1v3'
       'I1v2'
+      'FC1'
       ```
     ### Parameter: `tags`
@@ Expand Down @@