From 305184cfcd550742b825e60afeb02337093ac251 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 10:52:26 +0200 Subject: [PATCH 01/12] Update to latest --- .../servers/.parameters/parameters.json | 27 +++++++++++++++ .../databases/.bicep/nested_cuaId.bicep | 0 .../databases/deploy.bicep | 16 +++++---- .../databases/readme.md | 6 ++-- arm/Microsoft.Sql/servers/deploy.bicep | 32 +++++++++++++++++- arm/Microsoft.Sql/servers/readme.md | 3 ++ .../databases/.parameters/parameters.json | 33 ------------------- 7 files changed, 74 insertions(+), 43 deletions(-) rename arm/Microsoft.Sql/{serversResources => servers}/databases/.bicep/nested_cuaId.bicep (100%) rename arm/Microsoft.Sql/{serversResources => servers}/databases/deploy.bicep (92%) rename arm/Microsoft.Sql/{serversResources => servers}/databases/readme.md (84%) delete mode 100644 arm/Microsoft.Sql/serversResources/databases/.parameters/parameters.json diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/arm/Microsoft.Sql/servers/.parameters/parameters.json index 0a86d2f0e8..c792e85526 100644 --- a/arm/Microsoft.Sql/servers/.parameters/parameters.json +++ b/arm/Microsoft.Sql/servers/.parameters/parameters.json @@ -36,6 +36,33 @@ ] } ] + }, + "databases": { + "value": [ + { + "databaseName": { + "value": "sxx-az-sqldb-weu-x-001" + }, + "collation": { + "value": "SQL_Latin1_General_CP1_CI_AS" + }, + "tier": { + "value": "GeneralPurpose" + }, + "skuName": { + "value": "GP_Gen5_2" + }, + "maxSizeBytes": { + "value": 34359738368 + }, + "serverName": { + "value": "sxx-az-sqlsrv-weu-x-001" + }, + "licenseType": { + "value": "LicenseIncluded" + } + } + ] } } } diff --git a/arm/Microsoft.Sql/serversResources/databases/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/servers/databases/.bicep/nested_cuaId.bicep similarity index 100% rename from arm/Microsoft.Sql/serversResources/databases/.bicep/nested_cuaId.bicep rename to arm/Microsoft.Sql/servers/databases/.bicep/nested_cuaId.bicep diff --git a/arm/Microsoft.Sql/serversResources/databases/deploy.bicep b/arm/Microsoft.Sql/servers/databases/deploy.bicep similarity index 92% rename from arm/Microsoft.Sql/serversResources/databases/deploy.bicep rename to arm/Microsoft.Sql/servers/databases/deploy.bicep index 8de7dc0b1b..1e4636a14e 100644 --- a/arm/Microsoft.Sql/serversResources/databases/deploy.bicep +++ b/arm/Microsoft.Sql/servers/databases/deploy.bicep @@ -26,10 +26,14 @@ param zoneRedundant bool = false param licenseType string = '' @description('Optional. The state of read-only routing.') -param readScaleOut string = 'Disabled' +@allowed([ + 'Enabled' + 'Disabled' +]) +param readScale string = 'Disabled' @description('Optional. The number of readonly secondary replicas associated with the database.') -param numberOfReplicas int = 0 +param highAvailabilityReplicaCount int = 0 @description('Optional. Minimal capacity that database will always have allocated.') param minCapacity string = '' @@ -56,7 +60,7 @@ param cuaId string = '' param requestedBackupStorageRedundancy string = '' @description('Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created.') -param enableSqlLedger bool = false +param isLedgerOn bool = false @description('Optional. Maintenance configuration id assigned to the database. This configuration defines the period when the maintenance updates will occur.') param maintenanceConfigurationId string = '' @@ -76,12 +80,12 @@ resource sqlServerDatabase 'Microsoft.Sql/servers/databases@2021-02-01-preview' sampleName: sampleName zoneRedundant: zoneRedundant licenseType: licenseType - readScale: readScaleOut + readScale: readScale minCapacity: !empty(minCapacity) ? json(minCapacity) : 0 autoPauseDelay: !empty(autoPauseDelay) ? json(autoPauseDelay) : 0 - highAvailabilityReplicaCount: numberOfReplicas + highAvailabilityReplicaCount: highAvailabilityReplicaCount requestedBackupStorageRedundancy: any(requestedBackupStorageRedundancy) - isLedgerOn: enableSqlLedger + isLedgerOn: isLedgerOn maintenanceConfigurationId: !empty(maintenanceConfigurationId) ? maintenanceConfigurationId : null } sku: { diff --git a/arm/Microsoft.Sql/serversResources/databases/readme.md b/arm/Microsoft.Sql/servers/databases/readme.md similarity index 84% rename from arm/Microsoft.Sql/serversResources/databases/readme.md rename to arm/Microsoft.Sql/servers/databases/readme.md index 049e51d0a9..296a1e6f57 100644 --- a/arm/Microsoft.Sql/serversResources/databases/readme.md +++ b/arm/Microsoft.Sql/servers/databases/readme.md @@ -16,14 +16,14 @@ This module deploys an Azure SQL Server. | `collation` | string | | | Optional. The collation of the database. | | `cuaId` | string | | | Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered | | `databaseName` | string | | | Required. The name of the database. | -| `enableSqlLedger` | bool | | | Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created. | +| `highAvailabilityReplicaCount` | int | | | Optional. The number of readonly secondary replicas associated with the database. | +| `isLedgerOn` | bool | | | Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created. | | `licenseType` | string | | | Optional. The license type to apply for this database. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `maintenanceConfigurationId` | string | | | Optional. Maintenance configuration id assigned to the database. This configuration defines the period when the maintenance updates will occur. | | `maxSizeBytes` | int | | | Optional. The max size of the database expressed in bytes. | | `minCapacity` | string | | | Optional. Minimal capacity that database will always have allocated. | -| `numberOfReplicas` | int | | | Optional. The number of readonly secondary replicas associated with the database. | -| `readScaleOut` | string | `Disabled` | | Optional. The state of read-only routing. | +| `readScale` | string | `Disabled` | `[Enabled, Disabled]` | Optional. The state of read-only routing. | | `requestedBackupStorageRedundancy` | string | | `[Geo, Local, Zone, ]` | Optional. The storage account type to be used to store backups for this database. | | `sampleName` | string | | | Optional. The name of the sample schema to apply when creating this database. | | `serverName` | string | | | Required. The Name of SQL Server | diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index f47d9f93d6..e6ec943470 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -34,6 +34,9 @@ param tags object = {} @description('Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered') param cuaId string = '' +@description('Optional. The databases to create in the server') +param databases array = [] + var builtInRoleNames = { 'Owner': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') 'Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') @@ -97,7 +100,7 @@ resource server_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != 'N scope: server } -module server_rbac './.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { +module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { name: 'rbac-${deployment().name}${index}' params: { roleAssignmentObj: roleAssignment @@ -106,6 +109,33 @@ module server_rbac './.bicep/nested_rbac.bicep' = [for (roleAssignment, index) i } }] +module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: { + name: 'database-${deployment().name}${index}' + params: { + databaseName: database.databaseName + serverName: database.serverName + maxSizeBytes: database.maxSizeBytes + tier: database.tier + skuName: database.skuName + collation: database.collation + autoPauseDelay: contains(database, 'autoPauseDelay') ? database.autoPauseDelay : '' + isLedgerOn: contains(database, 'isLedgerOn') ? database.isLedgerOn : false + location: contains(database, 'location') ? database.location : '' + licenseType: contains(database, 'licenseType') ? database.licenseType : '' + maintenanceConfigurationId: contains(database, 'maintenanceConfigurationId') ? database.maintenanceConfigurationId : '' + minCapacity: contains(database, 'minCapacity') ? database.minCapacity : '' + highAvailabilityReplicaCount: contains(database, 'highAvailabilityReplicaCount') ? database.highAvailabilityReplicaCount : 0 + readScale: contains(database, 'readScale') ? database.readScale : 'Disabled' + requestedBackupStorageRedundancy: contains(database, 'requestedBackupStorageRedundancy') ? database.requestedBackupStorageRedundancy : '' + sampleName: contains(database, 'sampleName') ? database.sampleName : '' + tags: contains(database, 'tags') ? database.tags : {} + zoneRedundant: contains(database, 'zoneRedundant') ? database.zoneRedundant : false + } + dependsOn: [ + server + ] +}] + output serverName string = server.name output serverResourceId string = server.id output serverResourceGroup string = resourceGroup().name diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md index 72b4821bc9..b2b802d40a 100644 --- a/arm/Microsoft.Sql/servers/readme.md +++ b/arm/Microsoft.Sql/servers/readme.md @@ -8,6 +8,7 @@ This module deploys an Azure SQL Server. | :-- | :-- | | `Microsoft.Authorization/locks` | 2016-09-01 | | `Microsoft.Sql/servers` | 2020-02-02-preview | +| `Microsoft.Sql/servers/databases` | 2021-02-01-preview | | `Microsoft.Sql/servers/firewallRules` | 2021-02-01-preview | | `Microsoft.Sql/servers/providers/roleAssignments` | 2021-04-01-preview | | `Microsoft.Sql/servers/securityAlertPolicies` | 2021-02-01-preview | @@ -20,6 +21,7 @@ This module deploys an Azure SQL Server. | `administratorLoginPassword` | secureString | | | Required. The administrator login password. | | `allowAzureIps` | bool | | | Required. Whether or not Azure IP's are allowed. | | `cuaId` | string | | | Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered | +| `databases` | _[databases](databases/readme.md)_ array | `[]` | | Optional. The databases to create in the server | | `enableADS` | bool | | | Optional. Whether or not ADS should be enabled. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -85,5 +87,6 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2016-09-01/locks) - [Servers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2020-02-02-preview/servers) +- [Servers/Databases](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/databases) - [Servers/Firewallrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/firewallRules) - [Servers/Securityalertpolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/securityAlertPolicies) diff --git a/arm/Microsoft.Sql/serversResources/databases/.parameters/parameters.json b/arm/Microsoft.Sql/serversResources/databases/.parameters/parameters.json deleted file mode 100644 index 97e8224574..0000000000 --- a/arm/Microsoft.Sql/serversResources/databases/.parameters/parameters.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "collation": { - "value": "SQL_Latin1_General_CP1_CI_AS" - }, - "databaseName": { - "value": "sxx-az-sqldb-weu-x-001" - }, - "tier": { - "value": "GeneralPurpose" - }, - "skuName": { - "value": "GP_Gen5_2" - }, - "maxSizeBytes": { - "value": 34359738368 - }, - "serverName": { - "value": "sxx-az-sqlsrv-weu-x-001" - }, - "zoneRedundant": { - "value": false - }, - "licenseType": { - "value": "LicenseIncluded" - }, - "location": { - "value": "westeurope" - } - } -} From 4be8ba6ef3d33bbe8da09526992ab955fa4866be Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 10:52:59 +0200 Subject: [PATCH 02/12] Removed child-resource workflow --- .../workflows/ms.sql.servers.databases.yml | 214 ------------------ 1 file changed, 214 deletions(-) delete mode 100644 .github/workflows/ms.sql.servers.databases.yml diff --git a/.github/workflows/ms.sql.servers.databases.yml b/.github/workflows/ms.sql.servers.databases.yml deleted file mode 100644 index 1b277a0667..0000000000 --- a/.github/workflows/ms.sql.servers.databases.yml +++ /dev/null @@ -1,214 +0,0 @@ -name: 'Sql: Servers Databases' - -on: - workflow_dispatch: - inputs: - removeDeployment: - description: 'Remove deployed module' - required: false - default: 'true' - versioningOption: - description: 'The mode to handle the version increments [major|minor|patch|custom]' - required: false - default: 'patch' - customVersion: - description: 'The version to enforce if [versionOption] is set to [custom]' - required: false - default: '0.0.1' - push: - branches: - - main - paths: - - '.github/actions/templates/**' - - '.github/workflows/ms.sql.servers.databases.yml' - - 'arm/Microsoft.Sql/serversResources/databases/**' - - '!arm/Microsoft.Sql/serversResources/databases/readme.md' - -env: - moduleName: 'databases' - modulePath: 'arm/Microsoft.Sql/serversResources/databases' - workflowPath: '.github/workflows/ms.sql.servers.databases.yml' - AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} - ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }} - ARM_MGMTGROUP_ID: ${{ secrets.ARM_MGMTGROUP_ID }} - -jobs: - ############################ - # SET INPUT PARAMETERS # - ############################ - job_set_workflow_param: - runs-on: ubuntu-20.04 - name: 'Set input parameters to output variables' - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: 'Set input parameters' - id: get-workflow-param - uses: ./.github/actions/templates/getWorkflowInput - with: - workflowPath: '${{ env.workflowPath}}' - outputs: - removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }} - versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }} - customVersion: ${{ steps.get-workflow-param.outputs.customVersion }} - - ################## - # UNIT TESTS # - ################## - # Global tests - # ------------ - job_tests_module_global: - runs-on: ubuntu-20.04 - name: 'Run global module tests' - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: 'Test module' - uses: ./.github/actions/templates/validateModuleGeneral - with: - modulePath: '${{ env.modulePath }}' - moduleName: '${{ env.moduleName}}' - - # Global API tests - # ---------------- - job_tests_module_global_api: - runs-on: ubuntu-20.04 - name: 'Run global API module tests' - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: 'Test module' - uses: ./.github/actions/templates/validateModuleApis - with: - modulePath: '${{ env.modulePath }}' - moduleName: '${{ env.moduleName}}' - - # Validate deployment module tests - # -------------------------------- - job_tests_module_deploy_validate: - runs-on: ubuntu-20.04 - name: 'Run deployment validation module tests' - strategy: - fail-fast: false - matrix: - parameterFilePaths: ['parameters.json'] - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set environment variables - uses: deep-mm/set-variables@v1.0 - with: - # Name of variable file - variableFileName: 'variables.module' # Don't write .json here - - name: 'Test module' - uses: ./.github/actions/templates/validateModuleDeploy - with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' - location: '${{ env.defaultLocation }}' - resourceGroupName: '${{ env.resourceGroupName }}' - subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - - #################### - # DEPLOY TESTS # - #################### - job_deploy_module: - runs-on: ubuntu-20.04 - name: 'Deploy module' - needs: - - job_set_workflow_param - - job_tests_module_global - - job_tests_module_global_api - - job_tests_module_deploy_validate - strategy: - fail-fast: false - matrix: - parameterFilePaths: ['parameters.json'] - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set environment variables - uses: deep-mm/set-variables@v1.0 - with: - # Name of variable file - variableFileName: 'variables.module' # Don't write .json here - - name: 'Deploy module' - uses: ./.github/actions/templates/deployModule - with: - moduleName: '${{ env.moduleName }}' - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}' - location: '${{ env.defaultLocation }}' - resourceGroupName: '${{ env.resourceGroupName }}' - subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}' - - ############### - # PUBLISH # - ############### - job_publish_module: - name: 'Publish module' - if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) - runs-on: ubuntu-20.04 - needs: - - job_set_workflow_param - - job_deploy_module - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set environment variables - uses: deep-mm/set-variables@v1.0 - with: - # Name of variable file - variableFileName: 'variables.module' # Don't write .json here - - name: 'Publish module' - uses: ./.github/actions/templates/publishModule - with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - componentTemplateSpecRGName: '${{ env.componentTemplateSpecRGName }}' - componentTemplateSpecRGLocation: '${{ env.componentTemplateSpecRGLocation }}' - componentTemplateSpecName: '${{ env.moduleName }}' - componentTemplateSpecDescription: '${{ env.componentTemplateSpecDescription }}' - publishToTemplateSpec: '${{ env.publishToTemplateSpec }}' - versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}' - customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}' - - ############## - # REMOVE # - ############## - job_remove_module: - runs-on: ubuntu-20.04 - name: 'Remove module' - if: ${{ always() && !cancelled() && needs.job_set_workflow_param.outputs.removeDeployment == 'true' && (contains(needs.*.result, 'success') || contains(needs.*.result, 'failure')) }} - needs: - - job_deploy_module - steps: - - name: 'Checkout' - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Set environment variables - uses: deep-mm/set-variables@v1.0 - with: - # Name of variable file - variableFileName: 'variables.module' # Don't write .json here - - name: 'Remove module' - uses: ./.github/actions/templates/removeModule - with: - moduleName: '${{ env.moduleName }}' - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - resourceGroupName: '${{ env.resourceGroupName }}' From 0a10e24a918ada2bf6db6ce3e216b883beb1609b Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 12:28:01 +0200 Subject: [PATCH 03/12] Update to latest --- .../servers/.bicep/nested_rbac.bicep | 9 +++-- .../servers/.parameters/parameters.json | 33 +++++-------------- .../servers/databases/deploy.bicep | 9 ++--- arm/Microsoft.Sql/servers/deploy.bicep | 10 +++--- 4 files changed, 26 insertions(+), 35 deletions(-) diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep index 3b68f4a481..cb0e900b6f 100644 --- a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep +++ b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep @@ -2,10 +2,15 @@ param roleAssignmentObj object param builtInRoleNames object param resourceName string -resource roleAssigment 'Microsoft.Sql/servers/providers/roleAssignments@2021-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: { - name: '${resourceName}/Microsoft.Authorization/${guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName)}' +resource server 'Microsoft.Sql/servers@2020-02-02-preview' existing = { + name: resourceName +} + +resource roleAssigment 'Microsoft.Authorization/roleAssignments@2021-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: { + name: guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName) properties: { roleDefinitionId: (contains(builtInRoleNames, roleAssignmentObj.roleDefinitionIdOrName) ? builtInRoleNames[roleAssignmentObj.roleDefinitionIdOrName] : roleAssignmentObj.roleDefinitionIdOrName) principalId: principalId } + scope: server }] diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/arm/Microsoft.Sql/servers/.parameters/parameters.json index c792e85526..af9568aff2 100644 --- a/arm/Microsoft.Sql/servers/.parameters/parameters.json +++ b/arm/Microsoft.Sql/servers/.parameters/parameters.json @@ -8,7 +8,7 @@ "administratorLogin": { "reference": { "keyVault": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" + "id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" }, "secretName": "administratorLogin" } @@ -16,7 +16,7 @@ "administratorLoginPassword": { "reference": { "keyVault": { - "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" + "id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" }, "secretName": "administratorLoginPassword" } @@ -24,7 +24,7 @@ "location": { "value": "westeurope" }, - "serverName": { + "name": { "value": "sxx-az-sqlsrv-weu-x-001" }, "roleAssignments": { @@ -40,27 +40,12 @@ "databases": { "value": [ { - "databaseName": { - "value": "sxx-az-sqldb-weu-x-001" - }, - "collation": { - "value": "SQL_Latin1_General_CP1_CI_AS" - }, - "tier": { - "value": "GeneralPurpose" - }, - "skuName": { - "value": "GP_Gen5_2" - }, - "maxSizeBytes": { - "value": 34359738368 - }, - "serverName": { - "value": "sxx-az-sqlsrv-weu-x-001" - }, - "licenseType": { - "value": "LicenseIncluded" - } + "name": "sxx-az-sqldb-weu-x-001", + "collation": "SQL_Latin1_General_CP1_CI_AS", + "tier": "GeneralPurpose", + "skuName": "GP_Gen5_2", + "maxSizeBytes": 34359738368, + "licenseType": "LicenseIncluded" } ] } diff --git a/arm/Microsoft.Sql/servers/databases/deploy.bicep b/arm/Microsoft.Sql/servers/databases/deploy.bicep index 1e4636a14e..5a6fe87412 100644 --- a/arm/Microsoft.Sql/servers/databases/deploy.bicep +++ b/arm/Microsoft.Sql/servers/databases/deploy.bicep @@ -2,7 +2,7 @@ param collation string @description('Required. The name of the database.') -param databaseName string +param name string @description('Optional. The tier or edition of the particular SKU.') param tier string @@ -70,10 +70,10 @@ module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource sqlServerDatabase 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { +resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { location: location tags: tags - name: '${serverName}/${databaseName}' + name: '${serverName}/${name}' properties: { collation: collation maxSizeBytes: maxSizeBytes @@ -94,6 +94,7 @@ resource sqlServerDatabase 'Microsoft.Sql/servers/databases@2021-02-01-preview' } } -output databaseName string = databaseName +output databaseName string = database.name +output databaseId string = database.id output databaseResourceGroup string = resourceGroup().name output serverName string = serverName diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index e6ec943470..c8eb1dc909 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -9,7 +9,7 @@ param administratorLoginPassword string param location string = resourceGroup().location @description('Required. The name of the server.') -param serverName string +param name string @description('Optional. Whether or not ADS should be enabled.') param enableADS bool = false @@ -64,7 +64,7 @@ module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { resource server 'Microsoft.Sql/servers@2020-02-02-preview' = { location: location - name: serverName + name: name tags: tags properties: { administratorLogin: administratorLogin @@ -110,10 +110,10 @@ module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: { - name: 'database-${deployment().name}${index}' + name: 'database-${deployment().name}-${database.name}-${index}' params: { - databaseName: database.databaseName - serverName: database.serverName + name: database.name + serverName: server.name maxSizeBytes: database.maxSizeBytes tier: database.tier skuName: database.skuName From 0d53762a1709fe3086d03f2bd77eb592c2c00df5 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 12:29:03 +0200 Subject: [PATCH 04/12] Update to latest --- arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep | 2 +- arm/Microsoft.Sql/servers/databases/readme.md | 3 ++- arm/Microsoft.Sql/servers/readme.md | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep index cb0e900b6f..68aeaa3fb8 100644 --- a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep +++ b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep @@ -6,7 +6,7 @@ resource server 'Microsoft.Sql/servers@2020-02-02-preview' existing = { name: resourceName } -resource roleAssigment 'Microsoft.Authorization/roleAssignments@2021-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: { +resource roleAssigment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in roleAssignmentObj.principalIds: { name: guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName) properties: { roleDefinitionId: (contains(builtInRoleNames, roleAssignmentObj.roleDefinitionIdOrName) ? builtInRoleNames[roleAssignmentObj.roleDefinitionIdOrName] : roleAssignmentObj.roleDefinitionIdOrName) diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/arm/Microsoft.Sql/servers/databases/readme.md index 296a1e6f57..57e02e2eb4 100644 --- a/arm/Microsoft.Sql/servers/databases/readme.md +++ b/arm/Microsoft.Sql/servers/databases/readme.md @@ -15,7 +15,6 @@ This module deploys an Azure SQL Server. | `autoPauseDelay` | string | | | Optional. Time in minutes after which database is automatically paused. | | `collation` | string | | | Optional. The collation of the database. | | `cuaId` | string | | | Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered | -| `databaseName` | string | | | Required. The name of the database. | | `highAvailabilityReplicaCount` | int | | | Optional. The number of readonly secondary replicas associated with the database. | | `isLedgerOn` | bool | | | Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created. | | `licenseType` | string | | | Optional. The license type to apply for this database. | @@ -23,6 +22,7 @@ This module deploys an Azure SQL Server. | `maintenanceConfigurationId` | string | | | Optional. Maintenance configuration id assigned to the database. This configuration defines the period when the maintenance updates will occur. | | `maxSizeBytes` | int | | | Optional. The max size of the database expressed in bytes. | | `minCapacity` | string | | | Optional. Minimal capacity that database will always have allocated. | +| `name` | string | | | Required. The name of the database. | | `readScale` | string | `Disabled` | `[Enabled, Disabled]` | Optional. The state of read-only routing. | | `requestedBackupStorageRedundancy` | string | | `[Geo, Local, Zone, ]` | Optional. The storage account type to be used to store backups for this database. | | `sampleName` | string | | | Optional. The name of the sample schema to apply when creating this database. | @@ -53,6 +53,7 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | | :-- | :-- | +| `databaseId` | string | | `databaseName` | string | | `databaseResourceGroup` | string | | `serverName` | string | diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md index b2b802d40a..bbe6fc8e9f 100644 --- a/arm/Microsoft.Sql/servers/readme.md +++ b/arm/Microsoft.Sql/servers/readme.md @@ -7,10 +7,10 @@ This module deploys an Azure SQL Server. | Resource Type | Api Version | | :-- | :-- | | `Microsoft.Authorization/locks` | 2016-09-01 | +| `Microsoft.Authorization/roleAssignments` | 2020-10-01-preview | | `Microsoft.Sql/servers` | 2020-02-02-preview | | `Microsoft.Sql/servers/databases` | 2021-02-01-preview | | `Microsoft.Sql/servers/firewallRules` | 2021-02-01-preview | -| `Microsoft.Sql/servers/providers/roleAssignments` | 2021-04-01-preview | | `Microsoft.Sql/servers/securityAlertPolicies` | 2021-02-01-preview | ## Parameters @@ -25,8 +25,8 @@ This module deploys an Azure SQL Server. | `enableADS` | bool | | | Optional. Whether or not ADS should be enabled. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | +| `name` | string | | | Required. The name of the server. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `serverName` | string | | | Required. The name of the server. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | ### Parameter Usage: `roleAssignments` @@ -86,6 +86,7 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2016-09-01/locks) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-10-01-preview/roleAssignments) - [Servers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2020-02-02-preview/servers) - [Servers/Databases](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/databases) - [Servers/Firewallrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/firewallRules) From a27162aec18ab2d215248face93dab4516eab414 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 12:41:34 +0200 Subject: [PATCH 05/12] Update to latest --- arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep | 2 +- arm/Microsoft.Sql/servers/.parameters/parameters.json | 4 ++-- arm/Microsoft.Sql/servers/readme.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep index 68aeaa3fb8..cb0e900b6f 100644 --- a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep +++ b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep @@ -6,7 +6,7 @@ resource server 'Microsoft.Sql/servers@2020-02-02-preview' existing = { name: resourceName } -resource roleAssigment 'Microsoft.Authorization/roleAssignments@2020-10-01-preview' = [for principalId in roleAssignmentObj.principalIds: { +resource roleAssigment 'Microsoft.Authorization/roleAssignments@2021-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: { name: guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName) properties: { roleDefinitionId: (contains(builtInRoleNames, roleAssignmentObj.roleDefinitionIdOrName) ? builtInRoleNames[roleAssignmentObj.roleDefinitionIdOrName] : roleAssignmentObj.roleDefinitionIdOrName) diff --git a/arm/Microsoft.Sql/servers/.parameters/parameters.json b/arm/Microsoft.Sql/servers/.parameters/parameters.json index af9568aff2..9e33d6f44a 100644 --- a/arm/Microsoft.Sql/servers/.parameters/parameters.json +++ b/arm/Microsoft.Sql/servers/.parameters/parameters.json @@ -8,7 +8,7 @@ "administratorLogin": { "reference": { "keyVault": { - "id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" + "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" }, "secretName": "administratorLogin" } @@ -16,7 +16,7 @@ "administratorLoginPassword": { "reference": { "keyVault": { - "id": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" + "id": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001" }, "secretName": "administratorLoginPassword" } diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md index bbe6fc8e9f..99772a8c08 100644 --- a/arm/Microsoft.Sql/servers/readme.md +++ b/arm/Microsoft.Sql/servers/readme.md @@ -7,7 +7,7 @@ This module deploys an Azure SQL Server. | Resource Type | Api Version | | :-- | :-- | | `Microsoft.Authorization/locks` | 2016-09-01 | -| `Microsoft.Authorization/roleAssignments` | 2020-10-01-preview | +| `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview | | `Microsoft.Sql/servers` | 2020-02-02-preview | | `Microsoft.Sql/servers/databases` | 2021-02-01-preview | | `Microsoft.Sql/servers/firewallRules` | 2021-02-01-preview | From 2335fee6f41381235cd98882562b42cb814f3424 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 12:52:52 +0200 Subject: [PATCH 06/12] Update to latest --- arm/Microsoft.Sql/servers/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index c8eb1dc909..381dcf8aeb 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -120,7 +120,7 @@ module server_databases 'databases/deploy.bicep' = [for (database, index) in dat collation: database.collation autoPauseDelay: contains(database, 'autoPauseDelay') ? database.autoPauseDelay : '' isLedgerOn: contains(database, 'isLedgerOn') ? database.isLedgerOn : false - location: contains(database, 'location') ? database.location : '' + location: contains(database, 'location') ? database.location : server.location licenseType: contains(database, 'licenseType') ? database.licenseType : '' maintenanceConfigurationId: contains(database, 'maintenanceConfigurationId') ? database.maintenanceConfigurationId : '' minCapacity: contains(database, 'minCapacity') ? database.minCapacity : '' From aadb66f0b53620e574bf62a84d6281e24d660697 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 13:11:54 +0200 Subject: [PATCH 07/12] Update to latest --- arm/Microsoft.Sql/servers/databases/deploy.bicep | 6 +++++- arm/Microsoft.Sql/servers/databases/readme.md | 11 +++++------ arm/Microsoft.Sql/servers/deploy.bicep | 5 +++++ arm/Microsoft.Sql/servers/readme.md | 12 ++++++------ 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/arm/Microsoft.Sql/servers/databases/deploy.bicep b/arm/Microsoft.Sql/servers/databases/deploy.bicep index 5a6fe87412..5ab7a72d00 100644 --- a/arm/Microsoft.Sql/servers/databases/deploy.bicep +++ b/arm/Microsoft.Sql/servers/databases/deploy.bicep @@ -94,7 +94,11 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { } } +@description('The name of the deployed database') output databaseName string = database.name + +@description('The resourceId of the deployed database') output databaseId string = database.id + +@description('The resourceGroup of the deployed database') output databaseResourceGroup string = resourceGroup().name -output serverName string = serverName diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/arm/Microsoft.Sql/servers/databases/readme.md index 57e02e2eb4..f1e958df1b 100644 --- a/arm/Microsoft.Sql/servers/databases/readme.md +++ b/arm/Microsoft.Sql/servers/databases/readme.md @@ -51,12 +51,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Outputs -| Output Name | Type | -| :-- | :-- | -| `databaseId` | string | -| `databaseName` | string | -| `databaseResourceGroup` | string | -| `serverName` | string | +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `databaseId` | string | The resourceId of the deployed database | +| `databaseName` | string | The name of the deployed database | +| `databaseResourceGroup` | string | The resourceGroup of the deployed database | ## Template references diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index 381dcf8aeb..7f2dc64943 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -136,6 +136,11 @@ module server_databases 'databases/deploy.bicep' = [for (database, index) in dat ] }] +@description('The name of the deployed SQL server') output serverName string = server.name + +@description('The resourceId of the deployed SQL server') output serverResourceId string = server.id + +@description('The resourceGroup of the deployed SQL server') output serverResourceGroup string = resourceGroup().name diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md index 99772a8c08..04ffc4caf2 100644 --- a/arm/Microsoft.Sql/servers/readme.md +++ b/arm/Microsoft.Sql/servers/readme.md @@ -77,16 +77,16 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Outputs -| Output Name | Type | -| :-- | :-- | -| `serverName` | string | -| `serverResourceGroup` | string | -| `serverResourceId` | string | +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `serverName` | string | The name of the deployed SQL server | +| `serverResourceGroup` | string | The resourceGroup of the deployed SQL server | +| `serverResourceId` | string | The resourceId of the deployed SQL server | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2016-09-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-10-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) - [Servers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2020-02-02-preview/servers) - [Servers/Databases](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/databases) - [Servers/Firewallrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Sql/2021-02-01-preview/servers/firewallRules) From e5ce17e6e50c87f93ee41a851e868b68c17c718b Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 13:59:55 +0200 Subject: [PATCH 08/12] Update to latest --- arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep index cb0e900b6f..1ac25bd883 100644 --- a/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep +++ b/arm/Microsoft.Sql/servers/.bicep/nested_rbac.bicep @@ -7,7 +7,7 @@ resource server 'Microsoft.Sql/servers@2020-02-02-preview' existing = { } resource roleAssigment 'Microsoft.Authorization/roleAssignments@2021-04-01-preview' = [for principalId in roleAssignmentObj.principalIds: { - name: guid(resourceName, principalId, roleAssignmentObj.roleDefinitionIdOrName) + name: guid(server.name, principalId, roleAssignmentObj.roleDefinitionIdOrName) properties: { roleDefinitionId: (contains(builtInRoleNames, roleAssignmentObj.roleDefinitionIdOrName) ? builtInRoleNames[roleAssignmentObj.roleDefinitionIdOrName] : roleAssignmentObj.roleDefinitionIdOrName) principalId: principalId From 1b86a67b341b1efe58de4a312ec78423d9f28591 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 22:44:46 +0200 Subject: [PATCH 09/12] Update to latest --- arm/Microsoft.Sql/servers/databases/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/arm/Microsoft.Sql/servers/databases/readme.md index f1e958df1b..a470ee1224 100644 --- a/arm/Microsoft.Sql/servers/databases/readme.md +++ b/arm/Microsoft.Sql/servers/databases/readme.md @@ -1,4 +1,4 @@ -# AzureSQLDatabase `[Microsoft.Sql/servers/databases]` +# SQL Server Database `[Microsoft.Sql/servers/databases]` This module deploys an Azure SQL Server. From eb4cd84f126ea5f302c660e064c062514b3b0bd2 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sat, 30 Oct 2021 23:05:39 +0200 Subject: [PATCH 10/12] Update to latest --- arm/Microsoft.Sql/servers/deploy.bicep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index 7f2dc64943..976ce700c0 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -101,7 +101,7 @@ resource server_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock != 'N } module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: 'rbac-${deployment().name}${index}' + name: '${deployment().name}-rbac-${index}' params: { roleAssignmentObj: roleAssignment builtInRoleNames: builtInRoleNames @@ -110,7 +110,7 @@ module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: { - name: 'database-${deployment().name}-${database.name}-${index}' + name: '${deployment().name}-database-${index}' params: { name: database.name serverName: server.name From 8fea74e21de3a77c31f8b07e0f93a1e213fa7120 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sun, 31 Oct 2021 11:57:05 +0100 Subject: [PATCH 11/12] Update to latest --- arm/Microsoft.Sql/servers/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index 976ce700c0..ce76bc5258 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -110,7 +110,7 @@ module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: { - name: '${deployment().name}-database-${index}' + name: '${deployment().name}-db-${index}' params: { name: database.name serverName: server.name From 8b641c53d74f77c3bd0cce655acdf262b6457247 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 1 Nov 2021 16:02:35 +0100 Subject: [PATCH 12/12] Update to latest --- .../applicationGateways/.parameters/parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json b/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json index b0225b35c3..122fbd2e35 100644 --- a/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json +++ b/arm/Microsoft.Network/applicationGateways/.parameters/parameters.json @@ -1,5 +1,5 @@ { - "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", "contentVersion": "1.0.0.0", "parameters": { "applicationGatewayName": {