Skip to content

Storage kind fix roleassignment namespacefix #42320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2024
+11 −11
Merged

Storage kind fix roleassignment namespacefix #42320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac97f13
Fixes bug with StorageAccount not using kind argument.
mitchdenny Mar 1, 2024
09acb8b
regen bicep
JoshLove-msft Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/provisioning/Azure.Provisioning/src/authorization/RoleAssignment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Azure.Provisioning.Authorization
/// </summary>
public class RoleAssignment : Resource<RoleAssignmentData>
{
private static readonly ResourceType ResourceType = "Microsoft.Resources/roleAssignments";
private static readonly ResourceType ResourceType = "Microsoft.Authorization/roleAssignments";
private static readonly ResourceType RoleDefinitionResourceType = "Microsoft.Authorization/roleDefinitions";

private const string SubscriptionResourceIdFunction = "subscriptionResourceId";
Expand Down
2 changes: 1 addition & 1 deletion sdk/provisioning/Azure.Provisioning/src/storage/StorageAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public StorageAccount(IConstruct scope, StorageKind kind, StorageSkuName sku, Re
resourceType: ResourceTypeName,
location: Environment.GetEnvironmentVariable("AZURE_LOCATION") ?? AzureLocation.WestUS,
sku: new StorageSku(sku),
kind: StorageKind.StorageV2))
kind: kind))
{
AssignProperty(data => data.Name, GetAzureName(scope, name));
}
Expand Down
4 changes: 2 additions & 2 deletions ...ovisioning/Azure.Provisioning/tests/Infrastructure/RoleAssignmentWithParameter/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resource storageAccount_YRiDhR43q 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand All @@ -25,7 +25,7 @@ resource blobService_lnEDXlX5c 'Microsoft.Storage/storageAccounts/blobServices@2
}
}

resource roleAssignment_ZBWGKDk4O 'Microsoft.Resources/roleAssignments@2022-04-01' = {
resource roleAssignment_ZBWGKDk4O 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_YRiDhR43q
name: guid('storageAccount_YRiDhR43q', principalId, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
properties: {
Expand Down
4 changes: 2 additions & 2 deletions ...frastructure/RoleAssignmentWithoutParameter/resources/rg_TEST_module/rg_TEST_module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource storageAccount_melvnlpF2 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand All @@ -17,7 +17,7 @@ resource blobService_NVMDcYVF9 'Microsoft.Storage/storageAccounts/blobServices@2
}
}

resource roleAssignment_lDOSGTMrV 'Microsoft.Resources/roleAssignments@2022-04-01' = {
resource roleAssignment_lDOSGTMrV 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_melvnlpF2
name: guid('storageAccount_melvnlpF2', '00000000-0000-0000-0000-000000000000', subscriptionResourceId('00000000-0000-0000-0000-000000000000', 'Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
properties: {
Expand Down
4 changes: 2 additions & 2 deletions ...rovisioning/tests/Infrastructure/RoleAssignmentWithoutParameterInteractiveMode/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource storageAccount_YRiDhR43q 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand All @@ -22,7 +22,7 @@ resource blobService_lnEDXlX5c 'Microsoft.Storage/storageAccounts/blobServices@2
}
}

resource roleAssignment_ZBWGKDk4O 'Microsoft.Resources/roleAssignments@2022-04-01' = {
resource roleAssignment_ZBWGKDk4O 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
scope: storageAccount_YRiDhR43q
name: guid('storageAccount_YRiDhR43q', '00000000-0000-0000-0000-000000000000', subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe'))
properties: {
Expand Down
2 changes: 1 addition & 1 deletion ...ng/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST_module/rg_TEST_module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource storageAccount_melvnlpF2 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaultsInPromptMode/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource storageAccount_YRiDhR43q 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ng/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST_module/rg_TEST_module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource storageAccount_melvnlpF2 'Microsoft.Storage/storageAccounts@2022-09-01'
sku: {
name: 'Premium_LRS'
}
kind: 'StorageV2'
kind: 'BlockBlobStorage'
properties: {
}
}
Expand Down