Skip to content

Commit 01aaef4

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#9590 from Azure/master
Update network branch with latest from master
2 parents 4c270cf + f25714c commit 01aaef4

File tree

123 files changed

+422710
-215427
lines changed

Some content is hidden

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

123 files changed

+422710
-215427
lines changed

‎src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="3.0.2" />
14+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.0.0" />
1515
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
1616
</ItemGroup>
1717

‎src/DataFactory/DataFactoryV2/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Updated ADF .Net SDK version to 4.0.0
2223

2324
## Version 1.1.2
2425
* Updating the output of get activity runs, get pipeline runs, and get trigger runs ADF cmdlets to support Select-Object pipe.

‎src/DataFactory/DataFactoryV2/DataFactoryV2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="3.0.2" />
15+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.0.0" />
1616
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
1717
</ItemGroup>
1818

‎src/GuestConfiguration/GuestConfiguration.Test/GuestConfiguration.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.GuestConfiguration" Version="1.1.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.GuestConfiguration" Version="1.1.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/GuestConfiguration/GuestConfiguration.Test/ScenarioTests/GetVmGuestPolicyStatusHistoryTests.ps1

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Get guest configuration policy status history by Vm name scope
1818
#>
1919
function Get-AzVMGuestPolicyStatusHistory-VmNameScope
2020
{
21-
$rgName = "vivga"
22-
$vmName = "Viv1809SDDC"
21+
$rgName = "aashishGoodPolicy"
22+
$vmName = "aashishvm1"
2323

2424
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName
2525
Assert-NotNull $historicalStatuses
@@ -32,8 +32,8 @@ Get guest configuration policy status history by Vm name scope
3232
#>
3333
function Get-AzVMGuestPolicyStatusHistory-VmNameScope_Custom
3434
{
35-
$rgName = "amits-test"
36-
$vmName = "amits-winser6"
35+
$rgName = "aashishCustomrole7ux"
36+
$vmName = "aashishCustomrole7ux"
3737

3838
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName
3939
Assert-NotNull $historicalStatuses
@@ -46,9 +46,9 @@ Get guest configuration policy status history by Initiative id scope
4646
#>
4747
function Get-AzVMGuestPolicyStatusHistory-InitiativeIdScope
4848
{
49-
$rgName = "vivga"
50-
$vmName = "Viv1809SDDC"
51-
$initiativeId = "/providers/Microsoft.Authorization/policySetDefinitions/25ef9b72-4af2-4501-acd1-fc814e73dde1"
49+
$rgName = "aashishGoodPolicy"
50+
$vmName = "aashishvm1"
51+
$initiativeId = "/providers/Microsoft.Authorization/policySetDefinitions/8bc55e6b-e9d5-4266-8dac-f688d151ec9c"
5252

5353
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -InitiativeId $initiativeId
5454
Assert-NotNull $historicalStatuses
@@ -61,9 +61,9 @@ Get guest configuration policy status history by Initiative id scope
6161
#>
6262
function Get-AzVMGuestPolicyStatusHistory-InitiativeIdScope_Custom
6363
{
64-
$rgName = "amits-test"
65-
$vmName = "amits-winser6"
66-
$initiativeId = "/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/providers/Microsoft.Authorization/policySetDefinitions/8174929b-2752-46af-9167-89d2d6780439"
64+
$rgName = "aashishCustomrole7ux"
65+
$vmName = "aashishCustomrole7ux"
66+
$initiativeId = "/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/providers/Microsoft.Authorization/policySetDefinitions/60062d3c-3282-4a3d-9bc4-3557dded22ca"
6767

6868
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -InitiativeId $initiativeId
6969
Assert-NotNull $historicalStatuses
@@ -76,9 +76,9 @@ Get guest configuration policy status history by Initiative name scope
7676
#>
7777
function Get-AzVMGuestPolicyStatusHistory-InitiativeNameScope
7878
{
79-
$rgName = "vivga"
80-
$vmName = "Viv1809SDDC"
81-
$initiativeName = "25ef9b72-4af2-4501-acd1-fc814e73dde1"
79+
$rgName = "aashishGoodPolicy"
80+
$vmName = "aashishvm1"
81+
$initiativeName = "8bc55e6b-e9d5-4266-8dac-f688d151ec9c"
8282

8383
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -InitiativeName $initiativeName
8484
Assert-NotNull $historicalStatuses
@@ -91,9 +91,9 @@ Get guest configuration policy status history by Initiative name scope
9191
#>
9292
function Get-AzVMGuestPolicyStatusHistory-InitiativeNameScope_Custom
9393
{
94-
$rgName = "amits-test"
95-
$vmName = "amits-winser6"
96-
$initiativeName = "8174929b-2752-46af-9167-89d2d6780439"
94+
$rgName = "aashishCustomrole7ux"
95+
$vmName = "aashishCustomrole7ux"
96+
$initiativeName = "60062d3c-3282-4a3d-9bc4-3557dded22ca"
9797

9898
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -InitiativeName $initiativeName
9999
Assert-NotNull $historicalStatuses
@@ -106,8 +106,8 @@ Get guest configuration policy by vmName scope, using ShowOnlyChange switch
106106
#>
107107
function Get-AzVMGuestPolicyStatusHistory-ShowOnlyChangeSwitch-VmNameScope
108108
{
109-
$rgName = "vivga"
110-
$vmName = "Viv1809SDDC"
109+
$rgName = "aashishGoodPolicy"
110+
$vmName = "aashishvm1"
111111

112112
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -ShowOnlyChange
113113
Assert-NotNull $historicalStatuses
@@ -120,8 +120,8 @@ Get guest configuration policy by vmName scope, using ShowOnlyChange switch
120120
#>
121121
function Get-AzVMGuestPolicyStatusHistory-ShowOnlyChangeSwitch-VmNameScope_Custom
122122
{
123-
$rgName = "amits-test"
124-
$vmName = "amits-winser6"
123+
$rgName = "aashishCustomrole7ux"
124+
$vmName = "aashishCustomrole7ux"
125125

126126
$historicalStatuses = Get-AzVMGuestPolicyStatusHistory -ResourceGroupName $rgName -VMName $vmName -ShowOnlyChange
127127
Assert-NotNull $historicalStatuses

‎src/GuestConfiguration/GuestConfiguration.Test/ScenarioTests/GetVmGuestPolicyStatusTests.ps1

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Get guest configuration policy report by Vm name scope for custom policy
3232
#>
3333
function Get-AzVMGuestPolicyStatus-VmNameScope_Custom
3434
{
35-
$rgName = "amits-test"
36-
$vmName = "amits-winser6"
35+
$rgName = "aashishCustomrole7ux"
36+
$vmName = "aashishCustomrole7ux"
3737

3838
$reports = Get-AzVMGuestPolicyStatus -ResourceGroupName $rgName -VMName $vmName
3939
Assert-NotNull $reports
@@ -61,9 +61,9 @@ Get guest configuration custom policy report by Initiative id scope
6161
#>
6262
function Get-AzVMGuestPolicyStatus-InitiativeIdScope_Custom
6363
{
64-
$rgName = "amits-test"
65-
$vmName = "amits-winser6"
66-
$initiativeId = "/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/providers/Microsoft.Authorization/policySetDefinitions/8174929b-2752-46af-9167-89d2d6780439"
64+
$rgName = "aashishCustomrole7ux"
65+
$vmName = "aashishCustomrole7ux"
66+
$initiativeId = "/subscriptions/b5e4748c-f69a-467c-8749-e2f9c8cd3db0/providers/Microsoft.Authorization/policySetDefinitions/60062d3c-3282-4a3d-9bc4-3557dded22ca"
6767

6868
$reports = Get-AzVMGuestPolicyStatus -ResourceGroupName $rgName -VMName $vmName -InitiativeId $initiativeId
6969
Assert-NotNull $reports
@@ -91,9 +91,9 @@ Get guest configuration custom policy report by Initiative name scope
9191
#>
9292
function Get-AzVMGuestPolicyStatus-InitiativeNameScope_Custom
9393
{
94-
$rgName = "amits-test"
95-
$vmName = "amits-winser6"
96-
$initiativeName = "8174929b-2752-46af-9167-89d2d6780439"
94+
$rgName = "aashishCustomrole7ux"
95+
$vmName = "aashishCustomrole7ux"
96+
$initiativeName = "60062d3c-3282-4a3d-9bc4-3557dded22ca"
9797

9898
$reports = Get-AzVMGuestPolicyStatus -ResourceGroupName $rgName -VMName $vmName -InitiativeName $initiativeName
9999
Assert-NotNull $reports
@@ -125,9 +125,9 @@ Get guest configuration custom policy by ReportId scope
125125
#>
126126
function Get-AzVMGuestPolicyStatus-ReportIdScope_Custom
127127
{
128-
$rgName = "amits-test"
129-
$vmName = "amits-winser6"
130-
$initiativeName = "8174929b-2752-46af-9167-89d2d6780439"
128+
$rgName = "aashishCustomrole7ux"
129+
$vmName = "aashishCustomrole7ux"
130+
$initiativeName = "60062d3c-3282-4a3d-9bc4-3557dded22ca"
131131
$reports = Get-AzVMGuestPolicyStatus -ResourceGroupName $rgName -VMName $vmName -InitiativeName $initiativeName
132132
Assert-NotNull $reports
133133
Assert-True { $reports.Count -gt 0 }

‎src/GuestConfiguration/GuestConfiguration.Test/ScenarioTests/TestController.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ namespace Microsoft.Azure.Commands.GuestConfiguration.Test.ScenarioTests
2525

2626
using Microsoft.Azure.Commands.Common.Authentication;
2727
using Microsoft.Azure.Management.GuestConfiguration;
28+
using Microsoft.Azure.Management.PolicyInsights_2018_04;
29+
using Microsoft.Azure.Management.PolicyInsights_2018_04.Models;
2830
using Microsoft.Azure.Test.HttpRecorder;
2931
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
3032
using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -38,6 +40,8 @@ public class TestController : RMTestBase
3840

3941
public PolicyClient PolicyClient { get; private set; }
4042

43+
public PolicyInsightsClient PolicyInsightsClient { get; private set; }
44+
4145
public static TestController NewInstance => new TestController();
4246

4347
protected TestController()
@@ -83,7 +87,8 @@ protected void SetupManagementClients(MockContext context)
8387
{
8488
GuestConfigurationClient = GetGuestConfigurationClient(context);
8589
PolicyClient = GetPolicyClient(context);
86-
_helper.SetupManagementClients(GuestConfigurationClient, PolicyClient);
90+
PolicyInsightsClient = GetPolicyInsightsClient(context);
91+
_helper.SetupManagementClients(GuestConfigurationClient, PolicyClient, PolicyInsightsClient);
8792
}
8893

8994
private static GuestConfigurationClient GetGuestConfigurationClient(MockContext context)
@@ -95,5 +100,10 @@ private static PolicyClient GetPolicyClient(MockContext context)
95100
{
96101
return context.GetServiceClient<PolicyClient>(TestEnvironmentFactory.GetTestEnvironment());
97102
}
103+
104+
private static PolicyInsightsClient GetPolicyInsightsClient(MockContext context)
105+
{
106+
return context.GetServiceClient<PolicyInsightsClient>(TestEnvironmentFactory.GetTestEnvironment());
107+
}
98108
}
99109
}

0 commit comments

Comments
 (0)