Skip to content

Commit e9f1fce

Browse files
markcowlmarkcowl
authored
Merge branch 'release-2019-09-24' into enrich
2 parents b1170df + 27ebd97 commit e9f1fce

File tree

325 files changed

+300433
-272629
lines changed

Some content is hidden

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

325 files changed

+300433
-272629
lines changed

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.CognitiveServices" Version="6.0.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="29.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎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="4.1.2" />
14+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.3" />
1515
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
1616
</ItemGroup>
1717

‎src/DataFactory/DataFactoryV2/Changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020

2121
## Upcoming Release
2222
* Adding 3 new commands for ADF V2 - Add-AzDataFactoryV2TriggerSubscription, Remove-AzDataFactoryV2TriggerSubscription, and Get-AzDataFactoryV2TriggerSubscriptionStatus
23+
* Updated ADF .Net SDK version to 4.1.3
24+
2325

2426
## Version 1.2.0
2527
* Fix typo to capitalize "Windows" in 'New-AzDataFactoryEncryptValue" documentation
2628
* Fixed miscellaneous typos across module
27-
* Updated ADF .Net SDK version to 4.1.2
29+
* Updated ADF .Net SDK version to 4.1.2
2830
* Add parameter "DataProxyIntegrationRuntimeName", "DataProxyStagingLinkedServiceName" and "DataProxyStagingPath" for "Set-AzureRmDataFactoryV2IntegrationRuntime" cmd to enable set up Self-Hosted Integration Runtime as a proxy for SSIS Integration Runtime
2931
* Updated PSTriggerRun to show the triggered pipelines, message and properties, and PSActivityRun to show the activity type
3032

‎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="4.1.2" />
15+
<PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.1.3" />
1616
<PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="3.11.6898.1" />
1717
</ItemGroup>
1818

‎src/DataLakeStore/DataLakeStore.Test/DataLakeStore.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Dns/Dns.Test/Dns.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Dns" Version="3.0.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.14.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.15.0-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrud.json

Lines changed: 392 additions & 368 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkIds.json

Lines changed: 600 additions & 348 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkObjects.json

Lines changed: 464 additions & 383 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudRegistrationVirtualNetwork.json

Lines changed: 304 additions & 463 deletions
Large diffs are not rendered by default.

‎src/Dns/Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudResolutionVirtualNetwork.json

Lines changed: 340 additions & 328 deletions
Large diffs are not rendered by default.

‎src/HDInsight/HDInsight/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Call out breaking changes
2122

2223
## Version 2.0.1
2324
* Fixed miscellaneous typos across module

‎src/HDInsight/HDInsight/ManagementCommands/DisableAzureHDInsightOMSCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
using Microsoft.Azure.Commands.HDInsight.Commands;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Management.HDInsight.Models;
18+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1819
using System.Management.Automation;
1920

2021
namespace Microsoft.Azure.Commands.HDInsight
2122
{
23+
[CmdletDeprecation(ReplacementCmdletName = "Disable-AzHDInsightMonitoring")]
2224
[Cmdlet("Disable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOperationsManagementSuite",SupportsShouldProcess = true)]
2325
[Alias("Disable-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOMS")]
2426
[OutputType(typeof(OperationResource))]

‎src/HDInsight/HDInsight/ManagementCommands/EnableAzureHDInsightOMSCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
using System.Reflection;
2121
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
2222
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
23+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
2324

2425
namespace Microsoft.Azure.Commands.HDInsight
2526
{
27+
[CmdletDeprecation(ReplacementCmdletName = "Enable-AzHDInsightMonitoring")]
2628
[Cmdlet("Enable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOperationsManagementSuite",SupportsShouldProcess = true)]
2729
[Alias("Enable-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOMS")]
2830
[OutputType(typeof(OperationResource))]

‎src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightOMSCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
using Microsoft.Azure.Commands.HDInsight.Commands;
1616
using Microsoft.Azure.Commands.HDInsight.Models.Management;
1717
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
18+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1819
using System.Management.Automation;
1920

2021
namespace Microsoft.Azure.Commands.HDInsight
2122
{
23+
[CmdletDeprecation(ReplacementCmdletName = "Get-AzHDInsightMonitoring")]
2224
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOperationsManagementSuite")]
2325
[Alias("Get-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightOMS")]
2426
[OutputType(typeof(AzureHDInsightOMS))]

‎src/HDInsight/HDInsight/ManagementCommands/GrantAzureHDInsightRdpServicesAccessCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Management.HDInsight.Models;
1818
using Microsoft.WindowsAzure.Commands.Common;
19+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1920
using System;
2021
using System.Management.Automation;
2122

2223
namespace Microsoft.Azure.Commands.HDInsight
2324
{
25+
[CmdletDeprecation("Clusters using Windows Os Type will not be supported in the future, this cmdlet will be deprecated in an upcoming breaking change release with no replacement. Please create a cluster using Linux Os Type instead.")]
2426
[Cmdlet("Grant", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightRdpServicesAccess"),OutputType(typeof(void))]
2527
public class GrantAzureHDInsightRdpServicesAccessCommand : HDInsightCmdletBase
2628
{

‎src/HDInsight/HDInsight/ManagementCommands/RemoveAzureHDInsightClusterCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
using Microsoft.Azure.Commands.HDInsight.Commands;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Management.HDInsight.Models;
18+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1819
using System.Management.Automation;
1920

2021
namespace Microsoft.Azure.Commands.HDInsight
2122
{
23+
[CmdletOutputBreakingChange(typeof(ClusterGetResponse))]
2224
[Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightCluster"),OutputType(typeof(ClusterGetResponse))]
2325
public class RemoveAzureHDInsightCommand : HDInsightCmdletBase
2426
{

‎src/HDInsight/HDInsight/ManagementCommands/RevokeAzureHDInsightRdpServicesAccessCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
using Microsoft.Azure.Commands.HDInsight.Commands;
1616
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1717
using Microsoft.Azure.Management.HDInsight.Models;
18+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1819
using System.Management.Automation;
1920

2021
namespace Microsoft.Azure.Commands.HDInsight
2122
{
23+
[CmdletDeprecation("Clusters using Windows Os Type will not be supported in the future, this cmdlet will be deprecated in an upcoming breaking change release with no replacement. Please create a cluster using Linux Os Type instead.")]
2224
[Cmdlet("Revoke", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightRdpServicesAccess"),OutputType(typeof(void))]
2325
public class RevokeAzureHDInsightRdpServicesAccessCommand : HDInsightCmdletBase
2426
{

‎src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightGatewayCredentialCommand.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
using Microsoft.Azure.Management.HDInsight.Models;
2020
using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
2121
using Microsoft.WindowsAzure.Commands.Common;
22+
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
2223
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2324
using System;
2425
using System.Management.Automation;
2526

2627
namespace Microsoft.Azure.Commands.HDInsight
2728
{
29+
[CmdletOutputBreakingChange(typeof(HttpConnectivitySettings), ReplacementCmdletOutputTypeName = "AzureHDInsightGatewaySettings")]
2830
[Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightGatewayCredential", DefaultParameterSetName = SetByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(HttpConnectivitySettings))]
2931
public class SetAzureHDInsightGatewayCredentialCommand : HDInsightCmdletBase
3032
{

‎src/HealthcareApis/HealthcareApis/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added Exception Handling around KeyNotFoundException
2122

2223
## Version 0.1.1
2324
* Added Error Handling in all cmdlets

‎src/HealthcareApis/HealthcareApis/HealthcareApis/GetAzureRmHealthcareApisService.cs

Lines changed: 61 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414

1515
using Microsoft.Azure.Commands.HealthcareApis.Common;
1616
using Microsoft.Azure.Commands.HealthcareApis.Models;
17+
using Microsoft.Azure.Commands.HealthcareApis.Properties;
1718
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
1819
using Microsoft.Azure.Management.HealthcareApis;
1920
using Microsoft.Azure.Management.HealthcareApis.Models;
2021
using Microsoft.Rest.Azure;
22+
using System;
23+
using System.Collections.Generic;
2124
using System.Management.Automation;
2225

2326
namespace Microsoft.Azure.Commands.HealthcareApis.Commands
@@ -64,76 +67,86 @@ public class GetAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
6467

6568
public override void ExecuteCmdlet()
6669
{
67-
base.ExecuteCmdlet();
68-
69-
RunCmdLet(() =>
70+
try
7071
{
71-
switch (ParameterSetName)
72-
{
73-
case ServiceNameParameterSet:
74-
{
75-
try
76-
{
77-
var healthcareApisAccount = this.HealthcareApisClient.Services.Get(this.ResourceGroupName, this.Name);
78-
WriteHealthcareApisAccount(healthcareApisAccount);
79-
}
80-
catch (ErrorDetailsException wex)
81-
{
82-
WriteError(WriteErrorforBadrequest(wex));
83-
}
72+
base.ExecuteCmdlet();
8473

85-
break;
86-
}
87-
case ResourceIdParameterSet:
88-
{
89-
string resourceGroupName;
90-
string resourceName;
91-
92-
if (ValidateAndExtractName(this.ResourceId, out resourceGroupName, out resourceName))
74+
RunCmdLet(() =>
75+
{
76+
switch (ParameterSetName)
77+
{
78+
case ServiceNameParameterSet:
9379
{
9480
try
95-
{
96-
var healthcareApisAccount = this.HealthcareApisClient.Services.Get(resourceGroupName, resourceName);
81+
{
82+
var healthcareApisAccount = this.HealthcareApisClient.Services.Get(this.ResourceGroupName, this.Name);
9783
WriteHealthcareApisAccount(healthcareApisAccount);
9884
}
9985
catch (ErrorDetailsException wex)
10086
{
10187
WriteError(WriteErrorforBadrequest(wex));
10288
}
89+
break;
10390
}
104-
break;
105-
}
106-
case ListParameterSet:
107-
{
108-
if (string.IsNullOrEmpty(this.ResourceGroupName))
91+
case ResourceIdParameterSet:
10992
{
110-
try
111-
{
112-
IPage<ServicesDescription> healthcareApisServicesBySubscription = this.HealthcareApisClient.Services.List();
113-
this.WriteObject(ToPSFhirServices(healthcareApisServicesBySubscription), enumerateCollection: true);
114-
}
115-
catch (ErrorDetailsException wex)
93+
string resourceGroupName;
94+
string resourceName;
95+
96+
if (ValidateAndExtractName(this.ResourceId, out resourceGroupName, out resourceName))
11697
{
117-
WriteError(WriteErrorforBadrequest(wex));
98+
try
99+
{
100+
var healthcareApisAccount = this.HealthcareApisClient.Services.Get(resourceGroupName, resourceName);
101+
WriteHealthcareApisAccount(healthcareApisAccount);
102+
}
103+
catch (ErrorDetailsException wex)
104+
{
105+
WriteError(WriteErrorforBadrequest(wex));
106+
}
118107
}
119108
break;
120109
}
121-
else
110+
case ListParameterSet:
122111
{
123-
try
112+
if (string.IsNullOrEmpty(this.ResourceGroupName))
124113
{
125-
IPage<ServicesDescription> healthcareApisServicesResourceGroup = this.HealthcareApisClient.Services.ListByResourceGroup(this.ResourceGroupName);
126-
this.WriteObject(ToPSFhirServices(healthcareApisServicesResourceGroup), enumerateCollection: true);
114+
try
115+
{
116+
IPage<ServicesDescription> healthcareApisServicesBySubscription = this.HealthcareApisClient.Services.List();
117+
this.WriteObject(ToPSFhirServices(healthcareApisServicesBySubscription), enumerateCollection: true);
118+
}
119+
catch (ErrorDetailsException wex)
120+
{
121+
WriteError(WriteErrorforBadrequest(wex));
122+
}
123+
break;
127124
}
128-
catch (ErrorDetailsException wex)
125+
else
129126
{
130-
WriteError(WriteErrorforBadrequest(wex));
127+
try
128+
{
129+
IPage<ServicesDescription> healthcareApisServicesResourceGroup = this.HealthcareApisClient.Services.ListByResourceGroup(this.ResourceGroupName);
130+
this.WriteObject(ToPSFhirServices(healthcareApisServicesResourceGroup), enumerateCollection: true);
131+
}
132+
catch (ErrorDetailsException wex)
133+
{
134+
WriteError(WriteErrorforBadrequest(wex));
135+
}
136+
break;
131137
}
132-
break;
133138
}
134-
}
135-
}
136-
});
139+
}
140+
});
141+
}
142+
catch (KeyNotFoundException ex)
143+
{
144+
WriteError(new ErrorRecord(ex, Resources.keyNotFoundExceptionMessage, ErrorCategory.OpenError, ex));
145+
}
146+
catch (NullReferenceException ex)
147+
{
148+
WriteError(new ErrorRecord(ex, Resources.nullPointerExceptionMessage, ErrorCategory.OpenError, ex));
149+
}
137150
}
138151
}
139152
}

0 commit comments

Comments
 (0)