Merge pull request #8078 from maddieclayton/dlabc

DataLakeAnalytics breaking changes

Author: cormacpayne

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Az.DataLakeAnalytics.psd1

@@ -75,10 +75,7 @@ FunctionsToExport = @()
 CmdletsToExport = 'Get-AzDataLakeAnalyticsDataSource', 
     'New-AzDataLakeAnalyticsCatalogCredential', 
     'Remove-AzDataLakeAnalyticsCatalogCredential', 
-    'Remove-AzDataLakeAnalyticsCatalogSecret', 
     'Set-AzDataLakeAnalyticsCatalogCredential', 
-    'Set-AzDataLakeAnalyticsCatalogSecret', 
-    'New-AzDataLakeAnalyticsCatalogSecret', 
     'Test-AzDataLakeAnalyticsCatalogItem', 
     'Get-AzDataLakeAnalyticsCatalogItem', 
     'Get-AzDataLakeAnalyticsCatalogItemAclEntry', 

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/ChangeLog.md

@@ -17,4 +17,5 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* Removed deprecated cmdlets: New-AzDataLakeAnalyticsCatalogSecret, Remove-AzDataLakeAnalyticsCatalogSecret, and Set-AzDataLakeAnalyticsCatalogSecret

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.csproj

@@ -60,10 +60,7 @@
     <Compile Include="Commands\GetAzureRmDataLakeAnalyticsDataSource.cs" />
     <Compile Include="Commands\NewAzureRmDataLakeAnalyticsCatalogCredential.cs" />
     <Compile Include="Commands\RemoveAzureRmDataLakeAnalyticsCatalogCredential.cs" />
-    <Compile Include="Commands\RemoveAzureRmDataLakeAnalyticsCatalogSecret.cs" />
     <Compile Include="Commands\SetAzureRmDataLakeAnalyticsCatalogCredential.cs" />
-    <Compile Include="Commands\SetAzureRmDataLakeAnalyticsCatalogSecret.cs" />
-    <Compile Include="Commands\NewAzureRmDataLakeAnalyticsCatalogSecret.cs" />
     <Compile Include="Commands\TestAzureRmDataLakeAnalyticsCatalogItem.cs" />
     <Compile Include="Commands\GetAzureRmDataLakeAnalyticsCatalogItem.cs" />
     <Compile Include="Commands\SetAzureRmDataLakeAnalyticsDataSource.cs" />
@@ -88,7 +85,6 @@
     <Compile Include="Models\PSDataLakeStoreAccountInfo.cs" />
     <Compile Include="Models\PSStorageAccountInfo.cs" />
     <Compile Include="Models\PSDataLakeAnalyticsAccount.cs" />
-    <Compile Include="Models\ObsoleteUSqlCredential.cs" />
     <Compile Include="Models\AdlDataSource.cs" />
     <Compile Include="Models\CatalogPathInstance.cs" />
     <Compile Include="Models\DataLakeAnalyticsEnums.cs" />

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/GetAzureRmDataLakeAnalyticsAccount.cs

@@ -22,7 +22,7 @@
 
 namespace Microsoft.Azure.Commands.DataLakeAnalytics
 {
-    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataLakeAnalyticsAccount", DefaultParameterSetName = BaseParameterSetName),OutputType(typeof(PSDataLakeAnalyticsAccount))]
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataLakeAnalyticsAccount", DefaultParameterSetName = BaseParameterSetName),OutputType(typeof(PSDataLakeAnalyticsAccount), typeof(PSDataLakeAnalyticsAccountBasic))]
     [Alias("Get-AdlAnalyticsAccount")]
     public class GetAzureDataLakeAnalyticsAccount : DataLakeAnalyticsCmdletBase
     {
@@ -53,7 +53,6 @@ public override void ExecuteCmdlet()
             }
             else
             {
-                WriteWarning(Resources.IncorrectOutputTypeWarning);
                 // List all accounts in given resource group if avaliable otherwise all accounts in the subscription
                 WriteObject(DataLakeAnalyticsClient.ListAccounts(ResourceGroupName, null, null, null)
                     .Select(element => new PSDataLakeAnalyticsAccountBasic(element))

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/NewAzureRmDataLakeAnalyticsCatalogCredential.cs

@@ -70,7 +70,6 @@ public class NewAzureDataLakeAnalyticsCatalogCredential : DataLakeAnalyticsCmdle
 
         public override void ExecuteCmdlet()
         {
-            WriteWarning(Resources.IncorrectOutputTypeWarning);
             if (Uri != null && Uri.Port <= 0)
             {
                 WriteWarning(string.Format(Resources.NoPortSpecified, Uri));

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/NewAzureRmDataLakeAnalyticsCatalogSecret.cs

@@ -78,7 +78,6 @@ public class SetAzureDataLakeAnalyticsCatalogCredential : DataLakeAnalyticsCmdle
 
         public override void ExecuteCmdlet()
         {
-            WriteWarning(Resources.IncorrectOutputTypeWarning);
             if (Uri != null && Uri.Port <= 0)
             {
                 WriteWarning(string.Format(Resources.NoPortSpecified, Uri));

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/RemoveAzureRmDataLakeAnalyticsCatalogSecret.cs

@@ -146,7 +146,6 @@ public class SetAzureRmDataLakeAnalyticsCatalogItemAclEntry : DataLakeAnalyticsC
 
         public override void ExecuteCmdlet()
         {
-            WriteWarning(Resources.IncorrectOutputTypeWarning);
             string processMessage = string.Empty;
             string target = string.Empty;
             switch (this.ParameterSetName)

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/SetAzureRmDataLakeAnalyticsCatalogCredential.cs

@@ -997,25 +997,12 @@ private IList<USqlExternalDataSource> GetExternalDataSources(string accountName,
             return toReturn;
         }
 
-// TODO: Remove IfDef
-#if NETSTANDARD
         private USqlCredential GetCredential(string accountName, string databaseName, string credName)
         {
             return _catalogClient.Catalog.GetCredential(accountName, databaseName, credName);
         }
-#else
-        private ObsoleteUSqlCredential GetCredential(string accountName, string databaseName, string credName)
-        {
-            return new ObsoleteUSqlCredential(_catalogClient.Catalog.GetCredential(accountName, databaseName, credName), databaseName, computeAccountName: accountName);
-        }
-#endif
 
-// TODO: Remove IfDef
-#if NETSTANDARD
         private IList<USqlCredential> GetCredentials(string accountName, string databaseName)
-#else
-        private IList<ObsoleteUSqlCredential> GetCredentials(string accountName, string databaseName)
-#endif
         {
             var toReturn = new List<USqlCredential>();
             var response = _catalogClient.Catalog.ListCredentials(accountName, databaseName);
@@ -1026,12 +1013,7 @@ private IList<ObsoleteUSqlCredential> GetCredentials(string accountName, string
                 toReturn.AddRange(response);
             }
 
-// TODO: Remove IfDef
-#if NETSTANDARD
             return toReturn;
-#else
-            return toReturn.Select(element => new ObsoleteUSqlCredential(element, databaseName, computeAccountName: accountName)).ToList();
-#endif
         }
 
         private USqlSchema GetSchema(string accountName, string databaseName,