Skip to content

Support to get collection get #1850

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
hovsepm merged 9 commits into from
Feb 25, 2016
Merged

Support to get collection get #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
55edec2
Support to get collection get
vivsriaus Feb 23, 2016
591b8cd
ResourceId with space should be encoded with %20 instead of a '+'
vivsriaus Feb 23, 2016
8088bf0
Fix failing find RG test
vivsriaus Feb 24, 2016
00403be
Fix the other failing tests
vivsriaus Feb 24, 2016
f7c5799
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Feb 24, 2016
f5523b4
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Feb 24, 2016
44b778c
Merge branch 'UpdateGetResource' of https://github.com/vivsriaus/azur…
vivsriaus Feb 24, 2016
3f1e3e4
Add only unique nested operations to list
vivsriaus Feb 24, 2016
cf5086a
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
vivsriaus Feb 24, 2016
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
14 changes: 7 additions & 7 deletions ...ources/Commands.ResourceManager/Cmdlets/Implementation/Resource/GetAzureResourceCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,19 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
[Alias("Name")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource name. e.g. to specify a database MyServer/MyDatabase.")]
[ValidateNotNullOrEmpty]
public string ResourceName { get; set; }

/// <summary>
/// Gets or sets the resource type parameter.
/// </summary>
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource type. e.g. Microsoft.Sql/Servers/Databases.")]
[ValidateNotNullOrEmpty]
public string ResourceType { get; set; }
Expand Down Expand Up @@ -145,7 +145,7 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
/// <summary>
/// Gets or sets the is collection.
/// </summary>
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetTenantResourceParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListTenantResourcesParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameTypeParameterSet, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
Expand All @@ -169,8 +169,8 @@ public sealed class GetAzureResourceCmdlet : ResourceManagerCmdletBase
/// <summary>
/// Gets or sets the resource group name.
/// </summary>
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = true, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.ListResourceCollection, Mandatory = false, HelpMessage = "When specified, ensures that the query is run against a collection instead of a resource.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
[Parameter(ParameterSetName = GetAzureResourceCmdlet.GetResourceByNameGroupTypeParameterSet, Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource group name.")]
[ValidateNotNullOrEmpty]
public string ResourceGroupName { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion ...r/Resources/Commands.ResourceManager/Cmdlets/RestClients/ResourceManagerRestRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public Uri GetResourceManagementRequestUri(
resourceIdStringBuilder.AppendFormat("?{0}", queryString);

var relativeUri = resourceIdStringBuilder.ToString()
.Select(character => char.IsWhiteSpace(character) ? "+" : character.ToString())
.Select(character => char.IsWhiteSpace(character) ? "%20" : character.ToString())
.ConcatStrings();

return new Uri(baseUri: this.EndpointUri, relativeUri: relativeUri);
Expand Down
994 changes: 376 additions & 618 deletions ...Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestFindResourceGroup.json
View file
Open in desktop

Large diffs are not rendered by default.

331 changes: 139 additions & 192 deletions ...soft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests/TestFindAResourceTest.json
View file
Open in desktop

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions ...mands.Resources.Test.ScenarioTests.ResourceTests/TestGetResourceWithExpandProperties.json
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,16 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
parameters: null);

newNestedOperations = GetNewOperations(operations, result.Operations);
newOperations.AddRange(newNestedOperations);

foreach (DeploymentOperation op in newNestedOperations)
{
DeploymentOperation nestedOperationWithSameIdAndProvisioningState = newOperations.Find(o => o.OperationId.Equals(op.OperationId) && o.Properties.ProvisioningState.Equals(op.Properties.ProvisioningState));

if (nestedOperationWithSameIdAndProvisioningState == null)
{
newOperations.Add(op);
}
}
}
}
}
Expand Down