Skip to content

Commit 41835dc

Browse files
author
Maddie Clayton
authored
Merge branch 'master' into sqlbc2
2 parents 44673d5 + 5756062 commit 41835dc

File tree

106 files changed

+54
-123453
lines changed

Some content is hidden

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

106 files changed

+54
-123453
lines changed

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsAliasTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ function Test-DataLakeStoreAccount
397397

398398
# Updating Account
399399
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
400-
$accountUpdated = Set-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate
400+
$accountUpdated = Set-AdlStore -ResourceGroupName $resourceGroupName -Name $accountName -Tag $tagsToUpdate
401401

402402
Assert-AreEqual $accountName $accountUpdated.Name
403403
Assert-AreEqual $location $accountUpdated.Location
@@ -950,7 +950,7 @@ function Test-NegativeDataLakeStoreAccount
950950

951951
# attempt to update a non-existent account
952952
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
953-
Assert-Throws {Set-AdlStore -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}
953+
Assert-Throws {Set-AdlStore -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tag $tagsToUpdate}
954954

955955
# attempt to get a non-existent account
956956
Assert-Throws {Get-AdlStore -ResourceGroupName $resourceGroupName -Name $fakeaccountName}

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/ScenarioTests/AdlsTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ function Test-DataLakeStoreAccount
397397

398398
# Updating Account
399399
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
400-
$accountUpdated = Set-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Tags $tagsToUpdate
400+
$accountUpdated = Set-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $accountName -Tag $tagsToUpdate
401401

402402
Assert-AreEqual $accountName $accountUpdated.Name
403403
Assert-AreEqual $location $accountUpdated.Location
@@ -950,7 +950,7 @@ function Test-NegativeDataLakeStoreAccount
950950

951951
# attempt to update a non-existent account
952952
$tagsToUpdate = @{"TestTag" = "TestUpdate"}
953-
Assert-Throws {Set-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tags $tagsToUpdate}
953+
Assert-Throws {Set-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName -Tag $tagsToUpdate}
954954

955955
# attempt to get a non-existent account
956956
Assert-Throws {Get-AzureRMDataLakeStoreAccount -ResourceGroupName $resourceGroupName -Name $fakeaccountName}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@
1919
-->
2020
## Current Release
2121
* Update the sdk version of dataplane to 1.1.13
22-
* Change the type of Encoding parameter to system.Encoding for commandlets: New-AzureRmDataLakeStoreItem, Add-AzureRmDataLakeStoreItemContent, Get-AzureRmDataLakeStoreItemContent to make it compatible to .netcore
22+
* Change the type of Encoding parameter to system.Encoding for commandlets: New-AzureRmDataLakeStoreItem, Add-AzureRmDataLakeStoreItemContent, Get-AzureRmDataLakeStoreItemContent to make it compatible to .netcore
23+
* Removed deprecated -Tags alias from New/Set-AzDataLakeStoreAccount
24+
* Removed deprecated properties from PSDataLakeStoreAccountBasic model

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/NewAzureRmDataLakeStoreAccount.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ public class NewAzureDataLakeStoreAccount : DataLakeStoreCmdletBase
7777
[Parameter(ValueFromPipelineByPropertyName = true, Position = 4, Mandatory = false,
7878
HelpMessage = "A string,string dictionary of tags associated with this account",
7979
ParameterSetName = EncryptionDisabledParameterSetName)]
80-
[CmdletParameterBreakingChange("Tags", ReplaceMentCmdletParameterName = "Tag", ChangeDescription = "Please start using the -Tag parameter to avoid breaking scripts.")]
81-
[Alias("Tags")]
8280
[ValidateNotNull]
8381
public Hashtable Tag { get; set; }
8482

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands/SetAzureRmDataLakeStoreAccount.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public class SetAzureDataLakeStoreAccount : DataLakeStoreCmdletBase
4444
"A string,string dictionary of tags associated with this account that should replace the current set of tags"
4545
)]
4646
[ValidateNotNull]
47-
[CmdletParameterBreakingChange("Tags", ReplaceMentCmdletParameterName = "Tag", ChangeDescription = "Please start using the -Tag parameter to avoid breaking scripts.")]
48-
[Alias("Tags")]
4947
public Hashtable Tag { get; set; }
5048

5149
[Parameter(ValueFromPipelineByPropertyName = true, Position = 3, Mandatory = false,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ public class SetAzureDataLakeStoreItemAcl : DataLakeStoreFileSystemCmdletBase
7272

7373
public override void ExecuteCmdlet()
7474
{
75-
WriteWarning(Resources.IncorrectOutputTypeWarning);
7675
ConfirmAction(
7776
string.Format(Resources.SetDataLakeStoreItemAcl, Path.OriginalPath),
7877
Path.OriginalPath,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public class SetAzureDataLakeStoreItemAclEntry : DataLakeStoreFileSystemCmdletBa
102102

103103
public override void ExecuteCmdlet()
104104
{
105-
WriteWarning(Resources.IncorrectOutputTypeWarning);
106105
var aclSpec = ParameterSetName.Equals(BaseParameterSetName)
107106
? Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList()
108107
: new List<AclEntry> { new AclEntry((AclType)AceType, Id.ToString(), Default ? AclScope.Default : AclScope.Access, (AclAction)Permissions) };

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
namespace Microsoft.Azure.Commands.DataLakeStore
2121
{
22-
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataLakeStoreItemOwner", SupportsShouldProcess = true),OutputType(typeof(bool))]
22+
[Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataLakeStoreItemOwner", SupportsShouldProcess = true),OutputType(typeof(string))]
2323
[Alias("Set-AdlStoreItemOwner")]
2424
public class SetAzureDataLakeStoreItemOwner : DataLakeStoreFileSystemCmdletBase
2525
{
@@ -55,7 +55,6 @@ public class SetAzureDataLakeStoreItemOwner : DataLakeStoreFileSystemCmdletBase
5555

5656
public override void ExecuteCmdlet()
5757
{
58-
WriteWarning(Resources.IncorrectOutputTypeWarning);
5958
string group=null;
6059
string user=null;
6160
if (Type == DataLakeStoreEnums.Owner.Group)

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/PSDataLakeStoreAccountBasic.cs

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -20,104 +20,6 @@ namespace Microsoft.Azure.Commands.DataLakeStore.Models
2020
{
2121
public class PSDataLakeStoreAccountBasic : DataLakeStoreAccountBasic
2222
{
23-
/// <summary>
24-
/// Gets or sets the Key Vault encryption identity, if any.
25-
/// </summary>
26-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
27-
public EncryptionIdentity Identity { get; private set; }
28-
29-
/// <summary>
30-
/// Gets or sets the current state of encryption for this Data Lake
31-
/// store account. Possible values include: 'Enabled', 'Disabled'
32-
/// </summary>
33-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
34-
public EncryptionState? EncryptionState { get; private set; }
35-
36-
/// <summary>
37-
/// Gets the current state of encryption provisioning for this Data
38-
/// Lake store account. Possible values include: 'Creating',
39-
/// 'Succeeded'
40-
/// </summary>
41-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
42-
public EncryptionProvisioningState? EncryptionProvisioningState { get; private set; }
43-
44-
/// <summary>
45-
/// Gets or sets the Key Vault encryption configuration.
46-
/// </summary>
47-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
48-
public EncryptionConfig EncryptionConfig { get; private set; }
49-
50-
/// <summary>
51-
/// Gets or sets the current state of the IP address firewall for this
52-
/// Data Lake store account. Possible values include: 'Enabled',
53-
/// 'Disabled'
54-
/// </summary>
55-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
56-
public FirewallState? FirewallState { get; private set; }
57-
58-
/// <summary>
59-
/// Gets or sets the list of firewall rules associated with this Data
60-
/// Lake store account.
61-
/// </summary>
62-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
63-
public IList<FirewallRule> FirewallRules { get; private set; }
64-
65-
/// <summary>
66-
/// Gets or sets the list of firewall rules associated with this Data
67-
/// Lake store account.
68-
/// </summary>
69-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
70-
public IList<VirtualNetworkRule> VirtualNetworkRules { get; private set; }
71-
72-
/// <summary>
73-
/// Gets or sets the current state of the trusted identity provider
74-
/// feature for this Data Lake store account. Possible values include:
75-
/// 'Enabled', 'Disabled'
76-
/// </summary>
77-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
78-
public TrustedIdProviderState? TrustedIdProviderState { get; private set; }
79-
80-
/// <summary>
81-
/// Gets or sets the list of trusted identity providers associated with
82-
/// this Data Lake store account.
83-
/// </summary>
84-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
85-
public IList<TrustedIdProvider> TrustedIdProviders { get; private set; }
86-
87-
/// <summary>
88-
/// Gets or sets the default owner group for all new folders and files
89-
/// created in the Data Lake Store account.
90-
/// </summary>
91-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
92-
public string DefaultGroup { get; private set; }
93-
94-
/// <summary>
95-
/// Gets or sets the commitment tier to use for next month. Possible
96-
/// values include: 'Consumption', 'Commitment_1TB', 'Commitment_10TB',
97-
/// 'Commitment_100TB', 'Commitment_500TB', 'Commitment_1PB',
98-
/// 'Commitment_5PB'
99-
/// </summary>
100-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
101-
public TierType? NewTier { get; private set; }
102-
103-
/// <summary>
104-
/// Gets the commitment tier in use for the current month. Possible
105-
/// values include: 'Consumption', 'Commitment_1TB', 'Commitment_10TB',
106-
/// 'Commitment_100TB', 'Commitment_500TB', 'Commitment_1PB',
107-
/// 'Commitment_5PB'
108-
/// </summary>
109-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
110-
public TierType? CurrentTier { get; private set; }
111-
112-
/// <summary>
113-
/// Gets or sets the current state of allowing or disallowing IPs
114-
/// originating within Azure through the firewall. If the firewall is
115-
/// disabled, this is not enforced. Possible values include: 'Enabled',
116-
/// 'Disabled'
117-
/// </summary>
118-
[Obsolete("This property is in DataLakeStoreAccount but removed in DataLakeStoreAccountBasic because the server does not return this property when listing accounts. This will be removed in a future release.")]
119-
public FirewallAllowAzureIpsState? FirewallAllowAzureIps { get; private set; }
120-
12123
public PSDataLakeStoreAccountBasic (DataLakeStoreAccountBasic baseAccount) :
12224
base(
12325
baseAccount.Id,

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/help/New-AzDataLakeStoreAccount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ You can use tags to identify a Data Lake Store account from other Azure resource
194194
```yaml
195195
Type: System.Collections.Hashtable
196196
Parameter Sets: (All)
197-
Aliases: Tags
197+
Aliases:
198198

199199
Required: False
200200
Position: 4

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/help/Set-AzDataLakeStoreAccount.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ You can use tags to identify a Data Lake Store account from other Azure resource
149149
```yaml
150150
Type: System.Collections.Hashtable
151151
Parameter Sets: (All)
152-
Aliases: Tags
152+
Aliases:
153153

154154
Required: False
155155
Position: 2

‎src/ResourceManager/DataLakeStore/Commands.DataLakeStore/help/Set-AzDataLakeStoreItemOwner.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
172172
173173
## OUTPUTS
174174
175-
### System.Boolean
175+
### System.String
176176
177177
## NOTES
178178

0 commit comments

Comments
 (0)