Skip to content

Commit f4c597e

Browse files
jeskewjeskew
committed
Manually patch line endings on test artifact and re-record
1 parent 8fd6723 commit f4c597e

File tree

2 files changed

+57
-59
lines changed

2 files changed

+57
-59
lines changed

‎src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_create_template_specs.yaml‎

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ interactions:
1313
ParameterSetName:
1414
- -g -n -v -l -f --description --version-description
1515
User-Agent:
16-
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
16+
- AZURECLI/2.75.0 azsdk-python-core/1.35.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
1717
method: GET
18-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0?api-version=2022-02-01
18+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0?api-version=2021-05-01
1919
response:
2020
body:
2121
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0''
@@ -29,7 +29,7 @@ interactions:
2929
content-type:
3030
- application/json; charset=utf-8
3131
date:
32-
- Mon, 23 Jun 2025 13:15:30 GMT
32+
- Mon, 28 Jul 2025 14:02:25 GMT
3333
expires:
3434
- '-1'
3535
pragma:
@@ -43,7 +43,7 @@ interactions:
4343
x-ms-failure-cause:
4444
- gateway
4545
x-msedge-ref:
46-
- 'Ref A: D628529BCDDC460DBCA3C04ECB6F7AD2 Ref B: BN1AA2051013025 Ref C: 2025-06-23T13:15:30Z'
46+
- 'Ref A: BB3758F987344F5D8076C526D3995BB7 Ref B: BL2AA2010205053 Ref C: 2025-07-28T14:02:26Z'
4747
status:
4848
code: 404
4949
message: Not Found
@@ -61,9 +61,9 @@ interactions:
6161
ParameterSetName:
6262
- -g -n -v -l -f --description --version-description
6363
User-Agent:
64-
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
64+
- AZURECLI/2.75.0 azsdk-python-core/1.35.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
6565
method: GET
66-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2022-02-01
66+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2021-05-01
6767
response:
6868
body:
6969
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002''
@@ -77,7 +77,7 @@ interactions:
7777
content-type:
7878
- application/json; charset=utf-8
7979
date:
80-
- Mon, 23 Jun 2025 13:15:30 GMT
80+
- Mon, 28 Jul 2025 14:02:26 GMT
8181
expires:
8282
- '-1'
8383
pragma:
@@ -91,7 +91,7 @@ interactions:
9191
x-ms-failure-cause:
9292
- gateway
9393
x-msedge-ref:
94-
- 'Ref A: E5F1C1BA263C4F7A9FCEF58E7E8CA626 Ref B: BN1AA2051015045 Ref C: 2025-06-23T13:15:30Z'
94+
- 'Ref A: 8EA597B3A75247B08410E69936F0504A Ref B: BL2AA2010205037 Ref C: 2025-07-28T14:02:26Z'
9595
status:
9696
code: 404
9797
message: Not Found
@@ -114,28 +114,27 @@ interactions:
114114
ParameterSetName:
115115
- -g -n -v -l -f --description --version-description
116116
User-Agent:
117-
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
117+
- AZURECLI/2.75.0 azsdk-python-core/1.35.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
118118
method: PUT
119-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2022-02-01
119+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2021-05-01
120120
response:
121121
body:
122122
string: "{\r\n \"location\": \"westus\",\r\n \"tags\": {},\r\n \"properties\":
123123
{\r\n \"description\": \"AzCLI test root template spec\"\r\n },\r\n \"systemData\":
124-
{\r\n \"createdBy\": \"anthony.ct.martin@gmail.com\",\r\n \"createdByType\":
125-
\"User\",\r\n \"createdAt\": \"2025-06-23T13:15:32.0669075Z\",\r\n \"lastModifiedBy\":
126-
\"anthony.ct.martin@gmail.com\",\r\n \"lastModifiedByType\": \"User\",\r\n
127-
\ \"lastModifiedAt\": \"2025-06-23T13:15:32.0669075Z\"\r\n },\r\n \"id\":
128-
\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002\",\r\n
124+
{\r\n \"createdBy\": \"test@example.com\",\r\n \"createdByType\": \"User\",\r\n
125+
\ \"createdAt\": \"2025-07-28T14:02:27.6128306Z\",\r\n \"lastModifiedBy\":
126+
\"test@example.com\",\r\n \"lastModifiedByType\": \"User\",\r\n \"lastModifiedAt\":
127+
\"2025-07-28T14:02:27.6128306Z\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002\",\r\n
129128
\ \"type\": \"Microsoft.Resources/templateSpecs\",\r\n \"name\": \"cli-test-create-template-spec000002\"\r\n}"
130129
headers:
131130
cache-control:
132131
- no-cache
133132
content-length:
134-
- '704'
133+
- '682'
135134
content-type:
136135
- application/json; charset=utf-8
137136
date:
138-
- Mon, 23 Jun 2025 13:15:31 GMT
137+
- Mon, 28 Jul 2025 14:02:27 GMT
139138
expires:
140139
- '-1'
141140
pragma:
@@ -147,13 +146,13 @@ interactions:
147146
x-content-type-options:
148147
- nosniff
149148
x-ms-operation-identifier:
150-
- tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/0b785bcc-fe0a-42d4-9a86-254835f0020b
149+
- tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47,objectId=2c426789-7d96-4395-8062-b5680e1ea8d4/westus/329db060-ad43-4663-9f96-7af038f203c2
151150
x-ms-ratelimit-remaining-subscription-global-writes:
152-
- '2999'
151+
- '11999'
153152
x-ms-ratelimit-remaining-subscription-writes:
154-
- '199'
153+
- '799'
155154
x-msedge-ref:
156-
- 'Ref A: 6C0BF96198A846D5A472521BF3B7239C Ref B: BN1AA2051012037 Ref C: 2025-06-23T13:15:30Z'
155+
- 'Ref A: 7CEF851A2CF74D42943FA3DD669BCAD3 Ref B: MNZ221060610009 Ref C: 2025-07-28T14:02:26Z'
157156
status:
158157
code: 201
159158
message: Created
@@ -223,7 +222,7 @@ interactions:
223222
null}}, "provider": "[split(parameters(''resource''), ''/'')[0]]", "resourceType":
224223
"[replace(parameters(''resource''), concat(variables(''provider''), ''/''),
225224
'''')]", "hyphenedName": "[format(''[0]-[1]-[2]-[3]-[4]-[5]'',\n parameters(''customer''),\n variables(''environments'')[parameters(''environment'')],\n variables(''locations'')[parameters(''location'')],\n parameters(''group''),\n parameters(''service''),\n if(equals(parameters(''kind''),
226-
''''), \n variables(''resources'')[variables(''provider'')][variables(''resourceType'')],\n variables(''resources'')[variables(''provider'')][variables(''resourceType'')][parameters(''kind'')]))]",
225+
''''),\n variables(''resources'')[variables(''provider'')][variables(''resourceType'')],\n variables(''resources'')[variables(''provider'')][variables(''resourceType'')][parameters(''kind'')]))]",
227226
"removeOptionalsFromHyphenedName": "[replace(variables(''hyphenedName''), ''--'',
228227
''-'')]", "isInstanceCount": "[greater(parameters(''instance''), -1)]", "hyphenedNameAfterInstanceCount":
229228
"[if(variables(''isInstanceCount''),\n format(''[0]-[1]'',
@@ -241,15 +240,15 @@ interactions:
241240
Connection:
242241
- keep-alive
243242
Content-Length:
244-
- '6734'
243+
- '6733'
245244
Content-Type:
246245
- application/json
247246
ParameterSetName:
248247
- -g -n -v -l -f --description --version-description
249248
User-Agent:
250-
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
249+
- AZURECLI/2.75.0 azsdk-python-core/1.35.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
251250
method: PUT
252-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0?api-version=2022-02-01
251+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0?api-version=2021-05-01
253252
response:
254253
body:
255254
string: "{\r\n \"location\": \"westus\",\r\n \"tags\": {},\r\n \"properties\":
@@ -360,7 +359,7 @@ interactions:
360359
\ parameters('customer'),\\n variables('environments')[parameters('environment')],\\n
361360
\ variables('locations')[parameters('location')],\\n
362361
\ parameters('group'),\\n parameters('service'),\\n
363-
\ if(equals(parameters('kind'), ''), \\n variables('resources')[variables('provider')][variables('resourceType')],\\n
362+
\ if(equals(parameters('kind'), ''),\\n variables('resources')[variables('provider')][variables('resourceType')],\\n
364363
\ variables('resources')[variables('provider')][variables('resourceType')][parameters('kind')]))]\",\r\n
365364
\ \"removeOptionalsFromHyphenedName\": \"[replace(variables('hyphenedName'),
366365
'--', '-')]\",\r\n \"isInstanceCount\": \"[greater(parameters('instance'),
@@ -372,22 +371,21 @@ interactions:
372371
''))]\"\r\n },\r\n \"resources\": [],\r\n \"outputs\": {\r\n
373372
\ \"name\": {\r\n \"type\": \"string\",\r\n \"value\":
374373
\"[toLower(variables('name'))]\"\r\n }\r\n }\r\n }\r\n },\r\n
375-
\ \"systemData\": {\r\n \"createdBy\": \"anthony.ct.martin@gmail.com\",\r\n
376-
\ \"createdByType\": \"User\",\r\n \"createdAt\": \"2025-06-23T13:15:33.2532932Z\",\r\n
377-
\ \"lastModifiedBy\": \"anthony.ct.martin@gmail.com\",\r\n \"lastModifiedByType\":
378-
\"User\",\r\n \"lastModifiedAt\": \"2025-06-23T13:15:33.2532932Z\"\r\n
379-
\ },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0\",\r\n
374+
\ \"systemData\": {\r\n \"createdBy\": \"test@example.com\",\r\n \"createdByType\":
375+
\"User\",\r\n \"createdAt\": \"2025-07-28T14:02:28.3216671Z\",\r\n \"lastModifiedBy\":
376+
\"test@example.com\",\r\n \"lastModifiedByType\": \"User\",\r\n \"lastModifiedAt\":
377+
\"2025-07-28T14:02:28.3216671Z\"\r\n },\r\n \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0\",\r\n
380378
\ \"type\": \"Microsoft.Resources/templateSpecs/versions\",\r\n \"name\":
381379
\"1.0\"\r\n}"
382380
headers:
383381
cache-control:
384382
- no-cache
385383
content-length:
386-
- '10078'
384+
- '10055'
387385
content-type:
388386
- application/json; charset=utf-8
389387
date:
390-
- Mon, 23 Jun 2025 13:15:33 GMT
388+
- Mon, 28 Jul 2025 14:02:28 GMT
391389
expires:
392390
- '-1'
393391
pragma:
@@ -399,13 +397,13 @@ interactions:
399397
x-content-type-options:
400398
- nosniff
401399
x-ms-operation-identifier:
402-
- tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/e7e0bd1d-b671-45d5-9409-b0ce7d67e5f9
400+
- tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47,objectId=2c426789-7d96-4395-8062-b5680e1ea8d4/southcentralus/8112f279-84c5-4247-b895-1e4d1a346687
403401
x-ms-ratelimit-remaining-subscription-global-writes:
404-
- '2999'
402+
- '11999'
405403
x-ms-ratelimit-remaining-subscription-writes:
406-
- '199'
404+
- '799'
407405
x-msedge-ref:
408-
- 'Ref A: A5508F236D894B0C90522549D0A6B294 Ref B: BN1AA2051012019 Ref C: 2025-06-23T13:15:32Z'
406+
- 'Ref A: 8099181DD39541A29A2419BC05B83DD5 Ref B: BL2AA2010205035 Ref C: 2025-07-28T14:02:27Z'
409407
status:
410408
code: 201
411409
message: Created
@@ -425,9 +423,9 @@ interactions:
425423
ParameterSetName:
426424
- --template-spec --yes
427425
User-Agent:
428-
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
426+
- AZURECLI/2.75.0 azsdk-python-core/1.35.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
429427
method: DELETE
430-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2022-02-01
428+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2021-05-01
431429
response:
432430
body:
433431
string: ''
@@ -437,7 +435,7 @@ interactions:
437435
content-length:
438436
- '0'
439437
date:
440-
- Mon, 23 Jun 2025 13:15:35 GMT
438+
- Mon, 28 Jul 2025 14:02:29 GMT
441439
expires:
442440
- '-1'
443441
pragma:
@@ -449,13 +447,13 @@ interactions:
449447
x-content-type-options:
450448
- nosniff
451449
x-ms-operation-identifier:
452-
- tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/d3f421bc-9563-4502-9beb-7ad2c70df903
450+
- tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47,objectId=2c426789-7d96-4395-8062-b5680e1ea8d4/eastus2/d3a77352-c9cf-4d14-ad4d-f6c35881e877
453451
x-ms-ratelimit-remaining-subscription-deletes:
454-
- '199'
452+
- '799'
455453
x-ms-ratelimit-remaining-subscription-global-deletes:
456-
- '2999'
454+
- '11999'
457455
x-msedge-ref:
458-
- 'Ref A: CA08CBD56C914612B258CC796EBA419E Ref B: BN1AA2051015019 Ref C: 2025-06-23T13:15:33Z'
456+
- 'Ref A: D9CCDC12CCEF4B4C919C05C31E502748 Ref B: BL2AA2010204021 Ref C: 2025-07-28T14:02:28Z'
459457
status:
460458
code: 200
461459
message: OK

‎src/azure-cli/azure/cli/command_modules/resource/tests/latest/template_spec_with_multiline_strings.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"int",
2424
"stage",
2525
"prod",
26-
26+
2727
// Long
2828
"development",
2929
"testing",
@@ -117,23 +117,23 @@
117117
},
118118
"functions": [],
119119
"variables": {
120-
120+
121121
"environments": {
122122
// Short
123123
"dev": "d",
124124
"test": "t",
125125
"int": "i",
126126
"stage": "s",
127127
"prod": "p",
128-
128+
129129
// Long
130130
"development": "d",
131131
"testing": "t",
132132
"integration": "i",
133133
"staging": "s",
134134
"production": "p"
135135
},
136-
136+
137137
"locations": {
138138
"eastasia": "ase",
139139
"southeastasia": "asse",
@@ -169,12 +169,12 @@
169169
"southafricawest": "zaw",
170170
"global": "global"
171171
},
172-
173-
/*
172+
173+
/*
174174
comment.
175175
comment.
176176
comment.
177-
*/
177+
*/
178178
"resources": {
179179
"Microsoft.Web": {
180180
"publishingUsers": null,
@@ -237,28 +237,28 @@
237237
"serverFarms/firstPartyApps/keyVaultSettings": null
238238
}
239239
},
240-
240+
241241
"provider": "[split(parameters('resource'), '/')[0]]",
242-
242+
243243
"resourceType": "[replace(parameters('resource'), concat(variables('provider'), '/'), '')]",
244-
244+
245245
"hyphenedName": "[format('[0]-[1]-[2]-[3]-[4]-[5]',
246246
parameters('customer'),
247247
variables('environments')[parameters('environment')],
248248
variables('locations')[parameters('location')],
249249
parameters('group'),
250250
parameters('service'),
251-
if(equals(parameters('kind'), ''),
251+
if(equals(parameters('kind'), ''),
252252
variables('resources')[variables('provider')][variables('resourceType')],
253253
variables('resources')[variables('provider')][variables('resourceType')][parameters('kind')]))]",
254-
254+
255255
"removeOptionalsFromHyphenedName": "[replace(variables('hyphenedName'), '--', '-')]",
256-
256+
257257
"isInstanceCount": "[greater(parameters('instance'), -1)]",
258258
"hyphenedNameAfterInstanceCount": "[if(variables('isInstanceCount'),
259259
format('[0]-[1]', variables('removeOptionalsFromHyphenedName'), string(parameters('instance'))),
260260
variables('removeOptionalsFromHyphenedName'))]",
261-
261+
262262
"name": "[if(parameters('useHyphen'),
263263
variables('hyphenedNameAfterInstanceCount'),
264264
replace(variables('hyphenedNameAfterInstanceCount'), '-', ''))]"
@@ -271,4 +271,4 @@
271271
"value": "[toLower(variables('name'))]"
272272
}
273273
}
274-
}
274+
}

0 commit comments

Comments
 (0)