Skip to content

Commit 99ccff0

Browse files
bganapabganapa
committed
Merge remote-tracking branch 'upstream/dev' into updev
2 parents fd64498 + 8465014 commit 99ccff0

File tree

41 files changed

+21600
-7504
lines changed

Some content is hidden

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

41 files changed

+21600
-7504
lines changed

‎src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.dll-Help.xml

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36870,13 +36870,14 @@ PS C:> Remove-AzureRmLoadBalancerRuleConfig -Name "MyLBruleName" -
3687036870
</maml:alertSet>
3687136871
<command:examples>
3687236872
<command:example>
36873-
<maml:title>-------------------------- 1: --------------------------</maml:title>
36873+
<maml:title>-------------------------- Example 1 Deleting a network security group --------------------------</maml:title>
3687436874
<maml:introduction>
3687536875
<maml:paragraph>PS C:\&gt;</maml:paragraph>
3687636876
</maml:introduction>
36877-
<dev:code></dev:code>
36877+
<dev:code>PS C:\&gt; Remove-AzureRmNetworkSecurityGroup -Name &quot;NSG-FrontEnd&quot; -ResourceGroupName &quot;TestRG&quot;</dev:code>
3687836878
<dev:remarks>
36879-
<maml:para />
36879+
<maml:para>This command removes the network security group called &quot;NSG-Frontend&quot; within the resource group &quot;TestRG.&quot;</maml:para>
36880+
<maml:para>Note that a network security group must exist before it can be deleted.</maml:para>
3688036881
<maml:para />
3688136882
<maml:para />
3688236883
<maml:para></maml:para>
@@ -37053,13 +37054,20 @@ PS C:&gt; Remove-AzureRmLoadBalancerRuleConfig -Name &quot;MyLBruleName&quot; -
3705337054
</maml:alertSet>
3705437055
<command:examples>
3705537056
<command:example>
37056-
<maml:title>-------------------------- 1: --------------------------</maml:title>
37057+
<maml:title>-------------------------- Example 1: Deleting a network security rule configuration --------------------------</maml:title>
3705737058
<maml:introduction>
3705837059
<maml:paragraph>PS C:\&gt;</maml:paragraph>
3705937060
</maml:introduction>
37060-
<dev:code></dev:code>
37061+
<dev:code>PS C:\&gt; New-AzureRmNetworkSecurityRuleConfig -Name rdp-rule -Description &quot;Allow RDP&quot; -Access Allow -Protocol Tcp -Direction Inbound -Priority 100 -SourceAddressPrefix Internet -SourcePortRange * -DestinationAddressPrefix * -DestinationPortRange 3389
37062+
37063+
PS C:\&gt; $nsg = New-AzureRmNetworkSecurityGroup -ResourceGroupName TestRG -Location westus -Name &quot;NSG-FrontEnd&quot; -SecurityRules $rule1
37064+
37065+
PS C:\&gt; Remove-AzureRmNetworkSecurityRuleConfig -Name rdp-rule -NetworkSecurityGroup $nsg
37066+
37067+
</dev:code>
3706137068
<dev:remarks>
37062-
<maml:para />
37069+
<maml:para>The first command creates a network security rule called rdp-rule. The second command assigns this rule to a newly created network security group called &quot;NSG-FrontEnd&quot;. Finally, the third command removes this network security rule associated with the network security group stored in the variable $nsg.</maml:para>
37070+
<maml:para>Note that a rule must be associated with a network security group in order to successfully delete it.</maml:para>
3706337071
<maml:para />
3706437072
<maml:para />
3706537073
<maml:para></maml:para>
@@ -48029,13 +48037,17 @@ Set-AzureRmNetworkInterface -NetworkInterface $nic</dev:code>
4802948037
</maml:alertSet>
4803048038
<command:examples>
4803148039
<command:example>
48032-
<maml:title>-------------------------- 1: --------------------------</maml:title>
48040+
<maml:title>-------------------------- Example 1: Changing the Access configuration in a network security rule --------------------------</maml:title>
4803348041
<maml:introduction>
4803448042
<maml:paragraph>PS C:\&gt;</maml:paragraph>
4803548043
</maml:introduction>
48036-
<dev:code></dev:code>
48044+
<dev:code>PS C:\&gt; $nsg = Get-AzureRmNetworkSecurityGroup -Name NSG-FrontEnd -ResourceGroupName TestRG
48045+
48046+
PS C:\&gt; $nsg | Get-AzureRmNetworkSecurityRuleConfig -Name &quot;rdp-rule&quot;
48047+
48048+
PS C:\&gt; Set-AzureRmNetworkSecurityRuleConfig -Name rdp-rule -NetworkSecurityGroup $nsg -Access Deny</dev:code>
4803748049
<dev:remarks>
48038-
<maml:para />
48050+
<maml:para>The first command gets the network security group &quot;NSG-FrontEnd&quot; associated with the rule configuration you want to update and stores it in the variable $nsg. The second command gets the security rule configuration &quot;rdp-rule. The third command changes the Access configuration that was previously Allow to Deny.</maml:para>
4803948051
<maml:para />
4804048052
<maml:para />
4804148053
<maml:para></maml:para>
@@ -48553,7 +48565,12 @@ DnsSettings : {
4855348565
<maml:paragraph>PS C:\&gt;</maml:paragraph>
4855448566
</maml:introduction>
4855548567
<dev:code>PS C:\&gt;Get-AzureRmRouteTable -ResourceGroupName &quot;ResourceGroup11&quot; -Name &quot;routetable01&quot; | Set-AzureRmRouteConfig -Name &quot;route02&quot; -AddressPrefix 10.4.0.0/16 -NextHopType VnetLocal | Set-AzureRmRouteTable
48556-
Name : routetable01
48568+
</dev:code>
48569+
<dev:remarks>
48570+
<maml:para>This command gets the route table named routetable01 by using the Get-AzureRmRouteTable cmdlet. The command passes that table to the current cmdlet by using the pipeline operator.</maml:para>
48571+
<maml:para />
48572+
<maml:para />
48573+
<maml:para>Name : routetable01
4855748574
ResourceGroupName : ResourceGroup11
4855848575
Location : eastus
4855948576
Id : /subscriptions/xxxx-xxxx-xxxx-xxxx/resourceGroups/ResourceGroup11/providers/Microsoft.Networ
@@ -48583,12 +48600,7 @@ Routes : [
4858348600
&quot;ProvisioningState&quot;: &quot;Succeeded&quot;
4858448601
}
4858548602
]
48586-
Subnets : []</dev:code>
48587-
<dev:remarks>
48588-
<maml:para>This command gets the route table named routetable01 by using the Get-AzureRmRouteTable cmdlet. The command passes that table to the current cmdlet by using the pipeline operator.</maml:para>
48589-
<maml:para />
48590-
<maml:para />
48591-
<maml:para></maml:para>
48603+
Subnets : []</maml:para>
4859248604
</dev:remarks>
4859348605
<command:commandLines>
4859448606
<command:commandLine>
@@ -48760,7 +48772,12 @@ Subnets : []</dev:code>
4876048772
<maml:paragraph>PS C:\&gt;</maml:paragraph>
4876148773
</maml:introduction>
4876248774
<dev:code>PS C:\&gt;Get-AzureRmRouteTable -ResourceGroupName &quot;ResourceGroup11&quot; -Name &quot;routetable01&quot; | Add-AzureRmRouteConfig -Name &quot;route02&quot; -AddressPrefix 10.2.0.0/16 -NextHopType VnetLocal | Set-AzureRmRouteTable
48763-
Name : routetable01
48775+
</dev:code>
48776+
<dev:remarks>
48777+
<maml:para>This command gets the route table named routetable01 by using Get-AzureRmRouteTable cmdlet. The command passes that table to the Add-AzureRmRouteConfig cmdlet by using the pipeline operator.</maml:para>
48778+
<maml:para />
48779+
<maml:para />
48780+
<maml:para>Name : routetable01
4876448781
ResourceGroupName : ResourceGroup11
4876548782
Location : eastus
4876648783
Id : /subscriptions/xxxx-xxxx-xxxx-xxxx/resourceGroups/ResourceGroup11/providers/Microsoft.Networ
@@ -48799,12 +48816,7 @@ Routes : [
4879948816
&quot;ProvisioningState&quot;: null
4880048817
}
4880148818
]
48802-
Subnets : []</dev:code>
48803-
<dev:remarks>
48804-
<maml:para>This command gets the route table named routetable01 by using Get-AzureRmRouteTable cmdlet. The command passes that table to the Add-AzureRmRouteConfig cmdlet by using the pipeline operator.</maml:para>
48805-
<maml:para />
48806-
<maml:para />
48807-
<maml:para></maml:para>
48819+
Subnets : []</maml:para>
4880848820
</dev:remarks>
4880948821
<command:commandLines>
4881048822
<command:commandLine>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,12 @@
479479
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestBlobAuditingOnServer.json">
480480
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
481481
</None>
482+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestDatatabaseAuditingTypeMigration.json">
483+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
484+
</None>
485+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.AuditingTests\TestServerAuditingTypeMigration.json">
486+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
487+
</None>
482488
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseActivationTests\TestDatabasePauseResume.json">
483489
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
484490
</None>

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

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,196 +40,210 @@ public AuditingTests(ITestOutputHelper output)
4040
}
4141

4242
[Fact]
43-
[Trait(Category.AcceptanceType, Category.Sql)]
43+
[Trait(Category.AcceptanceType, Category.CheckIn)]
4444
public void TestAuditingDatabaseUpdatePolicyWithStorage()
4545
{
4646
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorage");
4747
}
4848

4949
[Fact]
50-
[Trait(Category.AcceptanceType, Category.Sql)]
50+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5151
public void TestAuditingDatabaseUpdatePolicyWithStorageV2()
5252
{
5353
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithStorageV2");
5454
}
5555

5656
[Fact]
57-
[Trait(Category.AcceptanceType, Category.Sql)]
57+
[Trait(Category.AcceptanceType, Category.CheckIn)]
5858
public void TestAuditingServerUpdatePolicyWithStorage()
5959
{
6060
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithStorage");
6161
}
6262

6363
[Fact]
64-
[Trait(Category.AcceptanceType, Category.Sql)]
64+
[Trait(Category.AcceptanceType, Category.CheckIn)]
6565
public void TestAuditingDatabaseUpdatePolicyWithEventTypes()
6666
{
6767
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithEventTypes");
6868
}
6969

7070
[Fact]
71-
[Trait(Category.AcceptanceType, Category.Sql)]
71+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7272
public void TestAuditingServerUpdatePolicyWithEventTypes()
7373
{
7474
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithEventTypes");
7575
}
7676

7777
[Fact]
78-
[Trait(Category.AcceptanceType, Category.Sql)]
78+
[Trait(Category.AcceptanceType, Category.CheckIn)]
7979
public void TestAuditingDisableDatabaseAuditing()
8080
{
8181
RunPowerShellTest("Test-AuditingDisableDatabaseAuditing");
8282
}
8383

8484
[Fact]
85-
[Trait(Category.AcceptanceType, Category.Sql)]
85+
[Trait(Category.AcceptanceType, Category.CheckIn)]
8686
public void TestAuditingDisableServerAuditing()
8787
{
8888
RunPowerShellTest("Test-AuditingDisableServerAuditing");
8989
}
9090

9191
[Fact]
92-
[Trait(Category.AcceptanceType, Category.Sql)]
92+
[Trait(Category.AcceptanceType, Category.CheckIn)]
9393
public void TestAuditingDatabaseDisableEnableKeepProperties()
9494
{
9595
RunPowerShellTest("Test-AuditingDatabaseDisableEnableKeepProperties");
9696
}
9797

9898
[Fact]
99-
[Trait(Category.AcceptanceType, Category.Sql)]
99+
[Trait(Category.AcceptanceType, Category.CheckIn)]
100100
public void TestAuditingServerDisableEnableKeepProperties()
101101
{
102102
RunPowerShellTest("Test-AuditingServerDisableEnableKeepProperties");
103103
}
104104

105105
[Fact]
106-
[Trait(Category.AcceptanceType, Category.Sql)]
106+
[Trait(Category.AcceptanceType, Category.CheckIn)]
107107
public void TestAuditingUseServerDefault()
108108
{
109109
RunPowerShellTest("Test-AuditingUseServerDefault");
110110
}
111111

112112
[Fact]
113-
[Trait(Category.AcceptanceType, Category.Sql)]
113+
[Trait(Category.AcceptanceType, Category.CheckIn)]
114114
public void TestAuditingFailedDatabaseUpdatePolicyWithNoStorage()
115115
{
116116
RunPowerShellTest("Test-AuditingFailedDatabaseUpdatePolicyWithNoStorage");
117117
}
118118

119119
[Fact]
120-
[Trait(Category.AcceptanceType, Category.Sql)]
120+
[Trait(Category.AcceptanceType, Category.CheckIn)]
121121
public void TestAuditingFailedServerUpdatePolicyWithNoStorage()
122122
{
123123
RunPowerShellTest("Test-AuditingFailedServerUpdatePolicyWithNoStorage");
124124
}
125125

126126
[Fact]
127-
[Trait(Category.AcceptanceType, Category.Sql)]
127+
[Trait(Category.AcceptanceType, Category.CheckIn)]
128128
public void TestAuditingFailedUseServerDefault()
129129
{
130130
RunPowerShellTest("Test-AuditingFailedUseServerDefault");
131131
}
132132

133133
[Fact]
134-
[Trait(Category.AcceptanceType, Category.Sql)]
134+
[Trait(Category.AcceptanceType, Category.CheckIn)]
135135
public void TestAuditingDatabaseUpdatePolicyWithEventTypeShortcuts()
136136
{
137137
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithEventTypeShortcuts");
138138
}
139139

140140
[Fact]
141-
[Trait(Category.AcceptanceType, Category.Sql)]
141+
[Trait(Category.AcceptanceType, Category.CheckIn)]
142142
public void TestAuditingServerUpdatePolicyWithEventTypeShortcuts()
143143
{
144144
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithEventTypeShortcuts");
145145
}
146146

147147
[Fact]
148-
[Trait(Category.AcceptanceType, Category.Sql)]
148+
[Trait(Category.AcceptanceType, Category.CheckIn)]
149149
public void TestAuditingDatabaseUpdatePolicyKeepPreviousStorage()
150150
{
151151
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyKeepPreviousStorage");
152152
}
153153

154154
[Fact]
155-
[Trait(Category.AcceptanceType, Category.Sql)]
155+
[Trait(Category.AcceptanceType, Category.CheckIn)]
156156
public void TestAuditingServerUpdatePolicyKeepPreviousStorage()
157157
{
158158
RunPowerShellTest("Test-AuditingServerUpdatePolicyKeepPreviousStorage");
159159
}
160160

161161
[Fact]
162-
[Trait(Category.AcceptanceType, Category.Sql)]
162+
[Trait(Category.AcceptanceType, Category.CheckIn)]
163163
public void TestAuditingFailWithBadDatabaseIndentity()
164164
{
165165
RunPowerShellTest("Test-AuditingFailWithBadDatabaseIndentity");
166166
}
167167

168168
[Fact]
169-
[Trait(Category.AcceptanceType, Category.Sql)]
169+
[Trait(Category.AcceptanceType, Category.CheckIn)]
170170
public void TestAuditingFailWithBadServerIndentity()
171171
{
172172
RunPowerShellTest("Test-AuditingFailWithBadServerIndentity");
173173
}
174174

175175
[Fact]
176-
[Trait(Category.AcceptanceType, Category.Sql)]
176+
[Trait(Category.AcceptanceType, Category.CheckIn)]
177177
public void TestAuditingDatabaseStorageKeyRotation()
178178
{
179179
RunPowerShellTest("Test-AuditingDatabaseStorageKeyRotation");
180180
}
181181

182182
[Fact]
183-
[Trait(Category.AcceptanceType, Category.Sql)]
183+
[Trait(Category.AcceptanceType, Category.CheckIn)]
184184
public void TestAuditingServerStorageKeyRotation()
185185
{
186186
RunPowerShellTest("Test-AuditingServerStorageKeyRotation");
187187
}
188188

189189
[Fact]
190-
[Trait(Category.AcceptanceType, Category.Sql)]
190+
[Trait(Category.AcceptanceType, Category.CheckIn)]
191191
public void TestAuditingServerUpdatePolicyWithRetention()
192192
{
193193
RunPowerShellTest("Test-AuditingServerUpdatePolicyWithRetention");
194194
}
195195

196196
[Fact]
197-
[Trait(Category.AcceptanceType, Category.Sql)]
197+
[Trait(Category.AcceptanceType, Category.CheckIn)]
198198
public void TestAuditingDatabaseUpdatePolicyWithRetention()
199199
{
200200
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithRetention");
201201
}
202202

203203
[Fact]
204-
[Trait(Category.AcceptanceType, Category.Sql)]
204+
[Trait(Category.AcceptanceType, Category.CheckIn)]
205205
public void TestAuditingServerRetentionKeepProperties()
206206
{
207207
RunPowerShellTest("Test-AuditingServerRetentionKeepProperties");
208208
}
209209

210210
[Fact]
211-
[Trait(Category.AcceptanceType, Category.Sql)]
211+
[Trait(Category.AcceptanceType, Category.CheckIn)]
212212
public void TestAuditingDatabaseRetentionKeepProperties()
213213
{
214214
RunPowerShellTest("Test-AuditingDatabaseRetentionKeepProperties");
215215
}
216216

217217
[Fact]
218-
[Trait(Category.AcceptanceType, Category.Sql)]
218+
[Trait(Category.AcceptanceType, Category.CheckIn)]
219219
public void TestBlobAuditingOnDatabase()
220220
{
221221
RunPowerShellTest("Test-BlobAuditingOnDatabase");
222222
}
223223

224224
[Fact]
225-
[Trait(Category.AcceptanceType, Category.Sql)]
225+
[Trait(Category.AcceptanceType, Category.CheckIn)]
226226
public void TestBlobAuditingOnServer()
227227
{
228228
RunPowerShellTest("Test-BlobAuditingOnServer");
229229
}
230230

231+
[Fact]
232+
[Trait(Category.AcceptanceType, Category.CheckIn)]
233+
public void TestDatatabaseAuditingTypeMigration()
234+
{
235+
RunPowerShellTest("Test-DatatabaseAuditingTypeMigration");
236+
}
237+
238+
[Fact]
239+
[Trait(Category.AcceptanceType, Category.CheckIn)]
240+
public void TestServerAuditingTypeMigration()
241+
{
242+
RunPowerShellTest("Test-ServerAuditingTypeMigration");
243+
}
244+
231245
[Fact (Skip = "Waiting backend validation")]
232-
[Trait(Category.AcceptanceType, Category.Sql)]
246+
[Trait(Category.AcceptanceType, Category.CheckIn)]
233247
public void TestAuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion()
234248
{
235249
RunPowerShellTest("Test-AuditingDatabaseUpdatePolicyWithSameNameStorageOnDifferentRegion");

0 commit comments

Comments
 (0)