Skip to content

. #21

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
huangpf merged 2 commits into from
Jun 10, 2015
Merged

. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5893ce8
Remove unneccessary code when getting a resource
vivsriaus Jun 9, 2015
5bc82b7
Merge pull request #481 from vivsriaus/dev
ogail Jun 10, 2015
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
5 changes: 0 additions & 5 deletions ...ceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/JTokenExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ internal static PSObject ToPsObject(this JToken jtoken, ResourceObjectFormat obj
var jobject = (JObject)jtoken;
var psObject = new PSObject();

if (jobject.CanConvertTo<Resource<JToken>>())
{
return jobject.ToResource().ToPsObject(objectFormat);
}

if (!string.IsNullOrWhiteSpace(objectType))
{
psObject.TypeNames.Add(objectType);
Expand Down
5 changes: 0 additions & 5 deletions ...ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/GetAzureResourceCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,11 +578,6 @@ private Task<ResponseWithContinuation<Permission[]>> GetPermissions(string permi
/// <param name="resources">The resource.</param>
private async Task<Resource<JToken>[]> GetPopulatedResource(IEnumerable<Resource<JToken>> resources)
{
if (this.IsResourceGroupLevelResourceGet())
{
return new Resource<JToken>[0];
}

return await resources
.Select(resource => this.GetPopulatedResource(resource))
.WhenAllForAwait()
Expand Down