Merge pull request #7228 from bganapa/role-fix

Fix for New-AzureRmRoleAssignment and Remove-AzureRmRoleAssignment fo…

Author: Maddie Clayton

src/StackAdmin/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs

@@ -165,14 +165,25 @@ public List<PSRoleDefinition> FilterRoleDefinitionsByCustom(string scope, bool s
         public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parameters)
         {
             Guid principalId = ActiveDirectoryClient.GetObjectId(parameters.ADObjectFilter);
+            string principalIdStr = null;
+
+            if (principalId == Guid.Empty)
+            {
+                principalIdStr = ActiveDirectoryClient.GetAdfsObjectId(parameters.ADObjectFilter);
+            }
+            else
+            {
+                principalIdStr = principalId.ToString();
+            }
+
             Guid roleAssignmentId = RoleAssignmentNames.Count == 0 ? Guid.NewGuid() : RoleAssignmentNames.Dequeue();
             string scope = parameters.Scope;
             string roleDefinitionId = !string.IsNullOrEmpty(parameters.RoleDefinitionName)
                 ? AuthorizationHelper.ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid(scope, GetSingleRoleDefinitionByName(parameters.RoleDefinitionName, scope).Id)
                 : AuthorizationHelper.ConstructFullyQualifiedRoleDefinitionIdFromScopeAndIdAsGuid(scope, parameters.RoleDefinitionId);
             var createProperties = new RoleAssignmentProperties
             {
-                PrincipalId = principalId.ToString(),
+                PrincipalId = principalIdStr,
                 RoleDefinitionId = roleDefinitionId
             };
             var createParameters = new RoleAssignmentCreateParameters(createProperties);

src/StackAdmin/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs

@@ -175,7 +175,7 @@ public override void ExecuteCmdlet()
                 ADObjectFilter = new ADObjectFilterOptions
                 {
                     UPN = SignInName,
-                    Id =  ObjectId.ToString(),
+                    Id =  ObjectId,
                     SPN = ServicePrincipalName
                 },
                 ResourceIdentifier = new ResourceIdentifier()

tools/CleanupBuild.ps1

@@ -77,7 +77,7 @@ foreach($RMPath in $resourceManagerPaths)
             $removedScripts = Get-ChildItem -Path "$($RMFolder.FullName)\StartupScripts" -Filter "*.ps1" | where { $_.FullName -ne $scriptName }
             $removedScripts | % { Write-Verbose "Removing $($_.FullName)"; Remove-Item $_.FullName -Force }
         }
-        $removedPsd1 = Get-ChildItem -Path "$($RMFolder.FullName)" -Filter "*.psd1" -Recurse | where { $_.FullName -ne "$($RMFolder.FullName)$([IO.Path]::DirectorySeparatorChar)$($RMFolder.Name).psd1" }
+        $removedPsd1 = Get-ChildItem -Path "$($RMFolder.FullName)" -Filter "*.psd1" | where { $_.FullName -ne "$($RMFolder.FullName)$([IO.Path]::DirectorySeparatorChar)$($RMFolder.Name).psd1" }
         $removedPsd1 | % { Write-Verbose "Removing $($_.FullName)"; Remove-Item $_.FullName -Force }
     }
 }

tools/Modules/Run-UnitTests.ps1

@@ -117,16 +117,9 @@ if ($Scope -in $AzureScopes) {
 
 if ($Scope -in $StackScopes) {
 
-    # Download and add AzureRM.Profile 3.4.1 to PSModulePath
-    [System.String]$SavePath = (Join-Path -Path $PSScriptRoot -ChildPath "tmp")
-    if (-not(Test-Path $SavePath)) {
-        New-Item -Path $SavePath -ItemType Directory -Force | Out-Null
-        Save-Module -Name AzureRM.Profile -RequiredVersion 3.4.1 -Repository PSGallery -Path $SavePath | Out-Null
-        Save-Module -Name AzureRM.Resources -RequiredVersion 4.4.1 -Repository PSGallery -Path $SavePath | Out-Null
-    }
-
-    $oldModulePath = $env:PSModulePath.Clone()
-    [Environment]::SetEnvironmentVariable("PSModulePath","$env:PSModulePath;$SavePath")
+    $ARMRoot = "$PSScriptRoot\..\..\src\Stack\$BuildConfig\ResourceManager\AzureResourceManager"
+    Import-Module "$ARMRoot\AzureRM.Profile\AzureRM.Profile.psd1"
+    Import-Module "$ARMRoot\AzureRM.Resources\AzureRM.Resources.psd1";
 
     # All admin modules
     $AllStackModules = @(
@@ -151,6 +144,5 @@ if ($Scope -in $StackScopes) {
     [System.String[]]$ModulesToTest = $AllStackModules | Where-Object { !($_ -in $IgnoredStackModules) }
     Test-Stack -BuildConfig $BuildConfig -Modules $ModulesToTest
 
-    [Environment]::SetEnvironmentVariable("PSModulePath",$oldModulePath)
 }