Merge pull request #457 from vivsriaus/release-0.9.3

Fix for new azure resource of Microsoft.Storage
Azure · Jun 3, 2015 · 825f5c1 · 825f5c1
2 parents 2405634 + d4e46c9
commit 825f5c1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/...ceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Entities/Resources/Resource.cs b/...ceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Entities/Resources/Resource.cs
@@ -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>

diff --git a/...Manager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/ResourceExtensions.cs b/...Manager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/ResourceExtensions.cs
@@ -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) },
@@ -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);