Skip to content

[Release-1.2.2] ADL Upgrade to AutoRest #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Feb 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
981c2c4
Initial changes for PowerShell to use AutoRest SDK
Jan 12, 2016
779047c
Initial check-in of DataLake AutoRest changes
Jan 19, 2016
a223f4c
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jan 28, 2016
98c1e42
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jan 28, 2016
cde72d8
Adding some more private versions of packages
Jan 28, 2016
03238a4
Regenerate the wxi file.
Jan 29, 2016
f893dcd
Update the uploader to not require latest ClientRuntime
Feb 1, 2016
bcec8b9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 22, 2016
5a7a763
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 23, 2016
223b044
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 24, 2016
a7bc077
PowerShell ADL updates for AutoRest
Feb 24, 2016
2440b1e
Removing local feed and updating ADL cmdlets
Feb 25, 2016
fb01622
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 25, 2016
f517c36
Adding the new AdlArmClient logic that is in the interface.
Feb 25, 2016
fe86049
Address Mark's comments
Feb 26, 2016
ab06a95
Add filesystem tests
Feb 26, 2016
44cb9a1
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 26, 2016
2837db2
Update tests for ADLA
Feb 26, 2016
90c25f7
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Feb 26, 2016
5001735
Missed two changes in the merge
Feb 26, 2016
630284f
Remove web.* dlls from wxi
Feb 26, 2016
fb394f3
Merge branch 'release-1.2.2' of https://github.com/Azure/azure-powers…
Feb 26, 2016
0c080bd
Address Hovsep comments.
Feb 26, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -950,12 +950,6 @@
<Component Id="cmpC7E6FE59FD9BE2336B79DB8ECBF17046" Guid="*">
<File Id="fil61CA47DE019E9D104047A04BBE4CBBA4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.Analytics.dll" />
</Component>
<Component Id="cmp1716E926BEC9E4B94246B9900677763C" Guid="*">
<File Id="filB2C061924D5D27E442FDE93A7A09790E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.dll" />
</Component>
<Component Id="cmp448D2FD66CAEA24E2C585380D499D515" Guid="*">
<File Id="fil4CC549396754C1149F25FC77C029162B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll" />
</Component>
<Component Id="cmp6427B43273FAE59C682B8F34631AABF9" Guid="*">
<File Id="filC8094B88A4FF44526C50F20B85B999A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.ResourceManager.dll" />
</Component>
Expand All @@ -968,6 +962,9 @@
<Component Id="cmp33ACC536D3148134079F201DDFE77041" Guid="*">
<File Id="fil68134395180424CF926E86CA852D5A17" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmp7AF20CAE2005123323E3D9C0F8709408" Guid="*">
<File Id="filBD917B281F92F71FE5811C63D626F43C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.Azure.dll" />
</Component>
<Component Id="cmp155DD45DF9686335F29475E5BE19C042" Guid="*">
<File Id="filC5793429BA209EBCED9CBEC92DDAA3EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Rest.ClientRuntime.dll" />
</Component>
Expand Down Expand Up @@ -1033,9 +1030,6 @@
<Component Id="cmp3C96010EFA751762A76B66B811613835" Guid="*">
<File Id="fil509D1E7494560B2BB3462B8FAD7954CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.Store.dll" />
</Component>
<Component Id="cmp575B392ACE04250894FE0A0AEAED1076" Guid="*">
<File Id="fil75BC3F0D21F16D610A43BF71C4478822" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.StoreFileSystem.dll" />
</Component>
<Component Id="cmpFECE1A517C9182672B042869C46847FC" Guid="*">
<File Id="fil00C18C352C99B9BCFA42EFFACE0AEFF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Management.DataLake.StoreUploader.dll" />
</Component>
Expand All @@ -1051,6 +1045,9 @@
<Component Id="cmpE013952E5C0092DEF16E1BCB8554E2BD" Guid="*">
<File Id="fil1157E8777215834782623202281C662C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmpC546D5383D0250C9E75D98657182CA83" Guid="*">
<File Id="fil422766278FCD5D4120A80E0F929D3237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.Azure.dll" />
</Component>
<Component Id="cmp4428C8FD56C2C743D3C60DBE1C2A78EF" Guid="*">
<File Id="fil09973D8B858AB058ED76A7C02BF404A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Rest.ClientRuntime.dll" />
</Component>
Expand Down Expand Up @@ -5318,12 +5315,11 @@
<ComponentRef Id="cmpD3A3362A8365705FDC0C19B312EB61FC" />
<ComponentRef Id="cmp096EEC3ACF260985958CED2DC04BD9A9" />
<ComponentRef Id="cmpC7E6FE59FD9BE2336B79DB8ECBF17046" />
<ComponentRef Id="cmp1716E926BEC9E4B94246B9900677763C" />
<ComponentRef Id="cmp448D2FD66CAEA24E2C585380D499D515" />
<ComponentRef Id="cmp6427B43273FAE59C682B8F34631AABF9" />
<ComponentRef Id="cmpF037C3CB01A53CACE3DEE2967867A5A8" />
<ComponentRef Id="cmpBF55514F4254BD001BBD9F655C72947C" />
<ComponentRef Id="cmp33ACC536D3148134079F201DDFE77041" />
<ComponentRef Id="cmp7AF20CAE2005123323E3D9C0F8709408" />
<ComponentRef Id="cmp155DD45DF9686335F29475E5BE19C042" />
<ComponentRef Id="cmpA98C0F8AD11679264AD00A82F52281C2" />
<ComponentRef Id="cmpD778BFD40FC787AEB2416D7011E33D4C" />
Expand All @@ -5345,12 +5341,12 @@
<ComponentRef Id="cmp87FB43928F7A2ECF62C0141446D21A9F" />
<ComponentRef Id="cmpD2292657EF3D9CEAC5D4FA7DEB3E7E8E" />
<ComponentRef Id="cmp3C96010EFA751762A76B66B811613835" />
<ComponentRef Id="cmp575B392ACE04250894FE0A0AEAED1076" />
<ComponentRef Id="cmpFECE1A517C9182672B042869C46847FC" />
<ComponentRef Id="cmpFCFE1AC675F0BA7336B392A419D70042" />
<ComponentRef Id="cmpB41201E194E7639BC9C33ADECC894426" />
<ComponentRef Id="cmpCA3408E9E612E4D3DFDE66EDA04DB4C8" />
<ComponentRef Id="cmpE013952E5C0092DEF16E1BCB8554E2BD" />
<ComponentRef Id="cmpC546D5383D0250C9E75D98657182CA83" />
<ComponentRef Id="cmp4428C8FD56C2C743D3C60DBE1C2A78EF" />
<ComponentRef Id="cmp6A9835F3E1B5DC12D06838385F1FB63A" />
<ComponentRef Id="cmpE1A83F89536BF9BE1BE6D50E2EB117F7" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,19 @@ public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureEnviro
}

/// <summary>
/// Creates the client.
/// </summary>
/// <typeparam name="TClient"></typeparam>
/// <param name="subscription"></param>
/// <param name="endpoint"></param>
/// <typeparam name="TClient">The type of the client.</typeparam>
/// <param name="profile">The profile.</param>
/// <param name="subscription">The subscription.</param>
/// <param name="endpoint">The endpoint.</param>
/// <returns></returns>
/// <exception cref="System.ApplicationException"></exception>
/// <exception cref="System.ArgumentException">
/// accountName
/// or
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or what?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this was a ghostDoc generation. I will fix it.

/// environment
/// </exception>
public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
{
if (subscription == null)
Expand Down Expand Up @@ -287,7 +295,7 @@ public void AddUserAgent(string productName)

public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }

private DelegatingHandler[] GetCustomHandlers()
public DelegatingHandler[] GetCustomHandlers()
{
List<DelegatingHandler> newHandlers = new List<DelegatingHandler>();
var enumerator = _handlers.GetEnumerator();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public interface IClientFactory
/// <param name="productName">Product name.</param>
void AddUserAgent(string productName);

/// <summary>
/// Gets the custom handlers.
/// </summary>
/// <returns>An array of custom handlers</returns>
DelegatingHandler[] GetCustomHandlers();

/// <summary>
/// Adds user agent to UserAgents collection.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
// Do nothing
}

public DelegatingHandler[] GetCustomHandlers()
{
// the equivalent of doing nothing
return new DelegatingHandler[0];
}

public void AddUserAgent(string productName, string productVersion)
{
this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
<add key="AzureStackMachineName" value="azstackvm"/>
Expand All @@ -11,4 +11,4 @@
<add key="AadLoginUri" value="https://login.windows.net/"/>
<add key="AadGraphUri" value="https://graph.windows.net/"/>
</appSettings>
</configuration>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="App.config" />
<None Include="AzureStackTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.Graph] = currentEnvironment.Endpoints.GraphUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix] = currentEnvironment.Endpoints.DataLakeAnalyticsJobAndCatalogServiceUri.OriginalString.Replace("https://",""); // because it is just a sufix
environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix] = currentEnvironment.Endpoints.DataLakeStoreServiceUri.OriginalString.Replace("https://", ""); // because it is just a sufix

if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
// Do nothing
}

public DelegatingHandler[] GetCustomHandlers()
{
// the equivalent of doing nothing
return new DelegatingHandler[0];
}

public void AddUserAgent(string productName, string productVersion)
{
this.UniqueUserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,23 @@
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.9.4-preview\lib\net40\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<Reference Include="Microsoft.Azure.Gallery">
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsCatalog, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.0.9.3-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsCatalog.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Authorization">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.AnalyticsJob, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.AnalyticsJob.0.9.6-preview\lib\net40\Microsoft.Azure.Management.DataLake.AnalyticsJob.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.10.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.9.1-preview\lib\net40\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.10.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -82,9 +84,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Test.HttpRecorder">
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.0-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -98,10 +101,20 @@
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.0.1\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.0.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.2.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand Down Expand Up @@ -142,6 +155,7 @@
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -188,6 +202,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="ScenarioTests\Common.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AdlaTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
Loading