Skip to content

Update PowerShell to use the latest SDK and bug fixes #2670

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.

Sign up for GitHub

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 3 commits into from
Jul 27, 2016
Merged

Update PowerShell to use the latest SDK and bug fixes #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445b556
Update PowerShell to use the latest SDK
Jun 17, 2016
e830feb
Remove test package.
Jul 27, 2016
2176ff3
Update ADLS Filesystem tests and SDK package
Jul 27, 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
4 changes: 2 additions & 2 deletions ...anager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaAliasTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function Test-DataLakeAnalyticsAccount
Assert-True {Test-AdlAnalyticsAccount -Name $accountName}

# Updating Account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
$accountUpdated = Set-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate

Assert-AreEqual $accountName $accountUpdated.Name
Expand Down Expand Up @@ -306,7 +306,7 @@ function Test-NegativeDataLakeAnalyticsAccount
Assert-Throws {New-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName}

# attempt to update a non-existent account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
Assert-Throws {Set-AdlAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}

# attempt to get a non-existent account
Expand Down
4 changes: 2 additions & 2 deletions ...urceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function Test-DataLakeAnalyticsAccount
Assert-True {Test-AzureRMDataLakeAnalyticsAccount -Name $accountName}

# Updating Account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
$accountUpdated = Set-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate

Assert-AreEqual $accountName $accountUpdated.Name
Expand Down Expand Up @@ -305,7 +305,7 @@ function Test-NegativeDataLakeAnalyticsAccount
Assert-Throws {New-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location -DefaultDataLakeStore $dataLakeAccountName}

# attempt to update a non-existent account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
Assert-Throws {Set-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}

# attempt to get a non-existent account
Expand Down
1,680 changes: 798 additions & 882 deletions ...t.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestAdlaAccount.json
View file
Open in desktop

Large diffs are not rendered by default.

2,799 changes: 720 additions & 2,079 deletions ...t.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestAdlaCatalog.json
View file
Open in desktop

Large diffs are not rendered by default.

560 changes: 280 additions & 280 deletions ...osoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestAdlaJob.json
View file
Open in desktop

Large diffs are not rendered by default.

715 changes: 305 additions & 410 deletions ...Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestNegativeAdlaAccount.json
View file
Open in desktop

Large diffs are not rendered by default.

551 changes: 310 additions & 241 deletions ...ure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestNegativeAdlaJob.json
View file
Open in desktop

Large diffs are not rendered by default.

1,630 changes: 815 additions & 815 deletions ...rosoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaAccount.json
View file
Open in desktop

Large diffs are not rendered by default.

13,459 changes: 10,079 additions & 3,380 deletions ...rosoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaCatalog.json
View file
Open in desktop

Large diffs are not rendered by default.

724 changes: 350 additions & 374 deletions .../Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaJob.json
View file
Open in desktop

Large diffs are not rendered by default.

560 changes: 280 additions & 280 deletions ...zure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestNegativeAdlaAccount.json
View file
Open in desktop

Large diffs are not rendered by default.

640 changes: 368 additions & 272 deletions ...ft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestNegativeAdlaJob.json
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 15 additions & 2 deletions ...rceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class DataLakeAnalyticsClient
private readonly DataLakeAnalyticsCatalogManagementClient _catalogClient;
private readonly DataLakeAnalyticsJobManagementClient _jobClient;
private readonly Guid _subscriptionId;
private static Queue<Guid> jobIdQueue;


/// <summary>
Expand All @@ -41,15 +42,27 @@ public class DataLakeAnalyticsClient
/// <value>
/// The job identifier queue.
/// </value>
public static Queue<Guid> JobIdQueue { get; set; }
public static Queue<Guid> JobIdQueue
{
get
{
if (jobIdQueue == null)
{
jobIdQueue = new Queue<Guid>();
}

return jobIdQueue;
}
set { jobIdQueue = value; }
}

public DataLakeAnalyticsClient(AzureContext context)
{
if (context == null)
{
throw new ApplicationException(Resources.InvalidDefaultSubscription);
}
JobIdQueue = new Queue<Guid>();

_accountClient = DataLakeAnalyticsCmdletBase.CreateAdlaClient<DataLakeAnalyticsAccountManagementClient>(context,
AzureEnvironment.Endpoint.ResourceManager);
_subscriptionId = context.Subscription.Id;
Expand Down
10 changes: 4 additions & 6 deletions ...ourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.4-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.StoreUploader, Version=0.10.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.4-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.DataLake.StoreUploader, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -248,4 +246,4 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...esourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsAliasTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Test-DataLakeStoreAccount
Assert-True {Test-AdlStore -Name $accountName}

# Updating Account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
$accountUpdated = Set-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate

Assert-AreEqual $accountName $accountUpdated.Name
Expand Down Expand Up @@ -415,7 +415,7 @@ function Test-NegativeDataLakeStoreAccount
Assert-Throws {New-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Location $location}

# attempt to update a non-existent account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
Assert-Throws {Set-AdlStore -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}

# attempt to get a non-existent account
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Test-DataLakeStoreAccount
Assert-True {Test-AzureRMDataLakeStoreAccount -Name $accountName}

# Updating Account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
$accountUpdated = Set-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate

Assert-AreEqual $accountName $accountUpdated.Name
Expand Down Expand Up @@ -415,7 +415,7 @@ function Test-NegativeDataLakeStoreAccount
Assert-Throws {New-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Location $location}

# attempt to update a non-existent account
$tagsToUpdate = @{"Name" = "TestTag"; "Value" = "TestUpdate"}
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
Assert-Throws {Set-AzureRmDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}

# attempt to get a non-existent account
Expand Down
Loading