Merge pull request #4167 from nicolaszhang/auth-key-preview-branch2

Introduce gateway auth key feature

Author: cormacpayne

src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

@@ -78,6 +78,7 @@ CmdletsToExport = 'Remove-AzureRmDataFactory', 'Get-AzureRmDataFactoryRun',
                'New-AzureRmDataFactoryEncryptValue', 
                'Get-AzureRmDataFactoryGateway', 'New-AzureRmDataFactoryGateway', 
                'New-AzureRmDataFactoryGatewayKey', 
+               'Get-AzureRmDataFactoryGatewayAuthkey', 'New-AzureRmDataFactoryGatewayAuthkey', 
                'Remove-AzureRmDataFactoryGateway', 'Set-AzureRmDataFactoryGateway', 
                'Get-AzureRmDataFactoryHub', 'New-AzureRmDataFactoryHub', 
                'Remove-AzureRmDataFactoryHub', 

src/ResourceManager/DataFactories/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Current Release
 
+* Deprecate New-AzureRmDataFactoryGatewayKey
+* Introduce gateway auth key feature by adding New-AzureRmDataFactoryGatewayAuthKey and Get-AzureRmDataFactoryGatewayAuthKey
+
 ## Version 3.1.0
 
 ## Version 3.0.1

src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

@@ -65,7 +65,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataFactories">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.11.1\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.13.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -249,6 +249,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGatewayWithDataFactoryParameter.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestDataFactoryGatewayAuthKey.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryGatewayTests.cs

@@ -37,6 +37,13 @@ public void TestCreateDataFactoryGateway()
             RunPowerShellTest("Test-DataFactoryGateway");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDataFactoryGatewayAuthKey()
+        {
+            RunPowerShellTest("Test-DataFactoryGatewayAuthKey");
+        }
+
         [Fact(Skip = "test takes too long (more than 5 sec)")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestCreateDataFactoryGatewayWithDataFactoryParameter()

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryGatewayTests.ps1

@@ -53,7 +53,7 @@ function Test-DataFactoryGateway
         $actual = New-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
         $expected = Get-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
         Assert-AreEqual $actual.Name $expected.Name
-		Assert-NotNull $actual.Key
+        Assert-NotNull $actual.Key
 
         $key = New-AzureRmDataFactoryGatewayKey -ResourceGroupName $rgname -DataFactoryName $dfname -GatewayName $gwname
         Assert-NotNull $key
@@ -70,6 +70,50 @@ function Test-DataFactoryGateway
     }
 }
 
+<#
+.SYNOPSIS
+Create a gateway and then try to get auth keys and new auth keys.
+Delete the created gateway after test finishes.
+#>
+function Test-DataFactoryGatewayAuthKey
+{
+    $dfname = Get-DataFactoryName
+    $rgname = Get-ResourceGroupName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $dflocation = Get-ProviderLocation DataFactoryManagement
+        
+    New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Force
+
+    try
+    {
+        New-AzureRmDataFactory -ResourceGroupName $rgname -Name $dfname -Location $dflocation -Force
+     
+        $gwname = "foo"
+        $description = "description"
+   
+        $actual = New-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
+        $expected = Get-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
+        Assert-AreEqual $actual.Name $expected.Name
+        Assert-NotNull $actual.Key
+
+        $key = Get-AzureRmDataFactoryGatewayAuthKey -ResourceGroupName $rgname -DataFactoryName $dfname -GatewayName $gwname
+        Assert-NotNull $key
+        Assert-NotNull $key.Key1
+        Assert-NotNull $key.Key2
+
+        $keyName = 'key2'
+        $newKey = New-AzureRmDataFactoryGatewayAuthKey -ResourceGroupName $rgname -DataFactoryName $dfname -GatewayName $gwname -KeyName $keyName
+        Assert-NotNull $key.Key2
+        Assert-AreNotEqual $key.Key2 $newKey.Key2
+
+        Remove-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname -Force
+    }
+    finally
+    {
+        Clean-DataFactory $rgname $dfname
+    }
+}
+
 <#
 .SYNOPSIS
 Use the datafactory parameter to create a gateway and then do a Get to compare the result are identical.