Skip to content

Commit ba9f811

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#792 from akromm/Get-AzureSqlCapabilities
Get azure sql capabilities
2 parents bf08051 + 911fb81 commit ba9f811

File tree

43 files changed

+1325
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1325
-110
lines changed

‎src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ FormatsToProcess = @(
7272
'.\Compute\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
7373
'.\Network\Microsoft.Azure.Commands.Network.format.ps1xml',
7474
'.\Storage\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml',
75-
'.\StorageManagement\Microsoft.Azure.Commands.Management.Storage.format.ps1xml',
75+
'.\StorageManagement\Microsoft.Azure.Commands.Management.Storage.format.ps1xml',
7676
'.\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml',
7777
'.\AzureBackup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml',
78-
'.\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml'
78+
'.\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
79+
'.\Sql\Microsoft.Azure.Commands.Sql.format.ps1xml'
7980
)
8081

8182
# Modules to import as nested modules of the module specified in ModuleToProcess

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Azure.Management.Sql">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.29.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
56-
</Reference>
5754
<Reference Include="Microsoft.Azure.Common">
5855
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5956
</Reference>
@@ -72,7 +69,7 @@
7269
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
7370
</Reference>
7471
<Reference Include="Microsoft.Azure.Management.Sql">
75-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.36.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.37.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
7673
</Reference>
7774
<Reference Include="Microsoft.Azure.Management.Storage">
7875
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -192,6 +189,9 @@
192189
<Compile Include="ScenarioTests\DatabaseBackupTests.cs" />
193190
<Compile Include="ScenarioTests\DatabaseCrudTests.cs" />
194191
<Compile Include="ScenarioTests\DataMaskingTests.cs" />
192+
<None Include="ScenarioTests\LocationCapabilitiesTests.ps1">
193+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
194+
</None>
195195
<None Include="ScenarioTests\ServerActiveDirectoryAdministratorTest.ps1">
196196
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
197197
</None>
@@ -210,6 +210,7 @@
210210
<None Include="ScenarioTests\ElasticPoolCrudTests.ps1">
211211
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212212
</None>
213+
<Compile Include="ScenarioTests\LocationCapabilitiesTests.cs" />
213214
<Compile Include="ScenarioTests\ServerActiveDirectoryAdministratorTest.cs" />
214215
<Compile Include="ScenarioTests\ServiceTierAdvisorTests.cs" />
215216
<Compile Include="ScenarioTests\RecommendedElasticPoolTests.cs" />
@@ -228,6 +229,7 @@
228229
<Compile Include="UnitTests\AzureSqlDatabaseServerFirewallRuleAttributeTests.cs" />
229230
<Compile Include="UnitTests\AzureSqlDatabaseServerAttributeTests.cs" />
230231
<Compile Include="UnitTests\AzureSqlDatabaseIndexRecommendationAttributeTests.cs" />
232+
<Compile Include="UnitTests\AzureSqlCapabilityAttributeTests.cs" />
231233
<Compile Include="UnitTests\AzureSqlServerUpgradeAttributeTests.cs" />
232234
<Compile Include="UnitTests\AzureSqlServiceTierAdvisorAttributeTests.cs" />
233235
<Compile Include="UnitTests\AzureSqlDatabaseBackupAttributeTests.cs" />
@@ -489,6 +491,9 @@
489491
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ServerUpgradeTests\TestServerUpgradeNegative.json">
490492
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
491493
</None>
494+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.LocationCapabilitiesTests\TestLocationCapabilities.json">
495+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
496+
</None>
492497
<None Include="Templates\sql-ddm-test-env-setup.json">
493498
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
494499
</None>

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/AuditingTests.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,182 +44,182 @@ protected override void SetupManagementClients()
4444
}
4545

4646
[Fact]
47-
[Trait(Category.Sql, Category.CheckIn)]
47+
[Trait(Category.AcceptanceType, Category.Sql)]
4848
public void TestAuditingDatabaseUpdatePolicyWithStorage()
4949
{
5050
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorage");
5151
}
5252

5353
[Fact]
54-
[Trait(Category.Sql, Category.CheckIn)]
54+
[Trait(Category.AcceptanceType, Category.Sql)]
5555
public void TestAuditingDatabaseUpdatePolicyWithStorageV2()
5656
{
5757
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorageV2");
5858
}
5959

6060
[Fact]
61-
[Trait(Category.Sql, Category.CheckIn)]
61+
[Trait(Category.AcceptanceType, Category.Sql)]
6262
public void TestAuditingServerUpdatePolicyWithStorage()
6363
{
6464
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithStorage");
6565
}
6666

6767
[Fact]
68-
[Trait(Category.Sql, Category.CheckIn)]
68+
[Trait(Category.AcceptanceType, Category.Sql)]
6969
public void TestAuditingDatabaseUpdatePolicyWithEventTypes()
7070
{
7171
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithEventTypes");
7272
}
7373

7474
[Fact]
75-
[Trait(Category.Sql, Category.CheckIn)]
75+
[Trait(Category.AcceptanceType, Category.Sql)]
7676
public void TestAuditingServerUpdatePolicyWithEventTypes()
7777
{
7878
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithEventTypes");
7979
}
8080

8181
[Fact]
82-
[Trait(Category.Sql, Category.CheckIn)]
82+
[Trait(Category.AcceptanceType, Category.Sql)]
8383
public void TestAuditingDisableDatabaseAuditing()
8484
{
8585
RunPowerShellTest("Test-AuditingDisableDatabaseAuditing");
8686
}
8787

8888
[Fact]
89-
[Trait(Category.Sql, Category.CheckIn)]
89+
[Trait(Category.AcceptanceType, Category.Sql)]
9090
public void TestAuditingDisableServerAuditing()
9191
{
9292
RunPowerShellTest("Test-AuditingDisableServerAuditing");
9393
}
9494

9595
[Fact]
96-
[Trait(Category.Sql, Category.CheckIn)]
96+
[Trait(Category.AcceptanceType, Category.Sql)]
9797
public void TestAuditingDatabaseDisableEnableKeepProperties()
9898
{
9999
RunPowerShellTest("Test-AuditingDatabaseDisableEnableKeepProperties");
100100
}
101101

102102
[Fact]
103-
[Trait(Category.Sql, Category.CheckIn)]
103+
[Trait(Category.AcceptanceType, Category.Sql)]
104104
public void TestAuditingServerDisableEnableKeepProperties()
105105
{
106106
RunPowerShellTest("Test-AuditingServerDisableEnableKeepProperties");
107107
}
108108

109109
[Fact]
110-
[Trait(Category.Sql, Category.CheckIn)]
110+
[Trait(Category.AcceptanceType, Category.Sql)]
111111
public void TestAuditingUseServerDefault()
112112
{
113113
RunPowerShellTest("Test-AuditingUseServerDefault");
114114
}
115115

116116
[Fact]
117-
[Trait(Category.Sql, Category.CheckIn)]
117+
[Trait(Category.AcceptanceType, Category.Sql)]
118118
public void TestAuditingFailedDatabaseUpdatePolicyWithNoStorage()
119119
{
120120
RunPowerShellTest("Test-AuditingFailedDatabaseUpdatePolicyWithNoStorage");
121121
}
122122

123123
[Fact]
124-
[Trait(Category.Sql, Category.CheckIn)]
124+
[Trait(Category.AcceptanceType, Category.Sql)]
125125
public void TestAuditingFailedServerUpdatePolicyWithNoStorage()
126126
{
127127
RunPowerShellTest("Test-AuditingFailedServerUpdatePolicyWithNoStorage");
128128
}
129129

130130
[Fact]
131-
[Trait(Category.Sql, Category.CheckIn)]
131+
[Trait(Category.AcceptanceType, Category.Sql)]
132132
public void TestAuditingFailedUseServerDefault()
133133
{
134134
RunPowerShellTest("Test-AuditingFailedUseServerDefault");
135135
}
136136

137137
[Fact]
138-
[Trait(Category.Sql, Category.CheckIn)]
138+
[Trait(Category.AcceptanceType, Category.Sql)]
139139
public void TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts()
140140
{
141141
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithEventTypeShortcuts");
142142
}
143143

144144
[Fact]
145-
[Trait(Category.Sql, Category.CheckIn)]
145+
[Trait(Category.AcceptanceType, Category.Sql)]
146146
public void TestAuditingServerUpdatePolicyWithEventTypeShortcuts()
147147
{
148148
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithEventTypeShortcuts");
149149
}
150150

151151
[Fact]
152-
[Trait(Category.Sql, Category.CheckIn)]
152+
[Trait(Category.AcceptanceType, Category.Sql)]
153153
public void TestAuditingDatabaseUpdatePolicyKeepPreviousStorage()
154154
{
155155
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyKeepPreviousStorage");
156156
}
157157

158158
[Fact]
159-
[Trait(Category.Sql, Category.CheckIn)]
159+
[Trait(Category.AcceptanceType, Category.Sql)]
160160
public void TestAuditingServerUpdatePolicyKeepPreviousStorage()
161161
{
162162
RunPowerShellTest("Test-AuditingServerUpdatePolicyKeepPreviousStorage");
163163
}
164164

165165
[Fact]
166-
[Trait(Category.Sql, Category.CheckIn)]
166+
[Trait(Category.AcceptanceType, Category.Sql)]
167167
public void TestAuditingFailWithBadDatabaseIndentity()
168168
{
169169
RunPowerShellTest("Test-AuditingFailWithBadDatabaseIndentity");
170170
}
171171

172172
[Fact]
173-
[Trait(Category.Sql, Category.CheckIn)]
173+
[Trait(Category.AcceptanceType, Category.Sql)]
174174
public void TestAuditingFailWithBadServerIndentity()
175175
{
176176
RunPowerShellTest("Test-AuditingFailWithBadServerIndentity");
177177
}
178178

179179
[Fact]
180-
[Trait(Category.Sql, Category.CheckIn)]
180+
[Trait(Category.AcceptanceType, Category.Sql)]
181181
public void TestAuditingDatabaseStorageKeyRotation()
182182
{
183183
RunPowerShellTest("Test-AuditingDatabaseStorageKeyRotation");
184184
}
185185

186186
[Fact]
187-
[Trait(Category.Sql, Category.CheckIn)]
187+
[Trait(Category.AcceptanceType, Category.Sql)]
188188
public void TestAuditingServerStorageKeyRotation()
189189
{
190190
RunPowerShellTest("Test-AuditingServerStorageKeyRotation");
191191
}
192192

193193
[Fact]
194-
[Trait(Category.Sql, Category.CheckIn)]
194+
[Trait(Category.AcceptanceType, Category.Sql)]
195195
public void TestAuditingServerUpdatePolicyWithRetention()
196196
{
197197
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithRetention");
198198
}
199199

200200
[Fact]
201-
[Trait(Category.Sql, Category.CheckIn)]
201+
[Trait(Category.AcceptanceType, Category.Sql)]
202202
public void TestAuditingDatabaseUpdatePolicyWithRetention()
203203
{
204204
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithRetention");
205205
}
206206

207207
[Fact]
208-
[Trait(Category.Sql, Category.CheckIn)]
208+
[Trait(Category.AcceptanceType, Category.Sql)]
209209
public void TestAuditingServerRetentionKeepProperties()
210210
{
211211
RunPowerShellTest("Test-AuditingServerRetentionKeepProperties");
212212
}
213213

214214
[Fact]
215-
[Trait(Category.Sql, Category.CheckIn)]
215+
[Trait(Category.AcceptanceType, Category.Sql)]
216216
public void TestAuditingDatabaseRetentionKeepProperties()
217217
{
218218
RunPowerShellTest("Test-AuditingDatabaseRetentionKeepProperties");
219219
}
220220

221221
[Fact]
222-
[Trait(Category.Sql, Category.CheckIn)]
222+
[Trait(Category.AcceptanceType, Category.Sql)]
223223
public void TestAuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion()
224224
{
225225
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ function Create-ResourceGroupForTest ()
171171
return $rg
172172
}
173173

174-
175174
<#
176175
.SYNOPSIS
177176
removes a resource group that was used for testing

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DataMaskingTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,49 @@ public class DataMaskingTests : SqlTestsBase
2222
{
2323

2424
[Fact]
25-
[Trait(Category.Sql, Category.CheckIn)]
25+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2626
public void TestDatabaseDataMaskingPolicyEnablementToggling()
2727
{
2828
RunPowerShellTest("Test-DatabaseDataMaskingPolicyEnablementToggling");
2929
}
3030

3131
[Fact]
32-
[Trait(Category.Sql, Category.CheckIn)]
32+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3333
public void TestDatabaseDataMaskingPrivilegedLoginsChanges()
3434
{
3535
RunPowerShellTest("Test-DatabaseDataMaskingPrivilegedLoginsChanges");
3636
}
3737

3838
[Fact]
39-
[Trait(Category.Sql, Category.CheckIn)]
39+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4040
public void TestDatabaseDataMaskingBasicRuleLifecycle()
4141
{
4242
RunPowerShellTest("Test-DatabaseDataMaskingBasicRuleLifecycle");
4343
}
4444

4545
[Fact]
46-
[Trait(Category.Sql, Category.CheckIn)]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4747
public void TestDatabaseDataMaskingNumberRuleLifecycle()
4848
{
4949
RunPowerShellTest("Test-DatabaseDataMaskingNumberRuleLifecycle");
5050
}
5151

5252
[Fact]
53-
[Trait(Category.Sql, Category.CheckIn)]
53+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5454
public void TestDatabaseDataMaskingTextRuleLifecycle()
5555
{
5656
RunPowerShellTest("Test-DatabaseDataMaskingTextRuleLifecycle");
5757
}
5858

5959
[Fact]
60-
[Trait(Category.Sql, Category.CheckIn)]
60+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6161
public void TestDatabaseDataMaskingRuleCreationFailures()
6262
{
6363
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationFailures");
6464
}
6565

6666
[Fact]
67-
[Trait(Category.Sql, Category.CheckIn)]
67+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6868
public void TestDatabaseDataMaskingRuleCreationWithoutPolicy()
6969
{
7070
RunPowerShellTest("Test-DatabaseDataMaskingRuleCreationWithoutPolicy");

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseActivationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2121
public class DatabaseActivationTests : SqlTestsBase
2222
{
2323
[Fact]
24-
[Trait(Category.Sql, Category.CheckIn)]
24+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2525
public void TestDatabasePauseResume()
2626
{
2727
RunPowerShellTest("Test-DatabasePauseResume");
2828
}
2929

3030
[Fact]
31-
[Trait(Category.Sql, Category.CheckIn)]
31+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3232
public void TestDatabasePauseResumePiped()
3333
{
3434
RunPowerShellTest("Test-DatabasePauseResumePiped");

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseBackupTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2121
public class DatabaseBackupTests : SqlTestsBase
2222
{
2323
[Fact]
24-
[Trait(Category.Sql, Category.CheckIn)]
24+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2525
public void TestListDatabaseRestorePoints()
2626
{
2727
RunPowerShellTest("Test-ListDatabaseRestorePoints");

0 commit comments

Comments
 (0)