Skip to content

Commit 50a660b

Browse files
cormacpaynecormacpayne
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into breaking-change-tool-refactor
2 parents 1ac3532 + c96483f commit 50a660b

File tree

18 files changed

+5276
-70
lines changed

18 files changed

+5276
-70
lines changed

‎ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@
517517
* DataFactory
518518
* Added new cmdlet for listing activity windows
519519
- Get-AzureRmDataFactoryActivityWindow
520+
* Fixed Get-AzureRmDataFactoryActivityWindow so it works for named pipeline and activity
520521
* DataLake
521522
* Changed parameter `Host` to `DatabaseHost` and added alias to `Host`
522523
- New-AzureRmDataLakeAnalyticsCatalogSecret

‎documentation/Repo-Tasks-Module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###### Usage:
44

55
1. Start .\tools\PS-VSPrompt.lnk (shortcut), this will start VS Dev Prompt in powershell
6-
2. Import-Module .\tools\Repo-Tasks.psd1
6+
2. Import-Module .\Repo-Tasks.psd1
77
1. During import, we allow to load additional functions that users might want to use it in their session.
88
2. If you have any userPreference.ps1 file under %userprofile%/psFiles directory, the module will try to load it by dot sourcing it.
99
2. It will also honor environment variable $env:psuserpreferences and load .ps1 files from the location that is pointed by $env:psuserpreferences

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.DataFactories">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.7.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.11.1\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.DataFactories" version="4.7.0" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.DataFactories" version="4.11.1" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.7.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.11.1\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/DataFactories/Commands.DataFactories/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.DataFactories" version="4.7.0" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.DataFactories" version="4.11.1" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/SslCertificate/AzureApplicationGatewaySslCertificateBase.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using Microsoft.Azure.Commands.Network.Models;
1616
using System;
17+
using System.IO;
1718
using System.Management.Automation;
1819
using System.Security.Cryptography.X509Certificates;
1920

@@ -41,12 +42,10 @@ public class AzureApplicationGatewaySslCertificateBase : NetworkBaseCmdlet
4142

4243
public PSApplicationGatewaySslCertificate NewObject()
4344
{
44-
X509Certificate2 cert = new X509Certificate2(CertificateFile, Password, X509KeyStorageFlags.Exportable);
45-
4645
var sslCertificate = new PSApplicationGatewaySslCertificate();
4746

4847
sslCertificate.Name = this.Name;
49-
sslCertificate.Data = Convert.ToBase64String(cert.Export(X509ContentType.Pfx, Password));
48+
sslCertificate.Data = Convert.ToBase64String(File.ReadAllBytes(CertificateFile));
5049
sslCertificate.Password = this.Password;
5150
sslCertificate.Id =
5251
ApplicationGatewayChildResourceHelper.GetResourceNotSetId(

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

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -399,95 +399,98 @@
399399
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AdvisorTests\TestUpdateServerAdvisor.json">
400400
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
401401
</None>
402-
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseDisableEnableKeepProperties.json">
403-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
402+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingUpdatePolicyWithClassicStorage.json" >
403+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404+
</None>
405+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseDisableEnableKeepProperties.json">
406+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404407
</None>
405408
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseRetentionKeepProperties.json">
406-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
409+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
407410
</None>
408411
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseStorageKeyRotation.json">
409-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
412+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
410413
</None>
411414
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyKeepPreviousStorage.json">
412-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
415+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
413416
</None>
414417
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithEventTypes.json">
415-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
418+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
416419
</None>
417420
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts.json">
418-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
421+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
419422
</None>
420423
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithRetention.json">
421-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
424+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
422425
</None>
423426
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion.json">
424-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
427+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
425428
</None>
426429
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDatabaseUpdatePolicyWithStorage.json">
427-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
430+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
428431
</None>
429432
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDisableDatabaseAuditing.json">
430-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
433+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
431434
</None>
432435
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingDisableServerAuditing.json">
433-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
436+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
434437
</None>
435438
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedDatabaseUpdatePolicyWithNoStorage.json">
436-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
439+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
437440
</None>
438441
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedServerUpdatePolicyWithNoStorage.json">
439-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
442+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
440443
</None>
441444
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailedUseServerDefault.json">
442-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
445+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
443446
</None>
444447
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailWithBadDatabaseIndentity.json">
445-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
448+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
446449
</None>
447450
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingFailWithBadServerIndentity.json">
448-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
451+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
449452
</None>
450453
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerDisableEnableKeepProperties.json">
451-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
454+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
452455
</None>
453456
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerRetentionKeepProperties.json">
454-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
457+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
455458
</None>
456459
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerStorageKeyRotation.json">
457-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
460+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
458461
</None>
459462
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyKeepPreviousStorage.json">
460-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
463+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
461464
</None>
462465
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithEventTypes.json">
463-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
466+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
464467
</None>
465468
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithEventTypeShortcuts.json">
466-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
469+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
467470
</None>
468471
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithRetention.json">
469-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
472+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
470473
</None>
471474
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingServerUpdatePolicyWithStorage.json">
472-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
475+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
473476
</None>
474477
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestAuditingUseServerDefault.json">
475-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
478+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
476479
</None>
477480
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestBlobAuditingOnDatabase.json">
478-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
481+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
479482
</None>
480483
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestBlobAuditingOnServer.json">
481-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
484+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
482485
</None>
483486
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestDatatabaseAuditingTypeMigration.json">
484-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
487+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
485488
</None>
486489
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestGetServerAndDatabaseAuditingInUkRegion.json">
487-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
490+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
488491
</None>
489492
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestServerAuditingTypeMigration.json">
490-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
493+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
491494
</None>
492495
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseActivationTests\TestDatabasePauseResume.json">
493496
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -694,19 +697,22 @@
694697
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
695698
</None>
696699
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\DisablingThreatDetection.json">
697-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
700+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
698701
</None>
699702
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\InvalidArgumentsThreatDetection.json">
700-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
703+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
701704
</None>
702705
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionDatabaseUpdatePolicy.json">
703-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
706+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
704707
</None>
705708
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionGetDefualtPolicy.json">
706-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
709+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
707710
</None>
708711
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionServerUpdatePolicy.json">
709-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
712+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
713+
</None>
714+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ThreatDetectionTests\ThreatDetectionUpdatePolicyWithClassicStorage.json" >
715+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
710716
</None>
711717
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.TransparentDataEncryptionCrudTests\TestDatabaseTransparentDataEncryptionGet.json">
712718
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using Microsoft.Azure.Commands.ScenarioTest.Mocks;
1615
using Microsoft.Azure.Commands.ScenarioTest.SqlTests;
1716
using Microsoft.Azure.ServiceManagemenet.Common.Models;
1817
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -38,6 +37,13 @@ public AuditingTests(ITestOutputHelper output)
3837
{
3938
XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
4039
}
40+
41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
43+
public void TestAuditingUpdatePolicyWithClassicStorage()
44+
{
45+
RunPowerShellTest("Test-AuditingUpdatePolicyWithClassicStorage");
46+
}
4147

4248
[Fact]
4349
[Trait(Category.AcceptanceType, Category.CheckIn)]

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,59 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
<#
16+
.SYNOPSIS
17+
Tests setting and getting auditing policy with classic storage
18+
#>
19+
function Test-AuditingUpdatePolicyWithClassicStorage
20+
{
21+
# Setup
22+
$testSuffix = 1015636
23+
Create-AuditingClassicTestEnvironment $testSuffix
24+
$params = Get-SqlAuditingTestEnvironmentParameters $testSuffix
25+
26+
try
27+
{
28+
# Test - Table database Auditing
29+
Set-AzureRmSqlDatabaseAuditingPolicy -AuditType Table -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount
30+
$policy = Get-AzureRmSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
31+
32+
# Assert
33+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
34+
Assert-AreEqual $policy.AuditState "Enabled"
35+
36+
# Test - Table server Auditing
37+
Set-AzureRmSqlServerAuditingPolicy -AuditType Table -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount
38+
$policy = Get-AzureRmSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
39+
40+
# Assert
41+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
42+
Assert-AreEqual $policy.AuditState "Enabled"
43+
44+
45+
# Test - Blob database Auditing
46+
Set-AzureRmSqlDatabaseAuditingPolicy -AuditType Blob -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName -StorageAccountName $params.storageAccount
47+
$policy = Get-AzureRmSqlDatabaseAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName -DatabaseName $params.databaseName
48+
49+
# Assert
50+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
51+
Assert-AreEqual $policy.AuditState "Enabled"
52+
53+
# Test - Blob server Auditing
54+
Set-AzureRmSqlServerAuditingPolicy -AuditType Blob -ResourceGroupName $params.rgname -ServerName $params.serverName -StorageAccountName $params.storageAccount
55+
$policy = Get-AzureRmSqlServerAuditingPolicy -ResourceGroupName $params.rgname -ServerName $params.serverName
56+
57+
# Assert
58+
Assert-AreEqual $policy.StorageAccountName $params.storageAccount
59+
Assert-AreEqual $policy.AuditState "Enabled"
60+
}
61+
finally
62+
{
63+
# Cleanup
64+
Remove-AuditingTestEnvironment $testSuffix
65+
}
66+
}
67+
1568
<#
1669
.SYNOPSIS
1770
Tests that when setting the storage account property's value in a database's auditing policy, that value is later fetched properly

0 commit comments

Comments
 (0)