[HDInsight] Fix bug: missing display for abfss info. (#23247)

yuc-Li · v-yuchenli · VeryEarly · web-flow · commit 217be38fd0fc · 2023-11-06T18:22:42.000+08:00
* fix bug.

* Remove warning messages.

* Update.

* Update ChangeLog.md

---------

Co-authored-by: v-yuchenli &lt;v-yuchenli@microsoft.com&gt;
Co-authored-by: Yabo Hu &lt;yabhu@microsoft.com&gt;
diff --git a/src/HDInsight/HDInsight/ChangeLog.md b/src/HDInsight/HDInsight/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed a bug where the get cluster command does not display abfss storage information.
 
 ## Version 6.0.1
 * This change adds some warning messages to the incoming break changes for the next version, with detailed information as follows:
diff --git a/src/HDInsight/HDInsight/ClusterConfigurationUtils.cs b/src/HDInsight/HDInsight/ClusterConfigurationUtils.cs
@@ -55,6 +55,7 @@ public static AzureHDInsightDefaultStorageAccount GetDefaultStorageAccountDetail
             const string WasbPrefix = "wasb://";
             const string SecureWasbPrefix = "wasbs://";
             const string AdlsGen2Prefix = "abfs://";
+            const string AdlsGen2TLSPrefix = "abfss://";
 
             if (coreSiteConfiguration.TryGetValue(key, out defaultFSUrl))
             {
@@ -102,7 +103,7 @@ public static AzureHDInsightDefaultStorageAccount GetDefaultStorageAccountDetail
                         storageAccountKey: storageAccountKey
                     );
                 }
-                else if (defaultFSUrl.StartsWith(AdlsGen2Prefix))
+                else if (defaultFSUrl.StartsWith(AdlsGen2Prefix) || defaultFSUrl.StartsWith(AdlsGen2TLSPrefix))
                 {
                     string[] accountAndFileSystem;
                     accountAndFileSystem = defaultFSUrl.Substring(AdlsGen2Prefix.Length).Split('@');
diff --git a/src/HDInsight/HDInsight/Constants.cs b/src/HDInsight/HDInsight/Constants.cs
@@ -16,11 +16,7 @@ namespace Microsoft.Azure.Commands.HDInsight
     internal static class Constants
     {
         public const string Hadoop = "Hadoop";
-        public const string deprecateByAzVersion = "11.0.0";
-        public const string deprecateByVersion = "7.0.0";
-        public const string diskEncryptionChangeInfo = "The type of property 'DiskEncryption' of type 'Microsoft.Azure.Commands.HDInsight.Models.AzureHDInsightCluster' will change from 'Microsoft.Azure.Management.HDInsight.Models.DiskEncryptionProperties' to 'Azure.ResourceManager.HDInsight.Models.HDInsightDiskEncryptionProperties'.";
-        public const string workerNodeDataDisksGroupsChangeInfo = "The type of property 'WorkerNodeDataDisksGroups' will change from 'List<Microsoft.Azure.Management.HDInsight.Models.DataDisksGroups>' to 'List<Azure.ResourceManager.HDInsight.Models.HDInsightClusterDataDiskGroup>'.";
-
+     
         public static class CommandNames
         {
             public const string AzureHDInsightCluster = "AzureRmHDInsightCluster";
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightClusterIdentity.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightClusterIdentity.cs
@@ -14,15 +14,11 @@
 
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight.ManagementCommands
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterIdentity",DefaultParameterSetName = CertificateFilePathSet),OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightClusterIdentity : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightComponentVersionCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightComponentVersionCommand.cs
@@ -14,14 +14,10 @@
 
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightComponentVersion",SupportsShouldProcess = true),OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightComponentVersionCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightConfigValuesCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightConfigValuesCommand.cs
@@ -15,16 +15,12 @@
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Management.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Collections;
 using System.Collections.Generic;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightConfigValue"),OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightConfigValuesCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightMetastoreCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightMetastoreCommand.cs
@@ -14,14 +14,10 @@
 
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightMetastore"),OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightMetastoreCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightScriptActionCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightScriptActionCommand.cs
@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Management.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
@@ -35,7 +34,6 @@ public class AddAzureHDInsightScriptActionCommand : HDInsightCmdletBase
             HelpMessage = "The HDInsight cluster configuration to use when creating the new cluster.")]
         public AzureHDInsightConfig Config { get; set; }
 
-        [CmdletParameterBreakingChangeWithVersion("NodeType",Constants.deprecateByAzVersion, Constants.deprecateByVersion, OldParamaterType = typeof(ClusterNodeType), NewParameterTypeName = "RuntimeScriptActionClusterNodeType")]
         [Parameter(Position = 1,
             Mandatory = true,
             HelpMessage = "The node on which to apply the action.")]
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightSecurityProfile.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightSecurityProfile.cs
@@ -17,13 +17,9 @@
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
 using System.Management.Automation;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightSecurityProfile",SupportsShouldProcess = true),OutputType(typeof(AzureHDInsightSecurityProfile))]
     public class AddAzureHDInsightSecurityProfile : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightStorageCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/AddAzureHDInsightStorageCommand.cs
@@ -14,14 +14,10 @@
 
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightStorage"),OutputType(typeof(AzureHDInsightConfig))]
     public class AddAzureHDInsightStorageCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/DisableAzureHDInsightAzureMonitorCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/DisableAzureHDInsightAzureMonitorCommand.cs
@@ -16,13 +16,11 @@
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Disable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightAzureMonitor", DefaultParameterSetName = DisableByNameParameterSet, SupportsShouldProcess = true)]
     [OutputType(typeof(bool))]
     public class DisableAzureHDInsightAzureMonitorCommand : HDInsightCmdletBase
diff --git a/src/HDInsight/HDInsight/ManagementCommands/EnableAzureHDInsightAzureMonitorCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/EnableAzureHDInsightAzureMonitorCommand.cs
@@ -20,11 +20,9 @@
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Enable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightAzureMonitor", DefaultParameterSetName = EnableByNameParameterSet, SupportsShouldProcess = true)]
     [OutputType(typeof(bool))]
     public class EnableAzureHDInsightAzureMonitorCommand : HDInsightCmdletBase
diff --git a/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightAzureMonitorCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightAzureMonitorCommand.cs
@@ -17,13 +17,11 @@
 using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightAzureMonitor", DefaultParameterSetName = GetByNameParameterSet)]
     [OutputType(typeof(AzureHDInsightAzureMonitor))]
     public class GetAzureHDInsightAzureMonitorCommand : HDInsightCmdletBase
diff --git a/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightClusterAutoscaleConfigurationCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightClusterAutoscaleConfigurationCommand.cs
@@ -14,18 +14,14 @@
 
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
-using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
-using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterAutoscaleConfiguration", DefaultParameterSetName = GetByNameParameterSet), OutputType(typeof(AzureHDInsightAutoscale))]
     public class GetAzureHDInsightClusterAutoscaleConfigurationCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs
@@ -15,13 +15,11 @@
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightCluster"),OutputType(typeof(AzureHDInsightCluster))]
     public class GetAzureHDInsightCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightHostCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightHostCommand.cs
@@ -17,14 +17,12 @@
 using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightHost", DefaultParameterSetName = SetByNameParameterSet), OutputType(typeof(AzureHDInsightHostInfo))]
     public class GetAzureHDInsightHostCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightPropertiesCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/GetAzureHDInsightPropertiesCommand.cs
@@ -15,12 +15,10 @@
 using Microsoft.Azure.Commands.HDInsight.Commands;
 using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute("The generic type for 'property ComponentVersions' will change from 'System.Collections.Generic.IDictionary`2[System.String,System.String]' to 'System.Collections.Generic.IReadOnlyDictionary`2[System.String,System.String]'. ",Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightProperty"),OutputType(typeof(AzureHDInsightCapabilities))]
     public class GetAzureHDInsightPropertiesCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs
@@ -24,7 +24,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.WindowsAzure.Commands.Common;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -35,7 +34,6 @@
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightCluster", DefaultParameterSetName = DefaultParameterSet), OutputType(typeof(AzureHDInsightCluster))]
     public class NewAzureHDInsightClusterCommand : HDInsightCmdletBase
     {
@@ -235,7 +233,6 @@ var storageAccount in
         [Parameter(HelpMessage = "Gets the configurations of this HDInsight cluster.")]
         public Dictionary<string, Dictionary<string, string>> Configurations { get; private set; }
 
-        [CmdletParameterBreakingChangeWithVersion("NodeType",Constants.deprecateByAzVersion, Constants.deprecateByVersion, OldParamaterType = typeof(ClusterNodeType), NewParameterTypeName = "RuntimeScriptActionClusterNodeType")]
         [Parameter(HelpMessage = "Gets config actions for the cluster.")]
         public Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions { get; private set; }
 
diff --git a/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterConfigCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterConfigCommand.cs
@@ -17,15 +17,11 @@
 using Microsoft.Azure.Commands.HDInsight.Models.Management;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.HDInsight.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion, 
-        DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"}, 
-        NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterConfig"),OutputType(typeof(AzureHDInsightConfig))]
     public class NewAzureHDInsightClusterConfigCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/RemoveAzureHDInsightClusterAutoscaleConfigurationCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/RemoveAzureHDInsightClusterAutoscaleConfigurationCommand.cs
@@ -18,14 +18,12 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterAutoscaleConfiguration", DefaultParameterSetName = RemoveByNameParameterSet, SupportsShouldProcess = true), OutputType(typeof(AzureHDInsightCluster))]
     public class RemoveAzureHDInsightClusterAutoscaleConfigurationCommand : HDInsightCmdletBase
     {
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterAutoscaleConfigurationCommand.cs
@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.HDInsight.Models;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Generic;
@@ -27,7 +26,6 @@
 
 namespace Microsoft.Azure.Commands.HDInsight
 {
-    [GenericBreakingChangeWithVersionAttribute(Constants.diskEncryptionChangeInfo + Constants.workerNodeDataDisksGroupsChangeInfo,Constants.deprecateByAzVersion,Constants.deprecateByVersion)]
     [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterAutoscaleConfiguration",
         DefaultParameterSetName = LoadAutoscaleByNameParameterSet, SupportsShouldProcess = true),
         OutputType(typeof(AzureHDInsightCluster))]
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterDiskEncryptionKeyCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterDiskEncryptionKeyCommand.cs
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterSizeCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightClusterSizeCommand.cs
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightDefaultStorageCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightDefaultStorageCommand.cs
diff --git a/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightGatewayCredentialCommand.cs b/src/HDInsight/HDInsight/ManagementCommands/SetAzureHDInsightGatewayCredentialCommand.cs

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public static AzureHDInsightDefaultStorageAccount GetDefaultStorageAccountDetail`
`55`	`55`	`const string WasbPrefix = "wasb://";`
`56`	`56`	`const string SecureWasbPrefix = "wasbs://";`
`57`	`57`	`const string AdlsGen2Prefix = "abfs://";`
	`58`	`+ const string AdlsGen2TLSPrefix = "abfss://";`
`58`	`59`
`59`	`60`	`if (coreSiteConfiguration.TryGetValue(key, out defaultFSUrl))`
`60`	`61`	`{`
`@@ -102,7 +103,7 @@ public static AzureHDInsightDefaultStorageAccount GetDefaultStorageAccountDetail`
`102`	`103`	`storageAccountKey: storageAccountKey`
`103`	`104`	`);`
`104`	`105`	`}`
`105`		`- else if (defaultFSUrl.StartsWith(AdlsGen2Prefix))`
	`106`	`+ else if (defaultFSUrl.StartsWith(AdlsGen2Prefix) \|\| defaultFSUrl.StartsWith(AdlsGen2TLSPrefix))`
`106`	`107`	`{`
`107`	`108`	`string[] accountAndFileSystem;`
`108`	`109`	`accountAndFileSystem = defaultFSUrl.Substring(AdlsGen2Prefix.Length).Split('@');`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,7 @@ namespace Microsoft.Azure.Commands.HDInsight`
`16`	`16`	`internal static class Constants`
`17`	`17`	`{`
`18`	`18`	`public const string Hadoop = "Hadoop";`
`19`		`- public const string deprecateByAzVersion = "11.0.0";`
`20`		`- public const string deprecateByVersion = "7.0.0";`
`21`		`- public const string diskEncryptionChangeInfo = "The type of property 'DiskEncryption' of type 'Microsoft.Azure.Commands.HDInsight.Models.AzureHDInsightCluster' will change from 'Microsoft.Azure.Management.HDInsight.Models.DiskEncryptionProperties' to 'Azure.ResourceManager.HDInsight.Models.HDInsightDiskEncryptionProperties'.";`
`22`		`- public const string workerNodeDataDisksGroupsChangeInfo = "The type of property 'WorkerNodeDataDisksGroups' will change from 'List<Microsoft.Azure.Management.HDInsight.Models.DataDisksGroups>' to 'List<Azure.ResourceManager.HDInsight.Models.HDInsightClusterDataDiskGroup>'.";`
`23`		`-`
	`19`	`+`
`24`	`20`	`public static class CommandNames`
`25`	`21`	`{`
`26`	`22`	`public const string AzureHDInsightCluster = "AzureRmHDInsightCluster";`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,11 @@`
`14`	`14`
`15`	`15`	`using Microsoft.Azure.Commands.HDInsight.Commands;`
`16`	`16`	`using Microsoft.Azure.Commands.HDInsight.Models;`
`17`		`-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;`
`18`	`17`	`using System;`
`19`	`18`	`using System.Management.Automation;`
`20`	`19`
`21`	`20`	`namespace Microsoft.Azure.Commands.HDInsight.ManagementCommands`
`22`	`21`	`{`
`23`		`- [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion,`
`24`		`- DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"},`
`25`		`- NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]`
`26`	`22`	`[Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightClusterIdentity",DefaultParameterSetName = CertificateFilePathSet),OutputType(typeof(AzureHDInsightConfig))]`
`27`	`23`	`public class AddAzureHDInsightClusterIdentity : HDInsightCmdletBase`
`28`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,10 @@`
`14`	`14`
`15`	`15`	`using Microsoft.Azure.Commands.HDInsight.Commands;`
`16`	`16`	`using Microsoft.Azure.Commands.HDInsight.Models;`
`17`		`-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;`
`18`	`17`	`using System.Management.Automation;`
`19`	`18`
`20`	`19`	`namespace Microsoft.Azure.Commands.HDInsight`
`21`	`20`	`{`
`22`		`- [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion,`
`23`		`- DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"},`
`24`		`- NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]`
`25`	`21`	`[Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightComponentVersion",SupportsShouldProcess = true),OutputType(typeof(AzureHDInsightConfig))]`
`26`	`22`	`public class AddAzureHDInsightComponentVersionCommand : HDInsightCmdletBase`
`27`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,9 @@`
`17`	`17`	`using Microsoft.Azure.Commands.HDInsight.Commands;`
`18`	`18`	`using Microsoft.Azure.Commands.HDInsight.Models;`
`19`	`19`	`using System.Management.Automation;`
`20`		`-using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;`
`21`	`20`
`22`	`21`	`namespace Microsoft.Azure.Commands.HDInsight`
`23`	`22`	`{`
`24`		`- [CmdletOutputBreakingChangeWithVersion(typeof(AzureHDInsightConfig), Constants.deprecateByAzVersion, Constants.deprecateByVersion,`
`25`		`- DeprecatedOutputProperties = new string[] {"Dictionary<ClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"},`
`26`		`- NewOutputProperties = new string[] {"Dictionary<RuntimeScriptActionClusterNodeType, List<AzureHDInsightScriptAction>> ScriptActions"})]`
`27`	`23`	`[Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "HDInsightSecurityProfile",SupportsShouldProcess = true),OutputType(typeof(AzureHDInsightSecurityProfile))]`
`28`	`24`	`public class AddAzureHDInsightSecurityProfile : HDInsightCmdletBase`
`29`	`25`	`{`