Build/run fixes in CLU.

Hovsep Mkrtchyan · Hovsep Mkrtchyan · commit 995eb63a4a10 · 2015-12-17T17:08:31.000-08:00
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs
@@ -17,6 +17,7 @@
 using Microsoft.Azure.Graph.RBAC;
 using Microsoft.Azure.Graph.RBAC.Models;
 using Microsoft.Rest.Azure;
+using Microsoft.Rest.Azure.OData;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -39,9 +40,10 @@ public ActiveDirectoryClient(IAuthenticationFactory authenticationFactory, IClie
         {
             AccessTokenCredential creds = (AccessTokenCredential)authenticationFactory.GetSubscriptionCloudCredentials(context);
             GraphClient = clientFactory.CreateCustomArmClient<GraphRbacManagementClient>(
-                creds.TenantID,
-                creds,
-                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.Graph));
+                context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.Graph),
+                creds);
+            GraphClient.TenantID = creds.TenantID;
+            GraphClient.SubscriptionId = creds.SubscriptionId;
         }
 
         public PSADObject GetADObject(ADObjectFilterOptions options)
@@ -101,7 +103,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions
                 try
                 {
                     servicePrincipal = GraphClient.ServicePrincipal
-                                        .List(item => item.ServicePrincipalNames.Contains(options.SPN))
+                                        .List(new ODataQuery<ServicePrincipal>(item => item.ServicePrincipalNames.Contains(options.SPN)))
                                         .FirstOrDefault();
                 }
                 catch {  /* The user does not exist, ignore the exception. */ }
@@ -120,7 +122,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions
                     if (string.IsNullOrEmpty(options.NextLink))
                     {
                         result = GraphClient.ServicePrincipal
-                                    .List(item => item.DisplayName.StartsWith(options.SearchString) );
+                                    .List(new ODataQuery<ServicePrincipal>(item => item.DisplayName.StartsWith(options.SearchString)));
                     }
                     else
                     {
@@ -132,7 +134,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions
                 }
                 else
                 {
-                    result = GraphClient.ServicePrincipal.List(item => item.DisplayName.StartsWith(options.SearchString));
+                    result = GraphClient.ServicePrincipal.List(new ODataQuery<ServicePrincipal>(item => item.DisplayName.StartsWith(options.SearchString)));
                     servicePrincipals.AddRange(result.Select(u => u.ToPSADServicePrincipal()));
 
                     while (!string.IsNullOrEmpty(result.NextPageLink))
@@ -175,7 +177,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)
                 try
                 {
                     user = GraphClient.User
-                            .List(item => item.SignInName == (Normalize(options.Mail) ?? Normalize(options.SignInName)))
+                            .List(new ODataQuery<User>(item => item.SignInName == (Normalize(options.Mail) ?? Normalize(options.SignInName))))
                             .FirstOrDefault();
                 }
                 catch {  /* The user does not exist, ignore the exception. */ }
@@ -191,7 +193,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)
                 {
                     if (string.IsNullOrEmpty(options.NextLink))
                     {
-                        result = GraphClient.User.List(item => item.DisplayName.StartsWith(options.SearchString));
+                        result = GraphClient.User.List(new ODataQuery<User>(item => item.DisplayName.StartsWith(options.SearchString)));
                     }
                     else
                     {
@@ -203,7 +205,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)
                 }
                 else
                 {
-                    result = GraphClient.User.List(item => item.DisplayName.StartsWith(options.SearchString));
+                    result = GraphClient.User.List(new ODataQuery<User>(item => item.DisplayName.StartsWith(options.SearchString)));
                     users.AddRange(result.Select(u => u.ToPSADUser()));
 
                     while (!string.IsNullOrEmpty(result.NextPageLink))
@@ -273,8 +275,8 @@ public List<PSADGroup> FilterGroups(ADObjectFilterOptions options)
                 {
                     if (string.IsNullOrEmpty(options.NextLink))
                     {
-                        result = GraphClient.Group.List(
-                            item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString));
+                        result = GraphClient.Group.List(new ODataQuery<ADGroup>(
+                            item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString)));
                     }
                     else
                     {
@@ -286,8 +288,8 @@ public List<PSADGroup> FilterGroups(ADObjectFilterOptions options)
                 }
                 else
                 {
-                    result = GraphClient.Group.List(
-                        item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString));
+                    result = GraphClient.Group.List(new ODataQuery<ADGroup>(
+                        item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString)));
                     groups.AddRange(result.Select(g => g.ToPSADGroup()));
 
                     while (!string.IsNullOrEmpty(result.NextPageLink))
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Models.Authorization/AuthorizationClient.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Models.Authorization/AuthorizationClient.cs
@@ -61,7 +61,7 @@ static AuthorizationClient()
         public AuthorizationClient(IAuthenticationFactory authenticationFactory, IClientFactory clientFactory,  AzureContext context)
         {
             ActiveDirectoryClient = new ActiveDirectoryClient(authenticationFactory, clientFactory, context);
-            AuthorizationManagementClient = clientFactory.CreateClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
+            AuthorizationManagementClient = clientFactory.CreateArmClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public PSRoleDefinition GetRoleDefinition(string roleId)
         public PSRoleDefinition GetRoleDefinition(Guid roleId)
         {
             return AuthorizationManagementClient.RoleDefinitions.Get(
-                "subscription/" + AuthorizationManagementClient.SubscriptionId, 
+                "subscriptions/" + AuthorizationManagementClient.SubscriptionId, 
                 roleId.ToString()).ToPSRoleDefinition();
         }
 
@@ -94,7 +94,7 @@ public List<PSRoleDefinition> FilterRoleDefinitions(string name)
         {
             List<PSRoleDefinition> result = new List<PSRoleDefinition>();
             result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(
-                        "subscription/" + AuthorizationManagementClient.SubscriptionId,
+                        "subscriptions/" + AuthorizationManagementClient.SubscriptionId,
                         new ODataQuery<RoleDefinition>( item => item.Name == name))
                   .Select(r => r.ToPSRoleDefinition()));
 
@@ -109,7 +109,7 @@ public List<PSRoleDefinition> GetRoleDefinitions()
         {
             List<PSRoleDefinition> result = new List<PSRoleDefinition>();
             result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(
-                        "subscription/" + AuthorizationManagementClient.SubscriptionId)
+                        "subscriptions/" + AuthorizationManagementClient.SubscriptionId)
                 .Select(r => r.ToPSRoleDefinition()));
             return result;
         }
@@ -122,7 +122,7 @@ public List<PSRoleDefinition> FilterRoleDefinitionsByCustom()
         {
             List<PSRoleDefinition> result = new List<PSRoleDefinition>();
             result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(
-                        "subscription/" + AuthorizationManagementClient.SubscriptionId)
+                        "subscriptions/" + AuthorizationManagementClient.SubscriptionId)
                 .Where(r => r.Properties.Type == AuthorizationClientExtensions.CustomRole)
                 .Select(r => r.ToPSRoleDefinition()));
             return result;
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommand.cs b/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommand.cs
@@ -23,7 +23,8 @@ namespace Microsoft.Azure.Commands.Resources.ResourceGroupDeployments
     /// <summary>
     /// Validate a template to see whether it's using the right syntax, resource providers, resource types, etc.
     /// </summary>
-    [Cmdlet(VerbsDiagnostic.Test, "AzureRmResourceGroupDeployment", DefaultParameterSetName = ParameterlessTemplateFileParameterSetName), OutputType(typeof(List<PSResourceManagerError>))]
+    [Cmdlet(VerbsDiagnostic.Test, "AzureRmResourceGroupDeployment", DefaultParameterSetName = ParameterlessTemplateFileParameterSetName), 
+        OutputType(typeof(PSResourceManagerError))]
     public class TestAzureResourceGroupDeploymentCommand : ResourceWithParameterBaseCmdlet, IDynamicParameters
     {
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
@@ -49,7 +50,7 @@ protected override void ProcessRecord()
                 ParameterUri = TemplateParameterUri
             };
 
-            WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters, Mode));
+            WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters, Mode), enumerateCollection: true);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using Microsoft.Azure.Graph.RBAC;`
`18`	`18`	`using Microsoft.Azure.Graph.RBAC.Models;`
`19`	`19`	`using Microsoft.Rest.Azure;`
	`20`	`+using Microsoft.Rest.Azure.OData;`
`20`	`21`	`using System;`
`21`	`22`	`using System.Collections.Generic;`
`22`	`23`	`using System.Diagnostics;`
`@@ -39,9 +40,10 @@ public ActiveDirectoryClient(IAuthenticationFactory authenticationFactory, IClie`
`39`	`40`	`{`
`40`	`41`	`AccessTokenCredential creds = (AccessTokenCredential)authenticationFactory.GetSubscriptionCloudCredentials(context);`
`41`	`42`	`GraphClient = clientFactory.CreateCustomArmClient<GraphRbacManagementClient>(`
`42`		`- creds.TenantID,`
`43`		`- creds,`
`44`		`- context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.Graph));`
	`43`	`+ context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.Graph),`
	`44`	`+ creds);`
	`45`	`+ GraphClient.TenantID = creds.TenantID;`
	`46`	`+ GraphClient.SubscriptionId = creds.SubscriptionId;`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`public PSADObject GetADObject(ADObjectFilterOptions options)`
`@@ -101,7 +103,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions`
`101`	`103`	`try`
`102`	`104`	`{`
`103`	`105`	`servicePrincipal = GraphClient.ServicePrincipal`
`104`		`- .List(item => item.ServicePrincipalNames.Contains(options.SPN))`
	`106`	`+ .List(new ODataQuery<ServicePrincipal>(item => item.ServicePrincipalNames.Contains(options.SPN)))`
`105`	`107`	`.FirstOrDefault();`
`106`	`108`	`}`
`107`	`109`	`catch { /* The user does not exist, ignore the exception. */ }`
`@@ -120,7 +122,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions`
`120`	`122`	`if (string.IsNullOrEmpty(options.NextLink))`
`121`	`123`	`{`
`122`	`124`	`result = GraphClient.ServicePrincipal`
`123`		`- .List(item => item.DisplayName.StartsWith(options.SearchString) );`
	`125`	`+ .List(new ODataQuery<ServicePrincipal>(item => item.DisplayName.StartsWith(options.SearchString)));`
`124`	`126`	`}`
`125`	`127`	`else`
`126`	`128`	`{`
`@@ -132,7 +134,7 @@ public List<PSADServicePrincipal> FilterServicePrincipals(ADObjectFilterOptions`
`132`	`134`	`}`
`133`	`135`	`else`
`134`	`136`	`{`
`135`		`- result = GraphClient.ServicePrincipal.List(item => item.DisplayName.StartsWith(options.SearchString));`
	`137`	`+ result = GraphClient.ServicePrincipal.List(new ODataQuery<ServicePrincipal>(item => item.DisplayName.StartsWith(options.SearchString)));`
`136`	`138`	`servicePrincipals.AddRange(result.Select(u => u.ToPSADServicePrincipal()));`
`137`	`139`
`138`	`140`	`while (!string.IsNullOrEmpty(result.NextPageLink))`
`@@ -175,7 +177,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)`
`175`	`177`	`try`
`176`	`178`	`{`
`177`	`179`	`user = GraphClient.User`
`178`		`- .List(item => item.SignInName == (Normalize(options.Mail) ?? Normalize(options.SignInName)))`
	`180`	`+ .List(new ODataQuery<User>(item => item.SignInName == (Normalize(options.Mail) ?? Normalize(options.SignInName))))`
`179`	`181`	`.FirstOrDefault();`
`180`	`182`	`}`
`181`	`183`	`catch { /* The user does not exist, ignore the exception. */ }`
`@@ -191,7 +193,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)`
`191`	`193`	`{`
`192`	`194`	`if (string.IsNullOrEmpty(options.NextLink))`
`193`	`195`	`{`
`194`		`- result = GraphClient.User.List(item => item.DisplayName.StartsWith(options.SearchString));`
	`196`	`+ result = GraphClient.User.List(new ODataQuery<User>(item => item.DisplayName.StartsWith(options.SearchString)));`
`195`	`197`	`}`
`196`	`198`	`else`
`197`	`199`	`{`
`@@ -203,7 +205,7 @@ public List<PSADUser> FilterUsers(ADObjectFilterOptions options)`
`203`	`205`	`}`
`204`	`206`	`else`
`205`	`207`	`{`
`206`		`- result = GraphClient.User.List(item => item.DisplayName.StartsWith(options.SearchString));`
	`208`	`+ result = GraphClient.User.List(new ODataQuery<User>(item => item.DisplayName.StartsWith(options.SearchString)));`
`207`	`209`	`users.AddRange(result.Select(u => u.ToPSADUser()));`
`208`	`210`
`209`	`211`	`while (!string.IsNullOrEmpty(result.NextPageLink))`
`@@ -273,8 +275,8 @@ public List<PSADGroup> FilterGroups(ADObjectFilterOptions options)`
`273`	`275`	`{`
`274`	`276`	`if (string.IsNullOrEmpty(options.NextLink))`
`275`	`277`	`{`
`276`		`- result = GraphClient.Group.List(`
`277`		`- item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString));`
	`278`	`+ result = GraphClient.Group.List(new ODataQuery<ADGroup>(`
	`279`	`+ item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString)));`
`278`	`280`	`}`
`279`	`281`	`else`
`280`	`282`	`{`
`@@ -286,8 +288,8 @@ public List<PSADGroup> FilterGroups(ADObjectFilterOptions options)`
`286`	`288`	`}`
`287`	`289`	`else`
`288`	`290`	`{`
`289`		`- result = GraphClient.Group.List(`
`290`		`- item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString));`
	`291`	`+ result = GraphClient.Group.List(new ODataQuery<ADGroup>(`
	`292`	`+ item => item.Mail == options.Mail && item.DisplayName.StartsWith(options.SearchString)));`
`291`	`293`	`groups.AddRange(result.Select(g => g.ToPSADGroup()));`
`292`	`294`
`293`	`295`	`while (!string.IsNullOrEmpty(result.NextPageLink))`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static AuthorizationClient()`
`61`	`61`	`public AuthorizationClient(IAuthenticationFactory authenticationFactory, IClientFactory clientFactory, AzureContext context)`
`62`	`62`	`{`
`63`	`63`	`ActiveDirectoryClient = new ActiveDirectoryClient(authenticationFactory, clientFactory, context);`
`64`		`- AuthorizationManagementClient = clientFactory.CreateClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);`
	`64`	`+ AuthorizationManagementClient = clientFactory.CreateArmClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/// <summary>`
`@@ -80,7 +80,7 @@ public PSRoleDefinition GetRoleDefinition(string roleId)`
`80`	`80`	`public PSRoleDefinition GetRoleDefinition(Guid roleId)`
`81`	`81`	`{`
`82`	`82`	`return AuthorizationManagementClient.RoleDefinitions.Get(`
`83`		`- "subscription/" + AuthorizationManagementClient.SubscriptionId,`
	`83`	`+ "subscriptions/" + AuthorizationManagementClient.SubscriptionId,`
`84`	`84`	`roleId.ToString()).ToPSRoleDefinition();`
`85`	`85`	`}`
`86`	`86`
`@@ -94,7 +94,7 @@ public List<PSRoleDefinition> FilterRoleDefinitions(string name)`
`94`	`94`	`{`
`95`	`95`	`List<PSRoleDefinition> result = new List<PSRoleDefinition>();`
`96`	`96`	`result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(`
`97`		`- "subscription/" + AuthorizationManagementClient.SubscriptionId,`
	`97`	`+ "subscriptions/" + AuthorizationManagementClient.SubscriptionId,`
`98`	`98`	`new ODataQuery<RoleDefinition>( item => item.Name == name))`
`99`	`99`	`.Select(r => r.ToPSRoleDefinition()));`
`100`	`100`
`@@ -109,7 +109,7 @@ public List<PSRoleDefinition> GetRoleDefinitions()`
`109`	`109`	`{`
`110`	`110`	`List<PSRoleDefinition> result = new List<PSRoleDefinition>();`
`111`	`111`	`result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(`
`112`		`- "subscription/" + AuthorizationManagementClient.SubscriptionId)`
	`112`	`+ "subscriptions/" + AuthorizationManagementClient.SubscriptionId)`
`113`	`113`	`.Select(r => r.ToPSRoleDefinition()));`
`114`	`114`	`return result;`
`115`	`115`	`}`
`@@ -122,7 +122,7 @@ public List<PSRoleDefinition> FilterRoleDefinitionsByCustom()`
`122`	`122`	`{`
`123`	`123`	`List<PSRoleDefinition> result = new List<PSRoleDefinition>();`
`124`	`124`	`result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(`
`125`		`- "subscription/" + AuthorizationManagementClient.SubscriptionId)`
	`125`	`+ "subscriptions/" + AuthorizationManagementClient.SubscriptionId)`
`126`	`126`	`.Where(r => r.Properties.Type == AuthorizationClientExtensions.CustomRole)`
`127`	`127`	`.Select(r => r.ToPSRoleDefinition()));`
`128`	`128`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ namespace Microsoft.Azure.Commands.Resources.ResourceGroupDeployments`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Validate a template to see whether it's using the right syntax, resource providers, resource types, etc.`
`25`	`25`	`/// </summary>`
`26`		`- [Cmdlet(VerbsDiagnostic.Test, "AzureRmResourceGroupDeployment", DefaultParameterSetName = ParameterlessTemplateFileParameterSetName), OutputType(typeof(List<PSResourceManagerError>))]`
	`26`	`+ [Cmdlet(VerbsDiagnostic.Test, "AzureRmResourceGroupDeployment", DefaultParameterSetName = ParameterlessTemplateFileParameterSetName),`
	`27`	`+ OutputType(typeof(PSResourceManagerError))]`
`27`	`28`	`public class TestAzureResourceGroupDeploymentCommand : ResourceWithParameterBaseCmdlet, IDynamicParameters`
`28`	`29`	`{`
`29`	`30`	`[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]`
`@@ -49,7 +50,7 @@ protected override void ProcessRecord()`
`49`	`50`	`ParameterUri = TemplateParameterUri`
`50`	`51`	`};`
`51`	`52`
`52`		`- WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters, Mode));`
	`53`	`+ WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters, Mode), enumerateCollection: true);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`