Skip to content

Commit f14a7a1

Browse files
johnpaulkeejohnpaulkee
committed
Updates based on feedback. Get-Location and markdown help files updated
1 parent 73b4f69 commit f14a7a1

File tree

13 files changed

+6271
-2084
lines changed

13 files changed

+6271
-2084
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function Test-CreateVcoreDatabase
151151
function Test-CreateVcoreDatabaseWithLicenseType
152152
{
153153
# Setup
154-
$location = "westcentralus"
154+
$location = Get-Location "Microsoft.Sql" "operations" "West Central US"
155155
$rg = Create-ResourceGroupForTest
156156
$server = Create-ServerForTest $rg $location
157157

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseReplicationTests.ps1

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,10 @@
1616
.SYNOPSIS
1717
Tests creating a database copy
1818
#>
19-
function Test-CreateDatabaseCopy
20-
{
21-
Test-CreateCopyInternal "12.0" "Southeast Asia"
22-
}
23-
24-
<#
25-
.SYNOPSIS
26-
Tests creating a database copy
27-
#>
28-
function Test-CreateCopyInternal ($serverVersion, $location = "North Europe")
19+
function Test-CreateDatabaseCopy()
2920
{
3021
# Setup
22+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
3123
$rg = Create-ResourceGroupForTest $location
3224
$server = Create-ServerForTest $rg $location
3325
$database = Create-DatabaseForTest $rg $server "Standard"
@@ -72,19 +64,10 @@ function Test-CreateCopyInternal ($serverVersion, $location = "North Europe")
7264
.SYNOPSIS
7365
Tests creating a vcore database copy
7466
#>
75-
function Test-CreateVcoreDatabaseCopy
76-
{
77-
Test-CreateVcoreCopyInternal "12.0" "Southeast Asia"
78-
}
79-
80-
81-
<#
82-
.SYNOPSIS
83-
Tests creating a vcore database copy
84-
#>
85-
function Test-CreateVcoreCopyInternal ($serverVersion, $location = "North Europe")
67+
function Test-CreateVcoreDatabaseCopy()
8668
{
8769
# Setup
70+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
8871
$rg = Create-ResourceGroupForTest $location
8972
$server = Create-ServerForTest $rg $location
9073
$db = Create-VcoreDatabaseForTest $rg $server 1 BasePrice
@@ -135,18 +118,10 @@ function Test-CreateVcoreCopyInternal ($serverVersion, $location = "North Europe
135118
.SYNOPSIS
136119
Tests creating a secondary database
137120
#>
138-
function Test-CreateSecondaryDatabase
139-
{
140-
Test-CreateSecondaryDatabaseInternal "12.0" "Southeast Asia"
141-
}
142-
143-
<#
144-
.SYNOPSIS
145-
Tests creating a secondary database
146-
#>
147-
function Test-CreateSecondaryDatabaseInternal ($serverVersion, $location = "North Europe")
121+
function Test-CreateSecondaryDatabase()
148122
{
149123
# Setup
124+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
150125
$rg = Create-ResourceGroupForTest $location
151126
$server = Create-ServerForTest $rg $location
152127
$database = Create-DatabaseForTest $rg $server
@@ -184,18 +159,10 @@ function Test-CreateSecondaryDatabaseInternal ($serverVersion, $location = "Nort
184159
.SYNOPSIS
185160
Tests getting a secondary database
186161
#>
187-
function Test-GetReplicationLink
188-
{
189-
Test-GetReplicationLinkInternal "12.0" "Southeast Asia"
190-
}
191-
192-
<#
193-
.SYNOPSIS
194-
Tests getting a secondary database
195-
#>
196-
function Test-GetReplicationLinkInternal ($serverVersion, $location = "North Europe")
162+
function Test-GetReplicationLink()
197163
{
198164
# Setup
165+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
199166
$rg = Create-ResourceGroupForTest $location
200167
$server = Create-ServerForTest $rg $location
201168
$database = Create-DatabaseForTest $rg $server
@@ -237,18 +204,10 @@ function Test-GetReplicationLinkInternal ($serverVersion, $location = "North Eur
237204
.SYNOPSIS
238205
Tests removing a secondary database
239206
#>
240-
function Test-RemoveSecondaryDatabase
241-
{
242-
Test-RemoveSecondaryDatabaseInternal "12.0" "Southeast Asia"
243-
}
244-
245-
<#
246-
.SYNOPSIS
247-
Tests removing a secondary database
248-
#>
249-
function Test-RemoveSecondaryDatabaseInternal ($serverVersion, $location = "North Europe")
207+
function Test-RemoveSecondaryDatabase()
250208
{
251209
# Setup
210+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
252211
$rg = Create-ResourceGroupForTest $location
253212
$server = Create-ServerForTest $rg $location
254213
$database = Create-DatabaseForTest $rg $server
@@ -272,23 +231,14 @@ function Test-RemoveSecondaryDatabaseInternal ($serverVersion, $location = "Nort
272231
}
273232
}
274233

275-
<#
276-
.SYNOPSIS
277-
Tests removing a secondary database
278-
#>
279-
function Test-FailoverSecondaryDatabase
280-
{
281-
#v12 only
282-
Test-FailoverSecondaryDatabaseInternal "12.0" "Southeast Asia"
283-
}
284-
285234
<#
286235
.SYNOPSIS
287236
Tests failing over a secondary database
288237
#>
289-
function Test-FailoverSecondaryDatabaseInternal ($serverVersion, $location = "North Europe")
238+
function Test-FailoverSecondaryDatabase()
290239
{
291240
# Setup
241+
$location = Get-Location "Microsoft.Sql" "operations" "Southeast Asia"
292242
$rg = Create-ResourceGroupForTest $location
293243
$server = Create-ServerForTest $rg $location
294244
$database = Create-DatabaseForTest $rg $server

‎src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests/TestCreateSecondaryDatabase.json

Lines changed: 4398 additions & 648 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests/TestGetReplicationLink.json

Lines changed: 886 additions & 706 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseReplicationTests/TestRemoveSecondaryDatabase.json

Lines changed: 940 additions & 661 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Sql/Commands.Sql/Database/Cmdlet/NewAzureSqlDatabase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ protected override AzureSqlDatabaseCreateOrUpdateModel ApplyUserInputToModel(Azu
218218
ElasticPoolName = ElasticPoolName,
219219
ReadScale = ReadScale,
220220
ZoneRedundant = MyInvocation.BoundParameters.ContainsKey("ZoneRedundant") ? (bool?)ZoneRedundant.ToBool() : null,
221-
LicenseType = LicenseType // note: default license type is LicenseIncluded
221+
LicenseType = LicenseType // note: default license type will be LicenseIncluded in SQL RP if not specified
222222
};
223223

224224
if(ParameterSetName == DtuDatabaseParameterSet)

‎src/ResourceManager/Sql/Commands.Sql/help/New-AzureRmSqlDatabase.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,13 @@ Accept wildcard characters: False
208208
### -Edition
209209
Specifies the edition to assign to the database. The acceptable values for this parameter are:
210210
211-
- Default
212211
- None
213-
- Premium
214212
- Basic
215213
- Standard
214+
- Premium
216215
- DataWarehouse
216+
- Free
217+
- Stretch
217218
- GeneralPurpose
218219
- BusinessCritical
219220
@@ -227,6 +228,7 @@ Position: Named
227228
Default value: None
228229
Accept pipeline input: False
229230
Accept wildcard characters: False
231+
Accepted values: None, Basic, Standard, Premium, DataWarehouse, Free, Stretch, GeneralPurpose, BusinessCritical
230232
```
231233
232234
```yaml
@@ -268,6 +270,7 @@ Position: Named
268270
Default value: None
269271
Accept pipeline input: False
270272
Accept wildcard characters: False
273+
Accepted values: LicenseIncluded, BasePrice
271274
```
272275
273276
### -MaxSizeBytes

‎src/ResourceManager/Sql/Commands.Sql/help/New-AzureRmSqlDatabaseCopy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Position: Named
174174
Default value: None
175175
Accept pipeline input: False
176176
Accept wildcard characters: False
177+
Accepted values: LicenseIncluded, BasePrice
177178
```
178179
179180
### -ResourceGroupName

‎src/ResourceManager/Sql/Commands.Sql/help/New-AzureRmSqlDatabaseSecondary.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ Position: Named
122122
Default value: None
123123
Accept pipeline input: False
124124
Accept wildcard characters: False
125+
Accepted values: LicenseIncluded, BasePrice
125126
```
126127
127128
### -PartnerResourceGroupName

‎src/ResourceManager/Sql/Commands.Sql/help/New-AzureRmSqlElasticPool.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,15 @@ Accept wildcard characters: False
204204
Specifies the edition of the Azure SQL Database used for the elastic pool.
205205
The acceptable values for this parameter are:
206206
207-
- Premium
207+
- None
208208
- Basic
209209
- Standard
210+
- Premium
210211
- DataWarehouse
212+
- Free
211213
- Stretch
214+
- GeneralPurpose
215+
- BusinessCritical
212216
213217
```yaml
214218
Type: String
@@ -220,6 +224,7 @@ Position: Named
220224
Default value: None
221225
Accept pipeline input: False
222226
Accept wildcard characters: False
227+
Accepted values: None, Basic, Standard, Premium, DataWarehouse, Free, Stretch, GeneralPurpose, BusinessCritical
223228
```
224229
225230
```yaml
@@ -261,6 +266,7 @@ Position: Named
261266
Default value: None
262267
Accept pipeline input: False
263268
Accept wildcard characters: False
269+
Accepted values: LicenseIncluded, BasePrice
264270
```
265271
266272
### -ResourceGroupName

‎src/ResourceManager/Sql/Commands.Sql/help/Restore-AzureRmSqlDatabase.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,14 @@ Specifies the edition of the SQL database.
200200
The acceptable values for this parameter are:
201201
202202
- None
203-
- Premium
204203
- Basic
205204
- Standard
205+
- Premium
206206
- DataWarehouse
207207
- Free
208+
- Stretch
209+
- GeneralPurpose
210+
- BusinessCritical
208211
209212
```yaml
210213
Type: String
@@ -216,6 +219,7 @@ Position: Named
216219
Default value: None
217220
Accept pipeline input: False
218221
Accept wildcard characters: False
222+
Accepted values: None, Basic, Standard, Premium, DataWarehouse, Free, Stretch, GeneralPurpose, BusinessCritical
219223
```
220224
221225
```yaml
@@ -319,6 +323,7 @@ Position: Named
319323
Default value: None
320324
Accept pipeline input: False
321325
Accept wildcard characters: False
326+
Accepted values: LicenseIncluded, BasePrice
322327
```
323328
324329
### -PointInTime

‎src/ResourceManager/Sql/Commands.Sql/help/Set-AzureRmSqlDatabase.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,14 @@ Specifies the edition for the database.
183183
The acceptable values for this parameter are:
184184
185185
- None
186-
- Premium
187186
- Basic
188187
- Standard
188+
- Premium
189189
- DataWarehouse
190+
- Free
191+
- Stretch
192+
- GeneralPurpose
193+
- BusinessCritical
190194
191195
```yaml
192196
Type: String
@@ -198,6 +202,7 @@ Position: Named
198202
Default value: None
199203
Accept pipeline input: False
200204
Accept wildcard characters: False
205+
Accepted values: None, Basic, Standard, Premium, DataWarehouse, Free, Stretch, GeneralPurpose, BusinessCritical
201206
```
202207
203208
### -ElasticPoolName
@@ -227,6 +232,7 @@ Position: Named
227232
Default value: None
228233
Accept pipeline input: False
229234
Accept wildcard characters: False
235+
Accepted values: LicenseIncluded, BasePrice
230236
```
231237
232238
### -MaxSizeBytes

‎src/ResourceManager/Sql/Commands.Sql/help/Set-AzureRmSqlElasticPool.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ edition. The acceptable values for this parameter are:
231231
- Standard
232232
- Premium
233233
- DataWarehouse
234+
- Free
235+
- Stretch
236+
- GeneralPurpose
237+
- BusinessCritical
234238
235239
```yaml
236240
Type: String
@@ -242,6 +246,7 @@ Position: Named
242246
Default value: None
243247
Accept pipeline input: False
244248
Accept wildcard characters: False
249+
Accepted values: None, Basic, Standard, Premium, DataWarehouse, Free, Stretch, GeneralPurpose, BusinessCritical
245250
```
246251
247252
### -ElasticPoolName
@@ -271,6 +276,7 @@ Position: Named
271276
Default value: None
272277
Accept pipeline input: False
273278
Accept wildcard characters: False
279+
Accepted values: LicenseIncluded, BasePrice
274280
```
275281
276282
### -ResourceGroupName

0 commit comments

Comments
 (0)