Skip to content

Commit 5c80e4e

Browse files
author
Maddie Clayton
authored
Merge branch 'release-2018-06-29' into get-status-2
2 parents 5b5bb97 + 69374cc commit 5c80e4e

File tree

66 files changed

+18411
-73675
lines changed

Some content is hidden

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

66 files changed

+18411
-73675
lines changed

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/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
## Current Release
21+
* Fixed formatting of OutputTypes in help files
2122

2223
## Version 0.5.1
2324
* Set minimum dependency of module to PowerShell 5.0

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
3737
/// </summary>
3838
[Cmdlet(VerbsData.Sync, "AzureAnalysisServicesInstance", SupportsShouldProcess = true)]
3939
[Alias("Sync-AzureAsInstance")]
40-
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails[]))]
40+
[OutputType(typeof(ScaleOutServerDatabaseSyncDetails))]
4141
public class SynchronizeAzureAzureAnalysisServer : AzurePSCmdlet
4242
{
4343
private static TimeSpan DefaultPollingInterval = TimeSpan.FromSeconds(30);

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
3030
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="20.0.0" />
3131
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
32-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.2-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.1.0-preview" />
3333
<PackageReference Include="Moq" Version="4.7.145" />
3434
</ItemGroup>
3535

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
@@ -67,7 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.20.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="20.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
1414
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AdlsTestsBase : RMTestBase
4141
private LegacyTest.CSMTestEnvironmentFactory csmTestFactory;
4242
private EnvironmentSetupHelper helper;
4343
private const string AuthorizationApiVersion = "2014-07-01-preview";
44-
internal const string resourceGroupLocation = "East US 2";
44+
internal const string resourceGroupLocation = "eastus2";
4545

4646
public ResourceManagementClient ResourceManagementClient { get; private set; }
4747

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsAccount.json

Lines changed: 785 additions & 9356 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsAccountTiers.json

Lines changed: 471 additions & 5954 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystem.json

Lines changed: 313 additions & 6580 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFileSystemPermissions.json

Lines changed: 308 additions & 4589 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsFirewallRules.json

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

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestAdlsTrustedIdProvider.json

Lines changed: 546 additions & 3698 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsAliasTests/TestNegativeAdlsAccount.json

Lines changed: 382 additions & 3334 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsAccount.json

Lines changed: 782 additions & 9881 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsAccountTiers.json

Lines changed: 475 additions & 6090 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsFileSystem.json

Lines changed: 371 additions & 6113 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsFileSystemPermissions.json

Lines changed: 308 additions & 3941 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsFirewallRules.json

Lines changed: 574 additions & 3681 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestAdlsTrustedIdProvider.json

Lines changed: 569 additions & 3664 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeStore.Test.ScenarioTests.AdlsTests/TestNegativeAdlsAccount.json

Lines changed: 440 additions & 3428 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Add cancellation support and progress tracking for Set-AzureRmDataLakeStoreItemAclEntry, Remove-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAcl
22+
* Add cancellation support for Export-AzureRmDataLakeStoreChildItemProperties
23+
* Fix flushing of debug messages for cmdlets that does recursive operations
24+
* Fix location of test of DataLake cmdlets
2125
* Fixed formatting of OutputType in help files
2226

2327
## Version 6.0.1

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.6" />
35+
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.8" />
3636
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.3.0-preview" />
3737
<PackageReference Include="NLog" Version="4.5.0" />
3838
<PackageReference Include="System.Net.Requests" Version="4.3.0" />

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup>
3939
<Reference Include="Microsoft.Azure.DataLake.Store, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.6\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
41+
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.8\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/ExportAzureRmDataLakeStoreChildItemProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public class ExportAzureRmDataLakeStoreChildItemProperties : DataLakeStoreFileSy
8686
public override void ExecuteCmdlet()
8787
{
8888
DataLakeStoreFileSystemClient.GetFileProperties(Account, Path.TransformedPath, GetAcl, OutputPath,
89-
GetDiskUsage, !SaveToAdl, Concurrency, IncludeFile, HideConsistentAcl, MaximumDepth);
89+
GetDiskUsage, !SaveToAdl, Concurrency, IncludeFile, HideConsistentAcl, MaximumDepth, this, CmdletCancellationToken);
9090
if (PassThru)
9191
{
9292
WriteObject(true);

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/RemoveAzureRmDataLakeStoreItemAclEntry.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ public class RemoveAzureDataLakeStoreItemAclEntry : DataLakeStoreFileSystemCmdle
9494
)]
9595
public int Concurrency { get; set; } = -1;
9696

97+
[Parameter(Mandatory = false, HelpMessage =
98+
"If passed then progress status is showed. Only applicable when recursive Acl remove is done."
99+
)]
100+
public SwitchParameter ShowProgress { get; set; }
101+
97102
public override void ExecuteCmdlet()
98103
{
99104
var aclSpec = ParameterSetName.Equals(BaseParameterSetName)
@@ -108,7 +113,7 @@ public override void ExecuteCmdlet()
108113
if (Recurse)
109114
{
110115
DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
111-
Account, aclSpec, RequestedAclType.RemoveAcl, Concurrency);
116+
Account, aclSpec, RequestedAclType.RemoveAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
112117
}
113118
else
114119
{

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/SetAzureRmDataLakeStoreItemAcl.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ public class SetAzureDataLakeStoreItemAcl : DataLakeStoreFileSystemCmdletBase
6565
)]
6666
public int Concurrency { get; set; } = -1;
6767

68+
[Parameter(Mandatory = false,
69+
HelpMessage =
70+
"If passed then progress status is showed. Only applicable when recursive Acl Set is done."
71+
)]
72+
public SwitchParameter ShowProgress { get; set; }
73+
6874
public override void ExecuteCmdlet()
6975
{
7076
WriteWarning(Resources.IncorrectOutputTypeWarning);
@@ -77,7 +83,7 @@ public override void ExecuteCmdlet()
7783
{
7884
DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
7985
Account,
80-
Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList(), RequestedAclType.SetAcl, Concurrency);
86+
Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList(), RequestedAclType.SetAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
8187
}
8288
else
8389
{

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/SetAzureRmDataLakeStoreItemAclEntry.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,38 @@ public class SetAzureDataLakeStoreItemAclEntry : DataLakeStoreFileSystemCmdletBa
9595
)]
9696
public int Concurrency { get; set; } = -1;
9797

98+
[Parameter(Mandatory = false,
99+
HelpMessage =
100+
"If passed then progress status is showed. Only applicable when recursive Acl modify is done."
101+
)]
102+
public SwitchParameter ShowProgress { get; set; }
103+
98104
public override void ExecuteCmdlet()
99105
{
100106
WriteWarning(Resources.IncorrectOutputTypeWarning);
101107
var aclSpec = ParameterSetName.Equals(BaseParameterSetName)
102108
? Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList()
103-
: new List<AclEntry>() { new AclEntry((AclType)AceType, Id.ToString(), Default ? AclScope.Default : AclScope.Access, (AclAction)Permissions) };
109+
: new List<AclEntry> { new AclEntry((AclType)AceType, Id.ToString(), Default ? AclScope.Default : AclScope.Access, (AclAction)Permissions) };
110+
111+
bool recurseAndDefaultAcls = Recurse && !aclSpec.Any(aclEntry => aclEntry.Scope == AclScope.Access);
112+
113+
// For recurse and all acls are default, give a warning message
114+
if (recurseAndDefaultAcls)
115+
{
116+
WriteWarning(Resources.SetOnlyDefaultAclRecursively);
117+
}
104118

105119
ConfirmAction(
106-
string.Format(Resources.SetDataLakeStoreItemAcl, Path.OriginalPath),
120+
string.Format(Resources.SetDataLakeStoreItemAcl, Path.OriginalPath) + (recurseAndDefaultAcls ? "\n" + Resources.SetOnlyDefaultAclRecursively : ""),
107121
Path.OriginalPath,
108122
() =>
109123
{
110124
if (Recurse)
111125
{
126+
112127
DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
113128
Account,
114-
aclSpec, RequestedAclType.ModifyAcl, Concurrency);
129+
aclSpec, RequestedAclType.ModifyAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
115130
}
116131
else
117132
{

0 commit comments

Comments
 (0)