Skip to content

Commit 1cdf789

Browse files
authored
[storage] add DFS_STORAGE_CONNECTION_STRING to test-resource.json output (Azure#13655)
* add DFS_STORAGE_CONNECTION_STRING to test-resource.json output * cors wip * wip: .only * set DFS_SOFT_DELETE_ACCOUNT_* envs in playback mode
1 parent ea1b3fc commit 1cdf789

File tree

6 files changed

+158
-131
lines changed

6 files changed

+158
-131
lines changed

sdk/storage/storage-file-datalake/recordings/browsers/datalakeserviceclient/recording_undelete_and_list_deleted_file_system_should_work.json

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/storage/storage-file-datalake/recordings/browsers/datalakeserviceclient/recording_undelete_file_system_to_a_new_name.json

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/storage/storage-file-datalake/recordings/node/datalakeserviceclient/recording_undelete_and_list_deleted_file_system_should_work.js

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/storage/storage-file-datalake/recordings/node/datalakeserviceclient/recording_undelete_file_system_to_a_new_name.js

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/storage/storage-file-datalake/test/utils/testutils.common.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ export const recorderEnvSetup: RecorderEnvironmentSetup = {
2121
// Comment following line to skip user delegation key/SAS related cases in record and play
2222
// which depends on this environment variable
2323
DFS_ACCOUNT_TOKEN: `${mockAccountKey}`,
24+
DFS_SOFT_DELETE_ACCOUNT_NAME: `${mockAccountName}`,
25+
DFS_SOFT_DELETE_ACCOUNT_KEY: `${mockAccountKey}`,
26+
DFS_SOFT_DELETE_ACCOUNT_SAS: `${mockAccountKey}`,
2427
AZURE_CLIENT_ID: `${mockAccountKey}`,
2528
AZURE_TENANT_ID: `${mockAccountKey}`,
2629
AZURE_CLIENT_SECRET: `${mockAccountKey}`

sdk/storage/test-resources.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,26 @@
228228
"containerDeleteRetentionPolicy": {
229229
"enabled": true,
230230
"days": 7
231+
},
232+
"cors": {
233+
"corsRules": [
234+
{
235+
"allowedOrigins": ["*"],
236+
"allowedMethods": [
237+
"DELETE",
238+
"GET",
239+
"HEAD",
240+
"MERGE",
241+
"POST",
242+
"OPTIONS",
243+
"PUT",
244+
"PATCH"
245+
],
246+
"maxAgeInSeconds": 86400,
247+
"exposedHeaders": ["*"],
248+
"allowedHeaders": ["*"]
249+
}
250+
]
231251
}
232252
}
233253
}
@@ -399,6 +419,10 @@
399419
"type": "string",
400420
"value": "[concat('?', listAccountSas(variables('datalakeAccountNameTidy'), variables('storageApiVersion'), variables('accountSasProperties')).accountSasToken)]"
401421
},
422+
"DFS_STORAGE_CONNECTION_STRING": {
423+
"type": "string",
424+
"value": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('dataLakeAccountName'), ';AccountKey=', listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('storageApiVersion')).keys[0].value, ';EndpointSuffix=', parameters('storageEndpointSuffix'))]"
425+
},
402426
"DFS_SOFT_DELETE_ACCOUNT_NAME": {
403427
"type": "string",
404428
"value": "[variables('datalakeSoftDeleteAccountName')]"

0 commit comments

Comments
 (0)