Skip to content

Role commands bugbash fixes #1142

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
ogail merged 2 commits into from
Oct 21, 2015
Merged

Role commands bugbash fixes #1142

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
9182a58
Bugbash fixes
shuagarw Oct 21, 2015
5ee69cc
Merge branch 'dev' of github.com:Azure/azure-powershell into release-…
shuagarw Oct 21, 2015
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: 2 additions & 0 deletions src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ internal static class ParameterSet

public const string RoleDefinitionName = "RoleDefinitionNameParameterSet";

public const string RoleDefinitionId = "RoleDefinitionIdParameterSet";

public const string RoleIdWithScopeAndObjectId = "RoleIdWithScopeAndObjectIdParameterSet";

public const string RoleDefinitionCustom = "RoleDefinitionCustomParameterSet";
Expand Down
18 changes: 14 additions & 4 deletions src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame
Guid principalId = ActiveDirectoryClient.GetObjectId(parameters.ADObjectFilter);
Guid roleAssignmentId = RoleAssignmentNames.Count == 0 ? Guid.NewGuid() : RoleAssignmentNames.Dequeue();
string roleDefinitionId = !string.IsNullOrEmpty(parameters.RoleDefinitionName)
? GetRoleRoleDefinition(parameters.RoleDefinitionName).Id
? AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(subscriptionId, GetRoleRoleDefinition(parameters.RoleDefinitionName).Id)
: parameters.RoleDefinitionId;

RoleAssignmentCreateParameters createParameters = new RoleAssignmentCreateParameters
{
Properties = new RoleAssignmentProperties
{
PrincipalId = principalId,
RoleDefinitionId = AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(subscriptionId, roleDefinitionId)
RoleDefinitionId = roleDefinitionId
}
};

Expand Down Expand Up @@ -315,14 +315,24 @@ public PSRoleDefinition RemoveRoleDefinition(Guid roleDefinitionId, string subsc
PSRoleDefinition roleDefinition = this.GetRoleDefinition(roleDefinitionId);
if (roleDefinition != null)
{
AuthorizationManagementClient.RoleDefinitions.Delete(roleDefinitionFullyQualifiedId);
return AuthorizationManagementClient.RoleDefinitions.Delete(roleDefinitionFullyQualifiedId).RoleDefinition.ToPSRoleDefinition();
}
else
{
throw new KeyNotFoundException(string.Format(ProjectResources.RoleDefinitionWithIdNotFound, id));
}
}

return roleDefinition;
/// <summary>
/// Deletes a role definition based on the name.
/// </summary>
/// <param name="roleDefinitionName">The role definition name.</param>
/// <returns>The deleted role definition.</returns>
public PSRoleDefinition RemoveRoleDefinition(string roleDefinitionName, string subscriptionId)
{
PSRoleDefinition roleDefinition = this.GetRoleRoleDefinition(roleDefinitionName);
string roleDefinitionFullyQualifiedId = AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(subscriptionId, roleDefinition.Id);
return AuthorizationManagementClient.RoleDefinitions.Delete(roleDefinitionFullyQualifiedId).RoleDefinition.ToPSRoleDefinition();
}

/// <summary>
Expand Down
10 changes: 10 additions & 0 deletions ...urceManager/Resources/Commands.Resources/RoleDefinitions/GetAzureRoleDefinitionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.Azure.Commands.Resources.Models;
using Microsoft.Azure.Commands.Resources.Models.ActiveDirectory;
using Microsoft.Azure.Commands.Resources.Models.Authorization;
using System;
using System.Collections.Generic;
using System.Management.Automation;

Expand All @@ -31,6 +32,11 @@ public class GetAzureRoleDefinitionCommand : ResourcesBaseCmdlet
[ValidateNotNullOrEmpty]
public string Name { get; set; }

[Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.RoleDefinitionId,
HelpMessage = "Role definition id.")]
[ValidateNotNullOrEmpty]
public Guid Id { get; set; }

[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.RoleDefinitionCustom,
HelpMessage = "If specified, only displays the custom created roles in the directory.")]
public SwitchParameter Custom { get; set; }
Expand All @@ -41,6 +47,10 @@ protected override void ProcessRecord()
{
WriteObject(PoliciesClient.FilterRoleDefinitionsByCustom(), enumerateCollection: true);
}
else if (Id != Guid.Empty)
{
WriteObject(PoliciesClient.GetRoleDefinition(Id));
}
else
{
WriteObject(PoliciesClient.FilterRoleDefinitions(Name), enumerateCollection: true);
Expand Down
21 changes: 19 additions & 2 deletions ...eManager/Resources/Commands.Resources/RoleDefinitions/RemoveAzureRoleDefinitionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

using System.Management.Automation;
using Microsoft.Azure.Commands.Resources.Models;
using Microsoft.Azure.Commands.Resources.Models.ActiveDirectory;
using Microsoft.Azure.Commands.Resources.Models.Authorization;
using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
using System;
Expand All @@ -26,10 +27,16 @@ namespace Microsoft.Azure.Commands.Resources
[Cmdlet(VerbsCommon.Remove, "AzureRmRoleDefinition"), OutputType(typeof(bool))]
public class RemoveAzureRoleDefinitionCommand : ResourcesBaseCmdlet
{
[Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.RoleDefinitionId,
HelpMessage = "Role definition id")]
[ValidateNotNullOrEmpty]
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Role definition id.")]
public Guid Id { get; set; }

[Parameter(Position = 0, Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.RoleDefinitionName,
HelpMessage = "Role definition name. For e.g. Reader, Contributor, Virtual Machine Contributor.")]
[ValidateNotNullOrEmpty]
public string Name { get; set; }

[Parameter(Mandatory = false)]
public SwitchParameter Force { get; set; }

Expand All @@ -39,13 +46,23 @@ public class RemoveAzureRoleDefinitionCommand : ResourcesBaseCmdlet
protected override void ProcessRecord()
{
PSRoleDefinition roleDefinition = null;
Action action = null;

if(Id != Guid.Empty)
{
action = (() => roleDefinition = PoliciesClient.RemoveRoleDefinition(Id, DefaultProfile.Context.Subscription.Id.ToString()));
}
else
{
action = (() => roleDefinition = PoliciesClient.RemoveRoleDefinition(Name, DefaultProfile.Context.Subscription.Id.ToString()));
}

ConfirmAction(
Force.IsPresent,
string.Format(ProjectResources.RemoveRoleDefinition, Id),
ProjectResources.RemoveRoleDefinition,
Id.ToString(),
() => roleDefinition = PoliciesClient.RemoveRoleDefinition(Id, DefaultProfile.Context.Subscription.Id.ToString()));
action);

if (PassThru)
{
Expand Down