Merge pull request #3152 from begoldsm/dev

ADL Updates to latest SDK in preparation for GA

Author: markcowl

src/ResourceManager/DataLakeAnalytics/ChangeLog.md

@@ -17,4 +17,14 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* Addition of Catalog CRUD cmdlets:
+    - The following cmdlets are replacing Secret CRUD cmdlets. In the next release Secret CRUD cmdlets will be removed.
+    - New-AzureRMDataLakeAnalyticsCatalogCredential
+    - Set-AzureRMDataLakeAnalyticsCatalogCredential
+    - Remove-AzureRMDataLakeAnalyticsCatalogCredential
+* Fixes for Get-AzureRMDataLakeAnalyticsCatalogItem
+    - Better error messaging and support for invalid input
+* General help improvements
+    - Clearer help for job operations
+    - Fixed typos and incorrect examples

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

@@ -63,12 +63,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.12.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.12.6-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.6-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.8-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

@@ -751,6 +751,36 @@ function Test-DataLakeAnalyticsCatalog
 		$result = Wait-AdlJob -AccountName $accountName -JobId $jobInfo.JobId
 		Assert-AreEqual "Succeeded" $result.Result
 
+		# Create the credential using the new create credential cmdlet
+		New-AdlCatalogCredential -AccountName $accountName -DatabaseName $databaseName -CredentialName $credentialName -Credential $secret -Uri "https://fakedb.contoso.com:443"
+
+		# retrieve the list of credentials and ensure the created credential is in it
+		$itemList = Get-AdlCatalogItem -AccountName $accountName -ItemType Credential -Path $databaseName
+
+		Assert-NotNull $itemList "The credential list is null"
+
+		Assert-True {$itemList.count -gt 0} "The credential list is empty"
+		$found = $false
+		foreach($item in $itemList)
+		{
+			if($item.Name -eq $credentialName)
+			{
+				$found = $true
+				break
+			}
+		}
+	
+		# retrieve the specific credential
+		$specificItem = Get-AdlCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"
+		Assert-NotNull $specificItem "Could not retrieve the credential by name"
+		Assert-AreEqual $credentialName $specificItem.Name
+
+		# Remove the credential
+		Remove-AdlCatalogCredential -AccountName $accountName -DatabaseName $databaseName -Name $credentialName
+		
+		# Verify that trying to get the credential fails
+		Assert-Throws {Get-AdlCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
+
 		# delete the secret
 		Remove-AdlCatalogSecret -AccountName $accountName -Name $secretName -DatabaseName $databaseName -Force
 

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

@@ -751,7 +751,37 @@ function Test-DataLakeAnalyticsCatalog
 		$jobInfo = Submit-AzureRmDataLakeAnalyticsJob -AccountName $accountName -Name "TestJobCredential" -Script $credentialJob
 		$result = Wait-AzureRMDataLakeAnalyticsJob -AccountName $accountName -JobId $jobInfo.JobId
 		Assert-AreEqual "Succeeded" $result.Result
-    
+		
+		# Create the credential using the new create credential cmdlet
+		New-AzureRMDataLakeAnalyticsCatalogCredential -AccountName $accountName -DatabaseName $databaseName -CredentialName $credentialName -Credential $secret -Uri "https://fakedb.contoso.com:443"
+
+		# retrieve the list of credentials and ensure the created credential is in it
+		$itemList = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path $databaseName
+
+		Assert-NotNull $itemList "The credential list is null"
+
+		Assert-True {$itemList.count -gt 0} "The credential list is empty"
+		$found = $false
+		foreach($item in $itemList)
+		{
+			if($item.Name -eq $credentialName)
+			{
+				$found = $true
+				break
+			}
+		}
+	
+		# retrieve the specific credential
+		$specificItem = Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"
+		Assert-NotNull $specificItem "Could not retrieve the credential by name"
+		Assert-AreEqual $credentialName $specificItem.Name
+
+		# Remove the credential
+		Remove-AzureRmDataLakeAnalyticsCatalogCredential -AccountName $accountName -DatabaseName $databaseName -Name $credentialName
+		
+		# Verify that trying to get the credential fails
+		Assert-Throws {Get-AzureRMDataLakeAnalyticsCatalogItem -AccountName $accountName -ItemType Credential -Path "$databaseName.$credentialName"}
+
 		# delete the secret
 		Remove-AzureRmDataLakeAnalyticsCatalogSecret -AccountName $accountName -Name $secretName -DatabaseName $databaseName -Force