Skip to content

Commit 2d93dcb

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#1249 from arthurwms/newgatewaykey
Included Key property in output of Get-AzureRmDataFactoryGateway.
2 parents 9627c22 + b09e6d3 commit 2d93dcb

File tree

7 files changed

+20
-17
lines changed

7 files changed

+20
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7575
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function Test-DataFactoryGateway
5353
$actual = New-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
5454
$expected = Get-AzureRmDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
5555
Assert-AreEqual $actual.Name $expected.Name
56+
Assert-NotNull $actual.Key
5657

5758
$key = New-AzureRmDataFactoryGatewayKey -ResourceGroupName $rgname -DataFactoryName $dfname -GatewayName $gwname
5859
Assert-NotNull $key

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.DataFactories" version="4.0.0" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.DataFactories" version="4.1.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5774.40163-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5774.40163-prerelease" targetFramework="net45" />

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.1.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,7 @@
28622862
<command:returnValues>
28632863
<command:returnValue>
28642864
<dev:type>
2865-
<maml:name>Microsoft.WindowsAzure.Commands.Utilities.PSDataFactoryGatewayKey</maml:name>
2865+
<maml:name>Microsoft.Azure.Commands.DataFactories.Models.PSDataFactoryGateway</maml:name>
28662866
<maml:uri>
28672867
</maml:uri>
28682868
<maml:description>
@@ -2884,16 +2884,18 @@
28842884
</maml:introduction>
28852885
<dev:code>
28862886
PS C:\&gt; New-AzureRmDataFactoryGateway -ResourceGroupName "ADF" -Name "ContosoGateway" -DataFactoryName "UncycloADF" -Description "my gateway"
2887-
Name : ContosoGateway
2888-
Description : my gateway
2889-
Version :
2890-
Status : NeedRegistration
2891-
VersionStatus : None
2892-
CreateTime : 8/22/2014 1:40:34 AM
2893-
RegisterTime :
2894-
LastConnectTime :
2895-
ExpiryTime :
2896-
</dev:code>
2887+
Name : ContosoGateway
2888+
Description : my gateway
2889+
Version :
2890+
Status : NeedRegistration
2891+
VersionStatus : None
2892+
CreateTime : 8/22/2014 1:40:34 AM
2893+
RegisterTime :
2894+
LastConnectTime :
2895+
ExpiryTime :
2896+
ProvisioningState : Succeeded
2897+
Key : ADF#40cbb3d9-2736-4794-a8a6-e6b839b4894f@a2d875ce-c9d7-4b8b-ad65-dd3ebbb9a940@8c0d1801-e863-44af-82e6-fb2f0c00f2ae@xz#Y9R0NhAeH3u7wgnrJyiWj4Y/QIhH4fFilIdzZgwsVQA=
2898+
</dev:code>
28972899
<dev:remarks>
28982900
<maml:para>This command creates a gateway named ContosoGateway in the data factory named UncycloADF in the resource group named ADF. </maml:para>
28992901
</dev:remarks>
@@ -3082,7 +3084,7 @@
30823084
</maml:introduction>
30833085
<dev:code>
30843086
PS C:\&gt; New-AzureRmDataFactoryGatewayKey -ResourceGroupName "ADF" -GatewayName "ContosoGateway" -DataFactoryName "UncycloADF" | Format-List
3085-
Gateway Key : ADF#40cbb3d9-2736-4794-a8a6-e6b839b4894f@a2d875ce-c9d7-4b8b-ad65-dd3ebbb9a940@8c0d1801-e863-44af-82e6-fb2f0c00f2ae@xz#Y9R0NhAeH3u7wgnrJyiWj4Y/QIhH4fFilIdzZgwsVQA=
3087+
GatewayKey : ADF#40cbb3d9-2736-4794-a8a6-e6b839b4894f@a2d875ce-c9d7-4b8b-ad65-dd3ebbb9a940@8c0d1801-e863-44af-82e6-fb2f0c00f2ae@xz#Y9R0NhAeH3u7wgnrJyiWj4Y/QIhH4fFilIdzZgwsVQA=
30863088
</dev:code>
30873089
<dev:remarks>
30883090
<maml:para>This command creates a gateway key for the data factory gateway named ContosoGateway, and then passes the gateway key to the Format-List cmdlet by using the pipeline operator. For more information, type Get-Help Format-List.</maml:para>

‎src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataFactoryGateway.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public string ProvisioningState
9595
get { return _gateway.Properties == null ? string.Empty : _gateway.Properties.ProvisioningState; }
9696
}
9797

98-
internal string Key
98+
public string Key
9999
{
100100
get { return _gateway.Properties.Key; }
101101
set { _gateway.Properties.Key = value; }

‎src/ResourceManager/DataFactories/Commands.DataFactories/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.Authentication" version="1.4.0-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.DataFactories" version="4.0.0" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.DataFactories" version="4.1.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)