Skip to content

Added additional test case for SQL Server #1116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexanderSehr merged 7 commits into from
Mar 11, 2022
Merged

Added additional test case for SQL Server #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7bdaaa
Added fork code
AlexanderSehr Mar 10, 2022
a3690ba
Added separate param file
AlexanderSehr Mar 10, 2022
70c531c
Update to latest
AlexanderSehr Mar 10, 2022
4b75f95
Update to latest
AlexanderSehr Mar 10, 2022
eda02f1
Update to latest
AlexanderSehr Mar 10, 2022
ab2d3b2
Update to latest
AlexanderSehr Mar 10, 2022
b3c9733
Update arm/Microsoft.Sql/servers/deploy.bicep
AlexanderSehr Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azuredevops/modulePipelines/ms.sql.servers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ stages:
removeDeployment: '${{ parameters.removeDeployment }}'
deploymentBlocks:
- path: $(modulePath)/.parameters/parameters.json
- path: $(modulePath)/.parameters/admin.parameters.json

- stage: Publishing
displayName: Publish module
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ms.sql.servers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
strategy:
fail-fast: false
matrix:
parameterFilePaths: ['parameters.json']
parameterFilePaths: ['admin.parameters.json', 'parameters.json']
steps:
- name: 'Checkout'
uses: actions/checkout@v2
Expand Down
18 changes: 18 additions & 0 deletions arm/Microsoft.Sql/servers/.parameters/admin.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-sqlsrv-admin-001"
},
"administrators": {
"value": {
"azureADOnlyAuthentication": true,
"login": "myspn",
"sid": "<<deploymentSpId>>",
"principalType": "Application",
"tenantId": "<<tenantId>>"
}
}
}
}
17 changes: 4 additions & 13 deletions arm/Microsoft.Sql/servers/.parameters/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "<<namePrefix>>-az-sqlsrv-x-001"
},
"administratorLogin": {
"reference": {
"keyVault": {
Expand All @@ -18,21 +21,9 @@
"secretName": "administratorLoginPassword"
}
},
"administrators": {
"value": {
"azureADOnlyAuthentication": false,
"login": "John Doe",
"sid": "<<deploymentSpId>>",
"principalType": "Application",
"tenantId": "<<tenantId>>"
}
},
"location": {
"value": "westeurope"
},
"name": {
"value": "<<namePrefix>>-az-sqlsrv-x-001"
},
"roleAssignments": {
"value": [
{
Expand Down Expand Up @@ -87,4 +78,4 @@
}
}
}
}
}
8 changes: 4 additions & 4 deletions arm/Microsoft.Sql/servers/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/administr
```json
"administrators": {
"value": {
"azureADOnlyAuthentication": false
"login": "John Doe"
"sid": "<<objectId>>"
"azureADOnlyAuthentication": true
"login": "John Doe" // if application can be anything
"sid": "<<objectId>>" // if application, the object ID
"principalType" : "User" // options: "User", "Group", "Application"
"tenantId": "<<tenantId>>"
}
},
}
```

## Outputs
Expand Down