Skip to content
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

Fix for new azure resource of Microsoft.Storage #457

Merged
merged 1 commit into from
Jun 3, 2015
Merged

Fix for new azure resource of Microsoft.Storage #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Entities/Resources/Resource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class Resource<TProperties>
/// <summary>
/// Gets or sets the id for the resource.
/// </summary>
[JsonProperty(Required = Required.Always)]
[JsonProperty(Required = Required.Default)]
public string Id { get; set; }

/// <summary>
Expand Down
28 changes: 19 additions & 9 deletions ...Manager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/ResourceExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,26 @@ internal static class ResourceExtensions
/// <param name="objectFormat">The <see cref="ResourceObjectFormat"/></param>
internal static PSObject ToPsObject(this Resource<JToken> resource, ResourceObjectFormat objectFormat)
{
var resourceType = ResourceIdUtility.GetResourceType(resource.Id);
var extensionResourceType = ResourceIdUtility.GetExtensionResourceType(resource.Id);
var resourceType = string.IsNullOrEmpty(resource.Id)
? null
: ResourceIdUtility.GetResourceType(resource.Id);

var extensionResourceType = string.IsNullOrEmpty(resource.Id)
? null
: ResourceIdUtility.GetExtensionResourceType(resource.Id);

var objectDefinition = new Dictionary<string, object>
{
{ "Name", resource.Name },
{ "ResourceId", resource.Id },
{ "ResourceName", ResourceIdUtility.GetResourceName(resource.Id) },
{ "ResourceId", string.IsNullOrEmpty(resource.Id) ? null : resource.Id },
{ "ResourceName", string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetResourceName(resource.Id) },
{ "ResourceType", resourceType },
{ "ExtensionResourceName", ResourceIdUtility.GetExtensionResourceName(resource.Id) },
{ "ExtensionResourceName", string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetExtensionResourceName(resource.Id) },
{ "ExtensionResourceType", extensionResourceType },
{ "Kind", resource.Kind },
{ "ResourceGroupName", ResourceIdUtility.GetResourceGroupName(resource.Id) },
{ "ResourceGroupName", string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetResourceGroupName(resource.Id) },
{ "Location", resource.Location },
{ "SubscriptionId", ResourceIdUtility.GetSubscriptionId(resource.Id) },
{ "SubscriptionId", string.IsNullOrEmpty(resource.Id) ? null : ResourceIdUtility.GetSubscriptionId(resource.Id) },
{ "Tags", TagsHelper.GetTagsHashtables(resource.Tags) },
{ "Plan", resource.Plan.ToJToken().ToPsObject(objectFormat) },
{ "Properties", ResourceExtensions.GetProperties(resource, objectFormat) },
Expand All @@ -58,8 +63,13 @@ internal static PSObject ToPsObject(this Resource<JToken> resource, ResourceObje
{ "ETag", resource.ETag },
};

var psObject = PowerShellUtilities.ConstructPSObject(
(resourceType + extensionResourceType).Replace('/', '.'),
var resourceTypeName = resourceType == null && extensionResourceType == null
? null
: (resourceType + extensionResourceType).Replace('/', '.');

var psObject =
PowerShellUtilities.ConstructPSObject(
resourceTypeName,
objectDefinition.Where(kvp => kvp.Value != null).SelectManyArray(kvp => new[] { kvp.Key, kvp.Value }));

psObject.TypeNames.Add(Constants.MicrosoftAzureResource);
Expand Down