Skip to content

Commit b6dbc51

Browse files
committed
Merge pull request Azure#1046 from yitao-zhang/adf4.0
ADF cmdlets updated with 4.0.0 Nuget
2 parents 9f124a3 + 1d9bf62 commit b6dbc51

File tree

22 files changed

+4437
-3951
lines changed

22 files changed

+4437
-3951
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
<SpecificVersion>False</SpecificVersion>
6868
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.3.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
72-
<Private>True</Private>
70+
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<SpecificVersion>False</SpecificVersion>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.0.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/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Gets the default location for a provider
3737
function Get-ProviderLocation($provider)
3838
{
3939
# A Dogfood data center for ADF cmdlet mock testing
40-
"East US 2"
40+
"Brazil South"
4141
}
4242

4343
<#

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests/TestCreateDataFactoryGateway.json

Lines changed: 249 additions & 180 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestCreateDataFactory.json

Lines changed: 123 additions & 174 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDataFactoryPiping.json

Lines changed: 1032 additions & 123 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDeleteDataFactoryWithDataFactoryParameter.json

Lines changed: 160 additions & 91 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetNonExistingDataFactory.json

Lines changed: 62 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourcegroups/onesdk3762?api-version=2014-04-01-preview",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDQzMWViYjItNWEwNy00ZDg1LTg1Y2YtN2FmMzRhZTg1ZmY1L3Jlc291cmNlZ3JvdXBzL29uZXNkazM3NjI/YXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
4+
"RequestUri": "/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourcegroups/onesdk8736?api-version=2014-04-01-preview",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjk4ZTlhY2ItODI4Yy00ZWNlLWEzOWEtNzM4NDNmNzc1YTVhL3Jlc291cmNlZ3JvdXBzL29uZXNkazg3MzY/YXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
66
"RequestMethod": "HEAD",
77
"RequestBody": "",
88
"RequestHeaders": {
@@ -28,16 +28,16 @@
2828
"gateway"
2929
],
3030
"x-ms-ratelimit-remaining-subscription-reads": [
31-
"14984"
31+
"14961"
3232
],
3333
"x-ms-request-id": [
34-
"15e701bf-4a66-4991-adfb-bdb71e0c3199"
34+
"fb0a59b1-50f1-4b72-8a90-a6dc38497a93"
3535
],
3636
"x-ms-correlation-request-id": [
37-
"15e701bf-4a66-4991-adfb-bdb71e0c3199"
37+
"fb0a59b1-50f1-4b72-8a90-a6dc38497a93"
3838
],
3939
"x-ms-routing-request-id": [
40-
"CENTRALUS:20150829T000936Z:15e701bf-4a66-4991-adfb-bdb71e0c3199"
40+
"CENTRALUS:20151002T203337Z:fb0a59b1-50f1-4b72-8a90-a6dc38497a93"
4141
],
4242
"Strict-Transport-Security": [
4343
"max-age=31536000; includeSubDomains"
@@ -46,31 +46,31 @@
4646
"no-cache"
4747
],
4848
"Date": [
49-
"Sat, 29 Aug 2015 00:09:35 GMT"
49+
"Fri, 02 Oct 2015 20:33:37 GMT"
5050
]
5151
},
5252
"StatusCode": 404
5353
},
5454
{
55-
"RequestUri": "/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourcegroups/onesdk3762?api-version=2014-04-01-preview",
56-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDQzMWViYjItNWEwNy00ZDg1LTg1Y2YtN2FmMzRhZTg1ZmY1L3Jlc291cmNlZ3JvdXBzL29uZXNkazM3NjI/YXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
55+
"RequestUri": "/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourcegroups/onesdk8736?api-version=2014-04-01-preview",
56+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjk4ZTlhY2ItODI4Yy00ZWNlLWEzOWEtNzM4NDNmNzc1YTVhL3Jlc291cmNlZ3JvdXBzL29uZXNkazg3MzY/YXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
5757
"RequestMethod": "PUT",
58-
"RequestBody": "{\r\n \"location\": \"East US 2\"\r\n}",
58+
"RequestBody": "{\r\n \"location\": \"Brazil South\"\r\n}",
5959
"RequestHeaders": {
6060
"Content-Type": [
6161
"application/json; charset=utf-8"
6262
],
6363
"Content-Length": [
64-
"31"
64+
"34"
6565
],
6666
"User-Agent": [
6767
"Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0"
6868
]
6969
},
70-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourceGroups/onesdk3762\",\r\n \"name\": \"onesdk3762\",\r\n \"location\": \"eastus2\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
70+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourceGroups/onesdk8736\",\r\n \"name\": \"onesdk8736\",\r\n \"location\": \"brazilsouth\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
7171
"ResponseHeaders": {
7272
"Content-Length": [
73-
"174"
73+
"178"
7474
],
7575
"Content-Type": [
7676
"application/json; charset=utf-8"
@@ -82,16 +82,16 @@
8282
"no-cache"
8383
],
8484
"x-ms-ratelimit-remaining-subscription-writes": [
85-
"1191"
85+
"1167"
8686
],
8787
"x-ms-request-id": [
88-
"929ffb4d-4903-45b0-8178-0fcd1dddfef8"
88+
"5fd5dafc-1313-4e5f-a712-408ea7749e90"
8989
],
9090
"x-ms-correlation-request-id": [
91-
"929ffb4d-4903-45b0-8178-0fcd1dddfef8"
91+
"5fd5dafc-1313-4e5f-a712-408ea7749e90"
9292
],
9393
"x-ms-routing-request-id": [
94-
"CENTRALUS:20150829T000936Z:929ffb4d-4903-45b0-8178-0fcd1dddfef8"
94+
"CENTRALUS:20151002T203337Z:5fd5dafc-1313-4e5f-a712-408ea7749e90"
9595
],
9696
"Strict-Transport-Security": [
9797
"max-age=31536000; includeSubDomains"
@@ -100,14 +100,14 @@
100100
"no-cache"
101101
],
102102
"Date": [
103-
"Sat, 29 Aug 2015 00:09:35 GMT"
103+
"Fri, 02 Oct 2015 20:33:37 GMT"
104104
]
105105
},
106106
"StatusCode": 201
107107
},
108108
{
109-
"RequestUri": "/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourceGroups/onesdk3762/resources?api-version=2014-04-01-preview",
110-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDQzMWViYjItNWEwNy00ZDg1LTg1Y2YtN2FmMzRhZTg1ZmY1L3Jlc291cmNlR3JvdXBzL29uZXNkazM3NjIvcmVzb3VyY2VzP2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==",
109+
"RequestUri": "/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourceGroups/onesdk8736/resources?api-version=2014-04-01-preview",
110+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjk4ZTlhY2ItODI4Yy00ZWNlLWEzOWEtNzM4NDNmNzc1YTVhL3Jlc291cmNlR3JvdXBzL29uZXNkazg3MzYvcmVzb3VyY2VzP2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==",
111111
"RequestMethod": "GET",
112112
"RequestBody": "",
113113
"RequestHeaders": {
@@ -130,16 +130,16 @@
130130
"no-cache"
131131
],
132132
"x-ms-ratelimit-remaining-subscription-reads": [
133-
"14983"
133+
"14960"
134134
],
135135
"x-ms-request-id": [
136-
"a0715875-af82-44b5-8e5d-8ebad59d0709"
136+
"b85a2d24-d223-4ed1-addc-1d5fbda69fe2"
137137
],
138138
"x-ms-correlation-request-id": [
139-
"a0715875-af82-44b5-8e5d-8ebad59d0709"
139+
"b85a2d24-d223-4ed1-addc-1d5fbda69fe2"
140140
],
141141
"x-ms-routing-request-id": [
142-
"CENTRALUS:20150829T000936Z:a0715875-af82-44b5-8e5d-8ebad59d0709"
142+
"CENTRALUS:20151002T203337Z:b85a2d24-d223-4ed1-addc-1d5fbda69fe2"
143143
],
144144
"Strict-Transport-Security": [
145145
"max-age=31536000; includeSubDomains"
@@ -148,25 +148,25 @@
148148
"no-cache"
149149
],
150150
"Date": [
151-
"Sat, 29 Aug 2015 00:09:35 GMT"
151+
"Fri, 02 Oct 2015 20:33:37 GMT"
152152
]
153153
},
154154
"StatusCode": 200
155155
},
156156
{
157-
"RequestUri": "/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourcegroups/onesdk3762/providers/Microsoft.Authorization/permissions?api-version=2014-07-01-preview",
158-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDQzMWViYjItNWEwNy00ZDg1LTg1Y2YtN2FmMzRhZTg1ZmY1L3Jlc291cmNlZ3JvdXBzL29uZXNkazM3NjIvcHJvdmlkZXJzL01pY3Jvc29mdC5BdXRob3JpemF0aW9uL3Blcm1pc3Npb25zP2FwaS12ZXJzaW9uPTIwMTQtMDctMDEtcHJldmlldw==",
157+
"RequestUri": "/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourcegroups/onesdk8736/providers/Microsoft.Authorization/permissions?api-version=2015-07-01",
158+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjk4ZTlhY2ItODI4Yy00ZWNlLWEzOWEtNzM4NDNmNzc1YTVhL3Jlc291cmNlZ3JvdXBzL29uZXNkazg3MzYvcHJvdmlkZXJzL01pY3Jvc29mdC5BdXRob3JpemF0aW9uL3Blcm1pc3Npb25zP2FwaS12ZXJzaW9uPTIwMTUtMDctMDE=",
159159
"RequestMethod": "GET",
160160
"RequestBody": "",
161161
"RequestHeaders": {
162162
"User-Agent": [
163-
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/0.9.0.0"
163+
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/1.0.0.0"
164164
]
165165
},
166-
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"actions\": [\r\n \"*\"\r\n ],\r\n \"notActions\": []\r\n }\r\n ]\r\n}",
166+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"actions\": [\r\n \"*\"\r\n ],\r\n \"notActions\": []\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
167167
"ResponseHeaders": {
168168
"Content-Length": [
169-
"45"
169+
"61"
170170
],
171171
"Content-Type": [
172172
"application/json; charset=utf-8"
@@ -177,47 +177,56 @@
177177
"Pragma": [
178178
"no-cache"
179179
],
180-
"Vary": [
181-
"Accept-Encoding"
182-
],
183180
"x-ms-request-id": [
184-
"centralus:6f553361-a860-4598-9bfa-74dc831ea248"
181+
"2c420088-1395-4bf9-89d4-73dce04202ea"
182+
],
183+
"x-ms-gateway-service-instanceid": [
184+
"PASFE_IN_1"
185+
],
186+
"X-Content-Type-Options": [
187+
"nosniff"
188+
],
189+
"Strict-Transport-Security": [
190+
"max-age=31536000; includeSubDomains"
185191
],
186192
"x-ms-ratelimit-remaining-subscription-reads": [
187-
"14991"
193+
"14979"
188194
],
189195
"x-ms-correlation-request-id": [
190-
"97b740b9-7c88-488b-a6e4-7c3a7214bfc9"
196+
"0a61fd94-19e5-4be7-9cca-456ea7a87e1c"
191197
],
192198
"x-ms-routing-request-id": [
193-
"CENTRALUS:20150829T000937Z:97b740b9-7c88-488b-a6e4-7c3a7214bfc9"
194-
],
195-
"Strict-Transport-Security": [
196-
"max-age=31536000; includeSubDomains"
199+
"CENTRALUS:20151002T203338Z:0a61fd94-19e5-4be7-9cca-456ea7a87e1c"
197200
],
198201
"Cache-Control": [
199202
"no-cache"
200203
],
201204
"Date": [
202-
"Sat, 29 Aug 2015 00:09:36 GMT"
205+
"Fri, 02 Oct 2015 20:33:38 GMT"
206+
],
207+
"Server": [
208+
"Microsoft-IIS/8.5"
209+
],
210+
"X-Powered-By": [
211+
"ASP.NET"
203212
]
204213
},
205214
"StatusCode": 200
206215
},
207216
{
208-
"RequestUri": "/subscriptions/4431ebb2-5a07-4d85-85cf-7af34ae85ff5/resourcegroups/onesdk3762/providers/Microsoft.DataFactory/datafactories/onesdk8734?api-version=2015-09-01",
209-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNDQzMWViYjItNWEwNy00ZDg1LTg1Y2YtN2FmMzRhZTg1ZmY1L3Jlc291cmNlZ3JvdXBzL29uZXNkazM3NjIvcHJvdmlkZXJzL01pY3Jvc29mdC5EYXRhRmFjdG9yeS9kYXRhZmFjdG9yaWVzL29uZXNkazg3MzQ/YXBpLXZlcnNpb249MjAxNS0wOS0wMQ==",
217+
"RequestUri": "/subscriptions/698e9acb-828c-4ece-a39a-73843f775a5a/resourcegroups/onesdk8736/providers/Microsoft.DataFactory/datafactories/onesdk2393?api-version=2015-10-01",
218+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjk4ZTlhY2ItODI4Yy00ZWNlLWEzOWEtNzM4NDNmNzc1YTVhL3Jlc291cmNlZ3JvdXBzL29uZXNkazg3MzYvcHJvdmlkZXJzL01pY3Jvc29mdC5EYXRhRmFjdG9yeS9kYXRhZmFjdG9yaWVzL29uZXNkazIzOTM/YXBpLXZlcnNpb249MjAxNS0xMC0wMQ==",
210219
"RequestMethod": "GET",
211220
"RequestBody": "",
212221
"RequestHeaders": {
213222
"x-ms-client-request-id": [
214-
"43d37b94-4b6e-4aaa-9cfe-a5dd3257ea2c"
223+
"fa4fcd2f-cc6f-41e2-9669-086f576f1acb"
215224
],
216225
"User-Agent": [
217-
"Microsoft.Azure.Management.DataFactories.DataFactoryManagementClient/3.0.0.0"
226+
"Microsoft.Azure.Management.DataFactories.DataFactoryManagementClient/4.0.0.0"
218227
]
219228
},
220-
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.DataFactory/dataFactories/onesdk8734' under resource group 'onesdk3762' was not found.\"\r\n }\r\n}",
229+
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.DataFactory/dataFactories/onesdk2393' under resource group 'onesdk8736' was not found.\"\r\n }\r\n}",
221230
"ResponseHeaders": {
222231
"Content-Length": [
223232
"160"
@@ -235,13 +244,13 @@
235244
"gateway"
236245
],
237246
"x-ms-request-id": [
238-
"f85230d8-f5c2-4d46-b3b5-94f750f6b068"
247+
"db981be0-3716-46f1-a570-0da4215c6c63"
239248
],
240249
"x-ms-correlation-request-id": [
241-
"f85230d8-f5c2-4d46-b3b5-94f750f6b068"
250+
"db981be0-3716-46f1-a570-0da4215c6c63"
242251
],
243252
"x-ms-routing-request-id": [
244-
"CENTRALUS:20150829T000937Z:f85230d8-f5c2-4d46-b3b5-94f750f6b068"
253+
"CENTRALUS:20151002T203338Z:db981be0-3716-46f1-a570-0da4215c6c63"
245254
],
246255
"Strict-Transport-Security": [
247256
"max-age=31536000; includeSubDomains"
@@ -250,19 +259,19 @@
250259
"no-cache"
251260
],
252261
"Date": [
253-
"Sat, 29 Aug 2015 00:09:36 GMT"
262+
"Fri, 02 Oct 2015 20:33:38 GMT"
254263
]
255264
},
256265
"StatusCode": 404
257266
}
258267
],
259268
"Names": {
260269
"Test-GetNonExistingDataFactory": [
261-
"onesdk8734",
262-
"onesdk3762"
270+
"onesdk2393",
271+
"onesdk8736"
263272
]
264273
},
265274
"Variables": {
266-
"SubscriptionId": "4431ebb2-5a07-4d85-85cf-7af34ae85ff5"
275+
"SubscriptionId": "698e9acb-828c-4ece-a39a-73843f775a5a"
267276
}
268277
}

0 commit comments

Comments
 (0)