Skip to content

Commit b1b4cd7

Browse files
markcowlmarkcowl
committed
Merge pull request #588 from yitao-zhang/adfmerge
ADF cmdlets use breaking new Sdk
2 parents 8eb13ac + 91faa0d commit b1b4cd7

File tree

72 files changed

+3195
-4355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3195
-4355
lines changed

‎ChangeLog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
* Fixed formatting of output for Get-UsageAggregates
8787
* Fixed executing Get-UsageAggregates when first cmdlet being called.
8888

89+
* Azure Data Factory cmdlets
90+
* Upgraded management library to 1.0.0 with breaking JSON format change.
91+
* Updated list operation paging support in cmdlets.
92+
8993
2015.06.26 version 0.9.4
9094
* Azure Compute cmdlets
9195
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -768,9 +768,6 @@
768768
<Component Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" Guid="*">
769769
<File Id="filBD789B715F4C6F58DFFACC4839072346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Services.Client.dll" />
770770
</Component>
771-
<Component Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" Guid="*">
772-
<File Id="filF8F961D8FC629431B44B43A76538C334" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataFactories.Runtime.dll" />
773-
</Component>
774771
<Component Id="cmp2E106693251FC564A4D03DA3778E26F7" Guid="*">
775772
<File Id="fil3F27EAE226BD87840D5E9CE662DE26F9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataTransfer.Gateway.Encryption.dll" />
776773
</Component>
@@ -4308,7 +4305,6 @@
43084305
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
43094306
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
43104307
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
4311-
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
43124308
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
43134309
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
43144310
<ComponentRef Id="cmp4F6E42879531C2B7A830BA3B4FF4033B" />

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.DataFactories">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.12-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -77,9 +77,6 @@
7777
<SpecificVersion>False</SpecificVersion>
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.DataFactories.Runtime">
81-
<HintPath>..\..\..\packages\Microsoft.DataFactories.Runtime.0.11.1-preview\lib\net45\Microsoft.DataFactories.Runtime.dll</HintPath>
82-
</Reference>
8380
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8481
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
8582
</Reference>
@@ -208,53 +205,53 @@
208205
<None Include="ScenarioTests\DataFactoryTests.ps1">
209206
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
210207
</None>
211-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
212-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
213-
</None>
214208
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGateway.json">
215-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
209+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
216210
</None>
217211
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGatewayWithDataFactoryParameter.json">
218-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213+
</None>
214+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
215+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
219216
</None>
220217
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestCreateDataFactory.json">
221-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
218+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
222219
</None>
223220
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDataFactoryPiping.json">
224-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
221+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
225222
</None>
226223
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDeleteDataFactoryWithDataFactoryParameter.json">
227-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
224+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
228225
</None>
229226
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetNonExistingDataFactory.json">
230-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
227+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
231228
</None>
232229
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHub.json">
233-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
230+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
234231
</None>
235232
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubPiping.json">
236-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
233+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
237234
</None>
238235
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubWithDataFactoryParameter.json">
239-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
236+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
240237
</None>
241238
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedService.json">
242-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
239+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
243240
</None>
244241
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServicePiping.json">
245-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
242+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
246243
</None>
247244
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServiceWithDataFactoryParameter.json">
248-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
249246
</None>
250247
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTable.json">
251-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
248+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
252249
</None>
253250
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTablePiping.json">
254-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
251+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
255252
</None>
256253
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTableWithDataFactoryParameter.json">
257-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
258255
</None>
259256
</ItemGroup>
260257
<ItemGroup>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_CuratedUncycloData.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_UncycloAggregatedData.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_UncyclopediaClickEvents.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DP_Uncyclosamplev2json.json

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/LinkedService_CuratedUncycloData.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/LinkedService_HDIBYOC.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/LinkedService_UncycloAggregatedData.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/LinkedService_UncyclopediaClickEvents.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/linkedService.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
name: "foo2",
3-
properties:
4-
{
5-
type: "CustomLinkedService",
6-
extendedProperties:
7-
{
8-
PropertyBagPropertyName1: "PropertyBagPropertyValue1",
9-
propertyBagPropertyName2: "PropertyBagPropertyValue2"
3+
properties: {
4+
type: "AzureStorage",
5+
typeProperties: {
6+
connectionString: "myfakeconnectionstring"
107
}
118
}
129
}

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/pipeline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
outputs: [ {name: "outputTable"} ],
1212
linkedServiceName: "foo2",
1313
type: "DotNetActivity",
14-
transformation:
14+
typeProperties:
1515
{
1616
assemblyName: "mycode.dll",
1717
entryPoint: "myclassname",

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
22
name: "foo1",
3-
properties:
4-
{
5-
location:
6-
{
7-
type: "CustomLocation",
8-
linkedServiceName: "foo2"
3+
properties: {
4+
type: "CustomDataSet",
5+
typeProperties: {
6+
tableName: "myTable"
97
},
10-
availability:
11-
{
8+
linkedServiceName: "foo2",
9+
availability: {
1210
frequency: "Hour",
1311
interval: 1
1412
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@ Gets the default location for a provider
3636
#>
3737
function Get-ProviderLocation($provider)
3838
{
39-
$location = Get-AzureLocation | where {$_.Name -eq $provider}
40-
if ($location -eq $null) {
41-
"West US"
42-
} else {
43-
$location.Locations[0]
44-
}
39+
# A Dogfood data center for ADF cmdlet mock testing
40+
"Brazil South"
4541
}
4642

4743
<#

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ protected void RunPowerShellTest(params string[] scripts)
6767
}
6868
}
6969

70-
protected DataPipelineManagementClient GetDataPipelineManagementClient()
70+
protected DataFactoryManagementClient GetDataPipelineManagementClient()
7171
{
72-
return TestBase.GetServiceClient<DataPipelineManagementClient>(new CSMTestEnvironmentFactory());
72+
return TestBase.GetServiceClient<DataFactoryManagementClient>(new CSMTestEnvironmentFactory());
7373
}
7474

7575
protected ResourceManagementClient GetResourceManagementClient()

0 commit comments

Comments
 (0)