Skip to content

Update to allow a user to not specify a secret name #2164

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 2 commits into from
Apr 28, 2016
Merged

Update to allow a user to not specify a secret name #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81c7d63
Update to allow a user to not specify a secret name
Apr 28, 2016
e9a2f92
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Apr 28, 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
2 changes: 1 addition & 1 deletion .../DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
9 changes: 9 additions & 0 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 @@ -670,8 +670,11 @@ function Test-DataLakeAnalyticsCatalog
# create the secret
$pw = ConvertTo-SecureString -String $secretPwd -AsPlainText -Force
$secret = New-Object System.Management.Automation.PSCredential($secretName,$pw)
$secretName2 = $secretName + "dup"
$secret2 = New-Object System.Management.Automation.PSCredential($secretName2,$pw)

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

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

# delete all secrets
Remove-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -DatabaseName $databaseName -Force

# verify that the second secret cannot be retrieved
Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Secret -Path "$databaseName.$secretName2"}

# Delete the DataLakeAnalytics account
Assert-True {Remove-AzureRmDataLakeAnalyticsAccount -ResourceGroupName $resourceGroupName -Name $accountName -Force -PassThru} "Remove Account failed."

Expand Down
25,050 changes: 24,357 additions & 693 deletions ...rosoft.Azure.Commands.DataLakeAnalytics.Test.ScenarioTests.AdlaTests/TestAdlaCatalog.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.11.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion ...rceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.1-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
20 changes: 16 additions & 4 deletions ...lytics/Commands.DataLakeAnalytics/Commands/RemoveAzureRmDataLakeAnalyticsCatalogSecret.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,24 @@ public override void ExecuteCmdlet()
{
if (!Force.IsPresent)
{
ConfirmAction(
if (string.IsNullOrEmpty(Name))
{
ConfirmAction(
Force.IsPresent,
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecret, Name),
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecret, Name),
Name,
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecrets, DatabaseName),
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecrets, DatabaseName),
DatabaseName,
() => DataLakeAnalyticsClient.DeleteSecret(Account, DatabaseName, Name));
}
else
{
ConfirmAction(
Force.IsPresent,
string.Format(Resources.RemovingDataLakeAnalyticsCatalogSecret, Name),
string.Format(Resources.RemoveDataLakeAnalyticsCatalogSecret, Name),
Name,
() => DataLakeAnalyticsClient.DeleteSecret(Account, DatabaseName, Name));
}
}
else
{
Expand Down
9 changes: 8 additions & 1 deletion ...rceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,14 @@ public USqlSecret UpdateSecret(string accountName, string databaseName,

public void DeleteSecret(string accountName, string databaseName, string secretName)
{
_catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
if (string.IsNullOrEmpty(secretName))
{
_catalogClient.Catalog.DeleteAllSecrets(accountName, databaseName);
}
else
{
_catalogClient.Catalog.DeleteSecret(accountName, databaseName, secretName);
}
}

public USqlSecret GetSecret(string accountName, string databaseName, string secretName)
Expand Down
52 changes: 33 additions & 19 deletions ...urceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,10 @@
<data name="InvalidUSqlSecretRequest" xml:space="preserve">
<value>U-SQL Secrets can only be returned by specific database secret name combination. There is no list support.</value>
</data>
<data name="RemoveDataLakeAnalyticsCatalogSecrets" xml:space="preserve">
<value>Removing ALL Data Lake Analytics catalog secrets in database '{0}' ...</value>
</data>
<data name="RemovingDataLakeAnalyticsCatalogSecrets" xml:space="preserve">
<value>Are you sure you want to remove ALL Data Lake Analytics catalog secrets in database '{0}'?</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.DataLake.Analytics" version="0.11.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
Expand Down