Skip to content

Commit

Permalink
[Bug Fix] Remove kind parameter from App Service Plan `web/serverfarm…
Browse files Browse the repository at this point in the history
…` module (#4242)
  • Loading branch information
tyconsulting authored Nov 14, 2023
1 parent 060bcc8 commit a5bdf33
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 46 deletions.
18 changes: 0 additions & 18 deletions modules/web/serverfarm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ module serverfarm 'br:bicep/modules/web.serverfarm:1.0.0' = {
| [`appServiceEnvironmentId`](#parameter-appserviceenvironmentid) | string | The Resource ID of the App Service Environment to use for the App Service Plan. |
| [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. |
| [`enableDefaultTelemetry`](#parameter-enabledefaulttelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). |
| [`kind`](#parameter-kind) | string | Kind of server OS. |
| [`location`](#parameter-location) | string | Location for all resources. |
| [`lock`](#parameter-lock) | object | The lock settings of the service. |
| [`maximumElasticWorkerCount`](#parameter-maximumelasticworkercount) | int | Maximum number of total workers allowed for this ElasticScaleEnabled App Service Plan. |
Expand Down Expand Up @@ -430,23 +429,6 @@ Enable telemetry via a Globally Unique Identifier (GUID).
- Type: bool
- Default: `True`

### Parameter: `kind`

Kind of server OS.
- Required: No
- Type: string
- Default: `'Windows'`
- Allowed:
```Bicep
[
'App'
'Elastic'
'FunctionApp'
'Linux'
'Windows'
]
```

### Parameter: `location`

Location for all resources.
Expand Down
11 changes: 0 additions & 11 deletions modules/web/serverfarm/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@ param sku object
@description('Optional. Location for all resources.')
param location string = resourceGroup().location

@description('Optional. Kind of server OS.')
@allowed([
'App'
'Elastic'
'FunctionApp'
'Windows'
'Linux'
])
param kind string = 'Windows'

@description('Conditional. Defaults to false when creating Windows/app App Service Plan. Required if creating a Linux App Service Plan and must be set to true.')
param reserved bool = false

Expand Down Expand Up @@ -97,7 +87,6 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena

resource appServicePlan 'Microsoft.Web/serverfarms@2022-09-01' = {
name: name
kind: kind
location: location
tags: tags
sku: sku
Expand Down
19 changes: 2 additions & 17 deletions modules/web/serverfarm/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.22.6.54827",
"templateHash": "14824797980620937555"
"version": "0.23.1.45101",
"templateHash": "10832175948195959384"
},
"name": "App Service Plans",
"description": "This module deploys an App Service Plan.",
Expand Down Expand Up @@ -207,20 +207,6 @@
"description": "Optional. Location for all resources."
}
},
"kind": {
"type": "string",
"defaultValue": "Windows",
"allowedValues": [
"App",
"Elastic",
"FunctionApp",
"Windows",
"Linux"
],
"metadata": {
"description": "Optional. Kind of server OS."
}
},
"reserved": {
"type": "bool",
"defaultValue": false,
Expand Down Expand Up @@ -345,7 +331,6 @@
"type": "Microsoft.Web/serverfarms",
"apiVersion": "2022-09-01",
"name": "[parameters('name')]",
"kind": "[parameters('kind')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
"sku": "[parameters('sku')]",
Expand Down

0 comments on commit a5bdf33

Please sign in to comment.