Skip to content

Commit 9bcd8de

Browse files
huangpfhuangpf
authored
Merge pull request #673 from Azure/dev
huangpf PR: dev <- Azure:dev
2 parents 9e72ddb + da9324b commit 9bcd8de

File tree

11 files changed

+24157
-1564
lines changed

11 files changed

+24157
-1564
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</Reference>
118118
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
119119
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
120+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.3.6-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
121121
<Private>True</Private>
122122
</Reference>
123123
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaAliasTests.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,15 @@ function Test-DataLakeAnalyticsCatalog
781781
# Verify that trying to get the credential fails
782782
Assert-Throws {Get-AdlCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
783783

784+
# recreate the credential to drop with recursive parameters to ensure that it still works.
785+
New-AdlCatalogCredential -AccountName $accountName -DatabaseName $databaseName -CredentialName $credentialName -Credential $secret -Uri "https://fakedb.contoso.com:443"
786+
787+
# Remove the credential with recurse
788+
Remove-AdlCatalogCredential -AccountName $accountName -DatabaseName $databaseName -Name $credentialName -Recurse -Force
789+
790+
# Verify that trying to get the credential fails
791+
Assert-Throws {Get-AdlCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
792+
784793
# delete the secret
785794
Remove-AdlCatalogSecret -AccountName $accountName -Name $secretName -DatabaseName $databaseName -Force
786795

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/ScenarioTests/AdlaTests.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,15 @@ function Test-DataLakeAnalyticsCatalog
782782
# Verify that trying to get the credential fails
783783
Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
784784

785+
# recreate the credential to drop with recursive parameters to ensure that it still works.
786+
New-AzureRMDataLakeAnalyticsCatalogCredential -AccountName $accountName -DatabaseName $databaseName -CredentialName $credentialName -Credential $secret -Uri "https://fakedb.contoso.com:443"
787+
788+
# Remove the credential with recurse
789+
Remove-AzureRmDataLakeAnalyticsCatalogCredential -AccountName $accountName -DatabaseName $databaseName -Name $credentialName -Recurse -Force
790+
791+
# Verify that trying to get the credential fails
792+
Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
793+
785794
# delete the secret
786795
Remove-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -Name $secretName -DatabaseName $databaseName -Force
787796

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaAliasTests/TestAdlaCatalog.json

Lines changed: 23098 additions & 673 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/SessionRecords/Microsoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaCatalog.json

Lines changed: 901 additions & 838 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<package id="Microsoft.Rest.ClientRuntime" version="2.3.4" targetFramework="net45" />
2121
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.4" targetFramework="net45" />
2222
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
23-
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
23+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.3.6-preview" targetFramework="net45" />
2424
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2525
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
2626
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/RemoveAzureRmDataLakeAnalyticsCatalogCredential.cs

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,58 @@ public class RemoveAzureDataLakeAnalyticsCredential : DataLakeAnalyticsCmdletBas
4545
[ValidateNotNull]
4646
public PSCredential Password { get; set; }
4747

48+
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
49+
HelpMessage =
50+
"Indicates that this delete operation should go through and also delete and drop all resources dependent on this credential")]
51+
[ValidateNotNull]
52+
public SwitchParameter Recurse { get; set; }
53+
4854
[Parameter(Mandatory = false)]
4955
public SwitchParameter PassThru { get; set; }
5056

57+
[Parameter(Mandatory = false)]
58+
public SwitchParameter Force { get; set; }
59+
5160
public override void ExecuteCmdlet()
5261
{
53-
ConfirmAction(
54-
string.Format(Resources.RemoveDataLakeAnalyticsCatalogCredential, Name),
55-
Name,
56-
() =>
57-
{
58-
DataLakeAnalyticsClient.DeleteCredential(Account, DatabaseName, Name, Password != null ? Password.GetNetworkCredential().Password : null);
59-
if (PassThru)
62+
if (!Recurse)
63+
{
64+
ConfirmAction(
65+
string.Format(Resources.RemoveDataLakeAnalyticsCatalogCredential, Name),
66+
Name,
67+
() =>
68+
{
69+
DataLakeAnalyticsClient.DeleteCredential(
70+
Account,
71+
DatabaseName,
72+
Name,
73+
Password != null ? Password.GetNetworkCredential().Password : null);
74+
if (PassThru)
75+
{
76+
WriteObject(true);
77+
}
78+
});
79+
}
80+
else // in the recursive case there are other objects deleted, so the user must take action
81+
{
82+
ConfirmAction(
83+
Force.IsPresent,
84+
string.Format(Resources.RemovingDataLakeAnalyticsCatalogCredentialCascade, Name),
85+
string.Format(Resources.RemoveDataLakeAnalyticsCatalogCredentialCascade, Name),
86+
Name,
87+
() =>
6088
{
61-
WriteObject(true);
62-
}
63-
});
89+
DataLakeAnalyticsClient.DeleteCredential(
90+
Account,
91+
DatabaseName,
92+
Name, Password != null ? Password.GetNetworkCredential().Password : null,
93+
Recurse);
94+
if (PassThru)
95+
{
96+
WriteObject(true);
97+
}
98+
});
99+
}
64100
}
65101
}
66102
}

0 commit comments

Comments
 (0)