Merge branch 'dev' of github.com:Azure/azure-powershell into parameterAndBugFixes

shuagarw · shuagarw · commit 207a0f7c1765 · 2015-09-23T10:24:57.000-07:00
diff --git a/build.proj b/build.proj
@@ -36,6 +36,7 @@
     <SetupOutputDirectory>$(PublishDirectory)\Setup</SetupOutputDirectory>
     <TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
     <BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
+    <NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' != '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
   </PropertyGroup>
   <ItemGroup>
     <AzureResourceManagerSln Include=".\src\ResourceManager.sln" />
@@ -115,6 +116,7 @@
     <NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
     <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
     <NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
+    <PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
   </PropertyGroup>
   
   <!--
@@ -285,6 +287,14 @@
     <!--If we are testing locally then we copy the binaries and do not submit to the code sign server-->
     <Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
   </Target>
+  
+  <!-- Publish all packages -->
+  <Target Name="Publish" DependsOnTargets="Build">
+    <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
+    <Message Importance="high" Text="Publishing Cmdlets..." />
+    
+    <Exec Command="$(PowerShellCommand) -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(Configuration) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot;&quot;"/>
+  </Target>
 
   <PropertyGroup>
     <RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
diff --git a/setup-powershellget/Setup/ShortcutStartup.ps1 b/setup-powershellget/Setup/ShortcutStartup.ps1
@@ -26,9 +26,15 @@ Finalizing installation of Azure PowerShell.
 Installing Azure Modules from PowerShell Gallery. 
 This may take some time...
 "@
+		Import-Module PackageManagement
 		Get-PackageProvider -Name NuGet -ForceBootstrap
-		Install-Module AzureRM.Installer
-		Install-AzureRM
+
+		$NuGetPublishingSource = $env:NuGetPublishingSource
+		if ([string]::IsNullOrWhiteSpace($NuGetPublishingSource)) {
+			Install-Module AzureRM -Repository $NuGetPublishingSource
+		} else {
+			Install-Module AzureRM
+		}
 	} else {
 		cd c:\
 		$welcomeMessage = @"
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs
@@ -58,14 +58,14 @@ public void RaByScope()
             ResourcesController.NewInstance.RunPsTest("Test-RaByScope");
         }
 
-        [Fact]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaByResourceGroup()
         {
             ResourcesController.NewInstance.RunPsTest("Test-RaByResourceGroup");
         }
 
-        [Fact]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaByResource()
         {
@@ -79,7 +79,7 @@ public void RaByServicePrincipal()
             ResourcesController.NewInstance.RunPsTest("Test-RaByServicePrincipal");
         }
 
-        [Fact]
+        [Fact(Skip = "Need to re-record test")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RaByUpn()
         {
diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs
@@ -141,17 +141,18 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
             List<PSRoleAssignment> result = new List<PSRoleAssignment>();
             ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters();
 
+            PSADObject adObject = null;
             if (options.ADObjectFilter.HasFilter)
             {
+                adObject = ActiveDirectoryClient.GetADObject(options.ADObjectFilter);
+                if (adObject == null)
+                {
+                    throw new KeyNotFoundException(ProjectResources.PrincipalNotFound);
+                }
+
                 // Filter first by principal
                 if (options.ExpandPrincipalGroups)
                 {
-                    PSADObject adObject = ActiveDirectoryClient.GetADObject(options.ADObjectFilter);
-                    if (adObject == null)
-                    {
-                        throw new KeyNotFoundException(ProjectResources.PrincipalNotFound);
-                    }
-
                     if (!(adObject is PSADUser))
                     {
                         throw new InvalidOperationException(ProjectResources.ExpandGroupsNotSupported);
@@ -161,7 +162,7 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
                 }
                 else
                 {
-                    parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? ActiveDirectoryClient.GetObjectId(options.ADObjectFilter) : Guid.Parse(options.ADObjectFilter.Id);
+                    parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? adObject.Id : Guid.Parse(options.ADObjectFilter.Id);
                 }
 
                 result.AddRange(AuthorizationManagementClient.RoleAssignments.List(parameters)
@@ -197,7 +198,22 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
             {
                 // Get classic administrator access assignments 
                 List<ClassicAdministrator> classicAdministrators = AuthorizationManagementClient.ClassicAdministrators.List().ClassicAdministrators.ToList(); 
-                List<PSRoleAssignment> classicAdministratorsAssignments = classicAdministrators.Select(a => a.ToPSRoleAssignment(currentSubscription)).ToList(); 
+                List<PSRoleAssignment> classicAdministratorsAssignments = classicAdministrators.Select(a => a.ToPSRoleAssignment(currentSubscription)).ToList();
+
+                // Filter by principal if provided
+                if (options.ADObjectFilter.HasFilter)
+                {
+                    if (!(adObject is PSADUser))
+                    {
+                        throw new InvalidOperationException(ProjectResources.IncludeClassicAdminsNotSupported);
+                    }
+
+                    var userObject = adObject as PSADUser;
+                    classicAdministratorsAssignments = classicAdministratorsAssignments.Where(c =>
+                           c.DisplayName.Equals(userObject.UserPrincipalName, StringComparison.OrdinalIgnoreCase) ||
+                           c.DisplayName.Equals(userObject.Mail, StringComparison.OrdinalIgnoreCase)).ToList();
+                }
+                
                 result.AddRange(classicAdministratorsAssignments);
             }
 
diff --git a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx
@@ -312,4 +312,7 @@
   <data name="PrincipalNotFound" xml:space="preserve">
     <value>Cannot find principal using the specified options</value>
   </data>
+  <data name="IncludeClassicAdminsNotSupported" xml:space="preserve">
+    <value>IncludeClassicAdministrators is only supported for a User principal</value>
+  </data>
 </root>
diff --git a/tools/AzureRM/AzureRM.psd1 b/tools/AzureRM/AzureRM.psd1
diff --git a/tools/AzureRM/AzureRM.psm1 b/tools/AzureRM/AzureRM.psm1
@@ -0,0 +1,48 @@
+<#
+ .Synopsis
+  Install Azure Resource Manager cmdlet modules
+
+ .Description
+  Installs all the available Azure Resource Manager cmdlet modules that start with "AzureRM".
+
+ .Parameter Repository
+  Limit the search for "AzureRM" cmdlets in a specific repository.
+ 
+ .Parameter Scope
+  Specifies the parameter scope.
+#>
+function Update-AzureRM
+{
+    param(
+    [Parameter(Position=0, Mandatory = $false)]
+    [string]
+    $Repository,
+
+    [Parameter(Position=1, Mandatory = $false)]
+    [ValidateSet("CurrentUser","AllUsers")]
+    [string]
+    $Scope)
+
+    if ([string]::IsNullOrWhiteSpace($Scope))
+    {
+      $Scope = "AllUsers"
+    }
+
+    Install-Module AzureRM.Profile -Repository $Repository
+    if ([string]::IsNullOrWhiteSpace($Repository)) 
+    {
+      $modules = Find-Module -Name AzureRM.* | Where-Object {$_.Name -ne "AzureRM" -and $_.Name -ne "AzureRM.Profile"}
+    } else {
+      $modules = Find-Module -Repository $Repository | Where-Object {$_.Name -like "AzureRM.*" -and $_.Name -ne "AzureRM" -and $_.Name -ne "AzureRM.Profile"}
+    }
+
+    Write-Output "Installing $($modules.Length) AzureRM modules. This may take a few minutes."
+
+    $result = $modules | ForEach {
+        Start-Job -Name $_.Name -ScriptBlock {
+          Install-Module -Name $args[0] -Repository $args[1] -Scope $args[2]
+          Write-Output "$($args[0]) installed..."
+        } -ArgumentList $_.Name, $Repository, $Scope }
+    
+    $modules | ForEach {Get-Job -Name $_.Name | Wait-Job | Receive-Job }
+}
diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1
@@ -34,15 +34,6 @@ if ([string]::IsNullOrEmpty($repositoryLocation))
 }
 
 $packageFolder = "$PSScriptRoot\..\src\Package"
-$scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-. ($scriptFolder + '.\SetupEnv.ps1')
-
-if (Test-Path $packageFolder) {
-    Remove-Item -Path $packageFolder -Recurse -Force	
-}
-
-# Build the cmdlets in debug mode
-msbuild "$env:AzurePSRoot\build.proj" /t:"BuildDebug"
 
 $repoName = $(New-Guid).ToString()
 Register-PSRepository -Name $repoName -SourceLocation $repositoryLocation -PublishLocation $repositoryLocation -InstallationPolicy Trusted

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ public void RaByScope()`
`58`	`58`	`ResourcesController.NewInstance.RunPsTest("Test-RaByScope");`
`59`	`59`	`}`
`60`	`60`
`61`		`- [Fact]`
	`61`	`+ [Fact(Skip = "Need to re-record test")]`
`62`	`62`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`63`	`63`	`public void RaByResourceGroup()`
`64`	`64`	`{`
`65`	`65`	`ResourcesController.NewInstance.RunPsTest("Test-RaByResourceGroup");`
`66`	`66`	`}`
`67`	`67`
`68`		`- [Fact]`
	`68`	`+ [Fact(Skip = "Need to re-record test")]`
`69`	`69`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`70`	`70`	`public void RaByResource()`
`71`	`71`	`{`
`@@ -79,7 +79,7 @@ public void RaByServicePrincipal()`
`79`	`79`	`ResourcesController.NewInstance.RunPsTest("Test-RaByServicePrincipal");`
`80`	`80`	`}`
`81`	`81`
`82`		`- [Fact]`
	`82`	`+ [Fact(Skip = "Need to re-record test")]`
`83`	`83`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`84`	`84`	`public void RaByUpn()`
`85`	`85`	`{`