Fixed Resource cmdlets build breaks

Hovsep Mkrtchyan · Hovsep Mkrtchyan · commit b2c9cf366658 · 2015-11-20T14:53:31.000-08:00
diff --git a/src/CLU/Commands.Common/GeneralUtilities.cs b/src/CLU/Commands.Common/GeneralUtilities.cs
@@ -347,6 +347,25 @@ public static Uri CreateHttpsEndpoint(string endpointUri)
             return new Uri(endpoint);
         }
 
+        public static string DownloadFile(string uri)
+        {
+            string contents = null;
+
+            using (HttpClient httClient = new HttpClient())
+            {
+                try
+                {
+                    contents = httClient.GetStringAsync(uri).ConfigureAwait(false).GetAwaiter().GetResult();
+                }
+                catch
+                {
+                    // Ignore the exception and return empty contents
+                }
+            }
+
+            return contents;
+        }
+
         public static string GenerateSeparator(int amount, string separator)
         {
             StringBuilder result = new StringBuilder();
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Models.Authorization/AuthorizationClient.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Models.Authorization/AuthorizationClient.cs
@@ -90,12 +90,7 @@ public PSRoleDefinition GetRoleDefinition(Guid roleId)
         public List<PSRoleDefinition> FilterRoleDefinitions(string name)
         {
             List<PSRoleDefinition> result = new List<PSRoleDefinition>();
-            ListDefinitionFilterParameters parameters = new ListDefinitionFilterParameters
-            {
-                RoleName = name
-            };
-
-            result.AddRange(AuthorizationManagementClient.RoleDefinitions.ListWithFilters(parameters).RoleDefinitions.Select(r => r.ToPSRoleDefinition()));
+            result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(item => item.Name == name).Select(r => r.ToPSRoleDefinition()));
 
             return result;
         }
@@ -160,7 +155,8 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame
         public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options, string currentSubscription)
         {
             List<PSRoleAssignment> result = new List<PSRoleAssignment>();
-            ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters();
+            string assignedToPrincipalId = null;
+            string principalId = null;
 
             PSADObject adObject = null;
             if (options.ADObjectFilter.HasFilter)
@@ -179,21 +175,21 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
                         throw new InvalidOperationException(ProjectResources.ExpandGroupsNotSupported);
                     }
 
-                    parameters.AssignedToPrincipalId = adObject.Id;
+                    assignedToPrincipalId = adObject.Id.ToString();
                 }
                 else
                 {
-                    parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? adObject.Id : Guid.Parse(options.ADObjectFilter.Id);
+                    principalId = string.IsNullOrEmpty(options.ADObjectFilter.Id.ToString()) ? adObject.Id.ToString() : options.ADObjectFilter.Id;
                 }
 
-                var tempResult = AuthorizationManagementClient.RoleAssignments.List(parameters);
-                result.AddRange(tempResult.RoleAssignments.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
+                var tempResult = AuthorizationManagementClient.RoleAssignments.List(false, principalId, assignedToPrincipalId);
+                result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
                     .ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));
 
-                while (!string.IsNullOrWhiteSpace(tempResult.NextLink))
+                while (!string.IsNullOrWhiteSpace(tempResult.NextPageLink))
                 {
-                    tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextLink);
-                    result.AddRange(tempResult.RoleAssignments.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
+                    tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextPageLink);
+                    result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
                         .ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));
                 }
 
@@ -206,9 +202,7 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
             else if (!string.IsNullOrEmpty(options.Scope))
             {
                 // Filter by scope and above directly
-                parameters.AtScope = true;
-
-                var tempResult = AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, parameters);
+                var tempResult = AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, true, principalId, assignedToPrincipalId);
                 result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
                     .ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));
 
@@ -221,15 +215,15 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
             }
             else
             {
-                var tempResult = AuthorizationManagementClient.RoleAssignments.List(parameters);
-                result.AddRange(tempResult.RoleAssignments
+                var tempResult = AuthorizationManagementClient.RoleAssignments.List(false, principalId, assignedToPrincipalId);
+                result.AddRange(tempResult
                      .FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
                      .ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));
 
-                while (!string.IsNullOrWhiteSpace(tempResult.NextLink))
+                while (!string.IsNullOrWhiteSpace(tempResult.NextPageLink))
                 {
-                    tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextLink);
-                      result.AddRange(tempResult.RoleAssignments
+                    tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextPageLink);
+                      result.AddRange(tempResult
                      .FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))
                      .ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));
                 }
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs
@@ -98,15 +98,15 @@ public object GetDynamicParameters()
                 if (string.IsNullOrEmpty(TemplateParameterUri))
                 {
                     dynamicParameters = GetTemplateParametersFromFile(
-                        this.TryResolvePath(TemplateFile),
+                        TemplateFile,
                         TemplateParameterObject,
-                        this.TryResolvePath(TemplateParameterFile),
+                        TemplateParameterFile,
                         MyInvocation.MyCommand.Parameters.Keys.ToArray());
                 }
                 else
                 {
                     dynamicParameters = GetTemplateParametersFromFile(
-                        this.TryResolvePath(TemplateFile),
+                        TemplateFile,
                         TemplateParameterObject,
                         TemplateParameterUri,
                         MyInvocation.MyCommand.Parameters.Keys.ToArray());
@@ -121,7 +121,7 @@ public object GetDynamicParameters()
                     dynamicParameters = GetTemplateParametersFromFile(
                         TemplateUri,
                         TemplateParameterObject,
-                        this.TryResolvePath(TemplateParameterFile),
+                        TemplateParameterFile,
                         MyInvocation.MyCommand.Parameters.Keys.ToArray());
                 }
                 else
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/Providers/GetAzureProviderOperationCmdlet.cs b/src/CLU/Microsoft.Azure.Commands.Resources/Providers/GetAzureProviderOperationCmdlet.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.Resources
     using System.Collections.Generic;
     using System.Linq;
     using System.Management.Automation;
+    using System.Text.RegularExpressions;
     using Microsoft.Azure.Commands.Resources.Models;
     using Microsoft.Azure.Management.Resources.Models;
     using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
@@ -87,7 +88,7 @@ private static void ValidateActionSearchString(string actionSearchString)
         private List<PSResourceProviderOperation> ProcessProviderOperationsWithWildCard(string actionSearchString)
         {
             // Filter the list of all operation names to what matches the wildcard
-            WildcardPattern wildcard = new WildcardPattern(actionSearchString, WildcardOptions.IgnoreCase | WildcardOptions.Compiled);
+            Regex wildcard = new Regex(actionSearchString, RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
             List<ProviderOperationsMetadata> providers = new List<ProviderOperationsMetadata>();
             string provider = this.OperationSearchString.Split(Separator).First();
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommand.cs b/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommand.cs
@@ -53,7 +53,7 @@ protected override void ProcessRecord()
                 ResourceGroupName = ResourceGroupName,
                 DeploymentName = Name,
                 DeploymentMode = Mode,
-                TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),
+                TemplateFile = TemplateUri ?? TemplateFile,
                 TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),
                 ParameterUri = TemplateParameterUri
             };
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommand.cs b/src/CLU/Microsoft.Azure.Commands.Resources/ResourceGroupDeployments/TestAzureResourceGroupDeploymentCommand.cs
@@ -43,7 +43,7 @@ protected override void ProcessRecord()
             ValidatePSResourceGroupDeploymentParameters parameters = new ValidatePSResourceGroupDeploymentParameters()
             {
                 ResourceGroupName = ResourceGroupName,
-                TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),
+                TemplateFile = TemplateUri ?? TemplateFile,
                 TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),
                 ParameterUri = TemplateParameterUri
             };
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/RoleDefinitions/NewAzureRoleDefinitionCommand.cs b/src/CLU/Microsoft.Azure.Commands.Resources/RoleDefinitions/NewAzureRoleDefinitionCommand.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
             PSRoleDefinition role = null;
             if (!string.IsNullOrEmpty(InputFile))
             {
-                string fileName = this.TryResolvePath(InputFile);
+                string fileName = InputFile;
                 if (!(new FileInfo(fileName)).Exists)
                 {
                     throw new PSArgumentException(string.Format("File {0} does not exist", fileName));
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/RoleDefinitions/SetAzureRoleDefinitionCommand.cs b/src/CLU/Microsoft.Azure.Commands.Resources/RoleDefinitions/SetAzureRoleDefinitionCommand.cs
@@ -41,7 +41,7 @@ protected override void ProcessRecord()
             PSRoleDefinition role = null;
             if (!string.IsNullOrEmpty(InputFile))
             {
-                string fileName = this.TryResolvePath(InputFile);
+                string fileName = InputFile;
                 if (!(new FileInfo(fileName)).Exists)
                 {
                     throw new PSArgumentException(string.Format("File {0} does not exist", fileName));
diff --git a/src/CLU/Microsoft.Azure.Commands.Resources/project.json b/src/CLU/Microsoft.Azure.Commands.Resources/project.json
@@ -19,8 +19,8 @@
     "Commands.Common": "",
     "Commands.ResourceManager.Common": "",
     "Commands.ResourceManager.Cmdlets": "",
-    "Microsoft.Azure.Graph.RBAC":  "2.0.0-preview",
-    "Microsoft.Azure.Management.Authorization": "2.0.0-preview",
+    "Microsoft.Azure.Graph.RBAC": "2.0.0-preview",
+    "Microsoft.Azure.Management.Authorization": "2.0.1-preview",
     "Microsoft.Azure.Management.Resources": "3.1.1-preview",
     "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
     "Microsoft.Rest.ClientRuntime": "1.4.1",
@@ -52,6 +52,7 @@
     "System.Threading": "4.0.11-beta-23409",
     "System.Threading.Tasks": "4.0.11-beta-23516",
     "System.Threading.Thread": "4.0.0-beta-23516",
-    "System.Xml.ReaderWriter": "4.0.11-beta-23516"
+    "System.Xml.ReaderWriter": "4.0.11-beta-23516",
+    "System.Text.RegularExpressions": "4.0.11-beta-23516"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,7 @@ public PSRoleDefinition GetRoleDefinition(Guid roleId)`
`90`	`90`	`public List<PSRoleDefinition> FilterRoleDefinitions(string name)`
`91`	`91`	`{`
`92`	`92`	`List<PSRoleDefinition> result = new List<PSRoleDefinition>();`
`93`		`- ListDefinitionFilterParameters parameters = new ListDefinitionFilterParameters`
`94`		`- {`
`95`		`- RoleName = name`
`96`		`- };`
`97`		`-`
`98`		`- result.AddRange(AuthorizationManagementClient.RoleDefinitions.ListWithFilters(parameters).RoleDefinitions.Select(r => r.ToPSRoleDefinition()));`
	`93`	`+ result.AddRange(AuthorizationManagementClient.RoleDefinitions.List(item => item.Name == name).Select(r => r.ToPSRoleDefinition()));`
`99`	`94`
`100`	`95`	`return result;`
`101`	`96`	`}`
`@@ -160,7 +155,8 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame`
`160`	`155`	`public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions options, string currentSubscription)`
`161`	`156`	`{`
`162`	`157`	`List<PSRoleAssignment> result = new List<PSRoleAssignment>();`
`163`		`- ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters();`
	`158`	`+ string assignedToPrincipalId = null;`
	`159`	`+ string principalId = null;`
`164`	`160`
`165`	`161`	`PSADObject adObject = null;`
`166`	`162`	`if (options.ADObjectFilter.HasFilter)`
`@@ -179,21 +175,21 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions`
`179`	`175`	`throw new InvalidOperationException(ProjectResources.ExpandGroupsNotSupported);`
`180`	`176`	`}`
`181`	`177`
`182`		`- parameters.AssignedToPrincipalId = adObject.Id;`
	`178`	`+ assignedToPrincipalId = adObject.Id.ToString();`
`183`	`179`	`}`
`184`	`180`	`else`
`185`	`181`	`{`
`186`		`- parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? adObject.Id : Guid.Parse(options.ADObjectFilter.Id);`
	`182`	`+ principalId = string.IsNullOrEmpty(options.ADObjectFilter.Id.ToString()) ? adObject.Id.ToString() : options.ADObjectFilter.Id;`
`187`	`183`	`}`
`188`	`184`
`189`		`- var tempResult = AuthorizationManagementClient.RoleAssignments.List(parameters);`
`190`		`- result.AddRange(tempResult.RoleAssignments.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
	`185`	`+ var tempResult = AuthorizationManagementClient.RoleAssignments.List(false, principalId, assignedToPrincipalId);`
	`186`	`+ result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
`191`	`187`	`.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));`
`192`	`188`
`193`		`- while (!string.IsNullOrWhiteSpace(tempResult.NextLink))`
	`189`	`+ while (!string.IsNullOrWhiteSpace(tempResult.NextPageLink))`
`194`	`190`	`{`
`195`		`- tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextLink);`
`196`		`- result.AddRange(tempResult.RoleAssignments.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
	`191`	`+ tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextPageLink);`
	`192`	`+ result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
`197`	`193`	`.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));`
`198`	`194`	`}`
`199`	`195`
`@@ -206,9 +202,7 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions`
`206`	`202`	`else if (!string.IsNullOrEmpty(options.Scope))`
`207`	`203`	`{`
`208`	`204`	`// Filter by scope and above directly`
`209`		`- parameters.AtScope = true;`
`210`		`-`
`211`		`- var tempResult = AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, parameters);`
	`205`	`+ var tempResult = AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, true, principalId, assignedToPrincipalId);`
`212`	`206`	`result.AddRange(tempResult.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
`213`	`207`	`.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));`
`214`	`208`
`@@ -221,15 +215,15 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions`
`221`	`215`	`}`
`222`	`216`	`else`
`223`	`217`	`{`
`224`		`- var tempResult = AuthorizationManagementClient.RoleAssignments.List(parameters);`
`225`		`- result.AddRange(tempResult.RoleAssignments`
	`218`	`+ var tempResult = AuthorizationManagementClient.RoleAssignments.List(false, principalId, assignedToPrincipalId);`
	`219`	`+ result.AddRange(tempResult`
`226`	`220`	`.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
`227`	`221`	`.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));`
`228`	`222`
`229`		`- while (!string.IsNullOrWhiteSpace(tempResult.NextLink))`
	`223`	`+ while (!string.IsNullOrWhiteSpace(tempResult.NextPageLink))`
`230`	`224`	`{`
`231`		`- tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextLink);`
`232`		`- result.AddRange(tempResult.RoleAssignments`
	`225`	`+ tempResult = AuthorizationManagementClient.RoleAssignments.ListNext(tempResult.NextPageLink);`
	`226`	`+ result.AddRange(tempResult`
`233`	`227`	`.FilterRoleAssignmentsOnRoleId(AuthorizationHelper.GetRoleDefinitionFullyQualifiedId(currentSubscription, options.RoleDefinitionId))`
`234`	`228`	`.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals));`
`235`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected override void ProcessRecord()`
`43`	`43`	`ValidatePSResourceGroupDeploymentParameters parameters = new ValidatePSResourceGroupDeploymentParameters()`
`44`	`44`	`{`
`45`	`45`	`ResourceGroupName = ResourceGroupName,`
`46`		`- TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),`
	`46`	`+ TemplateFile = TemplateUri ?? TemplateFile,`
`47`	`47`	`TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),`
`48`	`48`	`ParameterUri = TemplateParameterUri`
`49`	`49`	`};`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected override void ProcessRecord()`
`41`	`41`	`PSRoleDefinition role = null;`
`42`	`42`	`if (!string.IsNullOrEmpty(InputFile))`
`43`	`43`	`{`
`44`		`- string fileName = this.TryResolvePath(InputFile);`
	`44`	`+ string fileName = InputFile;`
`45`	`45`	`if (!(new FileInfo(fileName)).Exists)`
`46`	`46`	`{`
`47`	`47`	`throw new PSArgumentException(string.Format("File {0} does not exist", fileName));`