Skip to content

Commit e91315d

Browse files
[Storage] Fix Queue Live Tests (Azure#3354)
1 parent 785db96 commit e91315d

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "rust",
4-
"Tag": "rust/azure_storage_queue_5f6f02d3be",
4+
"Tag": "rust/azure_storage_queue_b234d5c152",
55
"TagPrefix": "rust/azure_storage_queue"
66
}

sdk/storage/azure_storage_queue/tests/queue_client.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,7 @@ fn recorded_test_setup(recording: &Recording) -> (ClientOptions, String) {
455455
recording.instrument(&mut client_options);
456456
let endpoint = format!(
457457
"https://{}.queue.core.windows.net/",
458-
recording
459-
.var("AZURE_QUEUE_STORAGE_ACCOUNT_NAME", None)
460-
.as_str()
458+
recording.var("AZURE_STORAGE_ACCOUNT_NAME", None).as_str()
461459
);
462460

463461
(client_options, endpoint)

sdk/storage/azure_storage_queue/tests/queue_service_client.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,11 @@ fn recorded_test_setup(recording: &Recording) -> (ClientOptions, String, String)
228228
recording.instrument(&mut client_options);
229229
let endpoint = format!(
230230
"https://{}.queue.core.windows.net/",
231-
recording
232-
.var("AZURE_QUEUE_STORAGE_ACCOUNT_NAME", None)
233-
.as_str()
231+
recording.var("AZURE_STORAGE_ACCOUNT_NAME", None).as_str()
234232
);
235233
let secondary_endpoint = format!(
236234
"https://{}-secondary.queue.core.windows.net/",
237-
recording
238-
.var("AZURE_QUEUE_STORAGE_ACCOUNT_NAME", None)
239-
.as_str()
235+
recording.var("AZURE_STORAGE_ACCOUNT_NAME", None).as_str()
240236
);
241237

242238
(client_options, endpoint, secondary_endpoint)

sdk/storage/test-resources.bicep

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ param baseName string = resourceGroup().name
55
param testApplicationOid string
66
param location string = resourceGroup().location
77

8-
var blobDataContributorRoleId = 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'
98
var blobDataOwnerRoleId = 'b7e6dc6d-f1e8-4753-8033-0f276bb0955b'
9+
var queueDataContributorRoleId = '974c5e8b-45b9-4653-ba55-5f855dd0fb88'
1010
var encryption = {
1111
keySource: 'Microsoft.Storage'
1212
services: {
@@ -25,18 +25,18 @@ var networkAcls = {
2525
virtualNetworkRules: []
2626
}
2727

28-
resource blobDataContributor 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
29-
name: guid(blobDataContributorRoleId, resourceGroup().id)
28+
resource blobDataOwner 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
29+
name: guid(blobDataOwnerRoleId, resourceGroup().id)
3030
properties: {
31-
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', blobDataContributorRoleId)
31+
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', blobDataOwnerRoleId)
3232
principalId: testApplicationOid
3333
}
3434
}
3535

36-
resource blobDataOwner 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
37-
name: guid(blobDataOwnerRoleId, resourceGroup().id)
36+
resource queueDataContributor 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
37+
name: guid(queueDataContributorRoleId, resourceGroup().id)
3838
properties: {
39-
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', blobDataOwnerRoleId)
39+
roleDefinitionId: resourceId('Microsoft.Authorization/roleDefinitions', queueDataContributorRoleId)
4040
principalId: testApplicationOid
4141
}
4242
}

0 commit comments

Comments
 (0)