Skip to content

Commit 5abe25e

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#2164 from begoldsm/dev
Update to allow a user to not specify a secret name
2 parents 54324f6 + e9a2f92 commit 5abe25e

File tree

10 files changed

+24433
-721
lines changed

10 files changed

+24433
-721
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
@@ -64,7 +64,7 @@
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,11 @@ function Test-DataLakeAnalyticsCatalog
670670
# create the secret
671671
$pw = ConvertTo-SecureString -String $secretPwd -AsPlainText -Force
672672
$secret = New-Object System.Management.Automation.PSCredential($secretName,$pw)
673+
$secretName2 = $secretName + "dup"
674+
$secret2 = New-Object System.Management.Automation.PSCredential($secretName2,$pw)
673675

674676
New-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -secret $secret -DatabaseName $databaseName -Uri "https://pstest.contoso.com:443"
677+
New-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -secret $secret2 -DatabaseName $databaseName -Uri "https://pstest.contoso.com:443"
675678

676679
# verify that the credential can be retrieved
677680
$getSecret = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Secret -Path "$databaseName.$secretName"
@@ -730,6 +733,12 @@ function Test-DataLakeAnalyticsCatalog
730733
# verify that the secret cannot be retrieved
731734
Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Secret -Path "$databaseName.$secretName"}
732735

736+
# delete all secrets
737+
Remove-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -DatabaseName $databaseName -Force
738+
739+
# verify that the second secret cannot be retrieved
740+
Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Secret -Path "$databaseName.$secretName2"}
741+
733742
# Delete the DataLakeAnalytics account
734743
Assert-True {Remove-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."
735744

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

Lines changed: 24357 additions & 693 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
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.11.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4949
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
50+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,24 @@ public override void ExecuteCmdlet()
4848
{
4949
if (!Force.IsPresent)
5050
{
51-
ConfirmAction(
51+
if (string.IsNullOrEmpty(Name))
52+
{
53+
ConfirmAction(
5254
Force.IsPresent,
53-
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecret, Name),
54-
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecret, Name),
55-
Name,
55+
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecrets, DatabaseName),
56+
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecrets, DatabaseName),
57+
DatabaseName,
5658
() => DataLakeAnalyticsClient.DeleteSecret(Account, DatabaseName, Name));
59+
}
60+
else
61+
{
62+
ConfirmAction(
63+
Force.IsPresent,
64+
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecret, Name),
65+
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecret, Name),
66+
Name,
67+
() => DataLakeAnalyticsClient.DeleteSecret(Account, DatabaseName, Name));
68+
}
5769
}
5870
else
5971
{

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,14 @@ public USqlSecret UpdateSecret(string accountName, string databaseName,
384384

385385
public void DeleteSecret(string accountName, string databaseName, string secretName)
386386
{
387-
_catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
387+
if (string.IsNullOrEmpty(secretName))
388+
{
389+
_catalogClient.Catalog.DeleteAllSecrets(accountName, databaseName);
390+
}
391+
else
392+
{
393+
_catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
394+
}
388395
}
389396

390397
public USqlSecret GetSecret(string accountName, string databaseName, string secretName)

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.Designer.cs

Lines changed: 33 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,10 @@
198198
<data name="InvalidUSqlSecretRequest" xml:space="preserve">
199199
<value>U-SQL Secrets can only be returned by specific database secret name combination. There is no list support.</value>
200200
</data>
201+
<data name="RemoveDataLakeAnalyticsCatalogSecrets" xml:space="preserve">
202+
<value>Removing ALL Data Lake Analytics catalog secrets in database '{0}' ...</value>
203+
</data>
204+
<data name="RemovingDataLakeAnalyticsCatalogSecrets" xml:space="preserve">
205+
<value>Are you sure you want to remove ALL Data Lake Analytics catalog secrets in database '{0}'?</value>
206+
</data>
201207
</root>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.1-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)