Merge pull request Azure#10175 from anusapan/get-subscription-iothub

[Bug Fixed] Cmdlet not returning some properties

Author: markcowl

src/IotHub/IotHub.Test/ScenarioTests/IotHubTests.ps1

@@ -29,6 +29,7 @@ function Test-AzureRmIotHubLifecycle
 	$Location = Get-Location "Microsoft.Devices" "IotHub" 
 	$IotHubName = getAssetName 
 	$ResourceGroupName = getAssetName 
+	$SubscriptionId = '91d12660-3dec-467a-be2a-213b5544ddc0'
 	$Sku = "B1"
 	$namespaceName = getAssetName 'eventHub'
 	$eventHubName = getAssetName
@@ -97,6 +98,8 @@ function Test-AzureRmIotHubLifecycle
 
 	Assert-True { $allIotHubsInResourceGroup.Count -eq 1 }
 	Assert-True { $iotHub.Name -eq $IotHubName }
+	Assert-True { $iotHub.Resourcegroup -eq $ResourceGroupName }
+	Assert-True { $iotHub.Subscriptionid -eq $SubscriptionId }
 	Assert-True { $iotHub.Properties.Routing.Routes.Count -eq 1}
     Assert-True { $iotHub.Properties.Routing.Routes[0].Name -eq "route"}
     Assert-True { $iotHub.Properties.Routing.Endpoints.EventHubs[0].Name -eq "eh1"}

src/IotHub/IotHub.Test/SessionRecords/Microsoft.Azure.Commands.IotHub.Test.ScenarioTests.IotHubTests/TestAzureIotHubLifeCycle.json

@@ -19,6 +19,7 @@
 -->
 ## Upcoming Release
 * Add new routing source: DigitalTwinChangeEvents
+* Minor bug fix: Get-AzIothub not returning subscriptionId 
 
 ## Version 1.3.0
 * Add support to invoke failover for an IotHub to the geo-paired disaster recovery region.

src/IotHub/IotHub/ChangeLog.md

@@ -299,6 +299,14 @@ public static string GetResourceGroupName(string Id)
             return m.Success ? m.Groups["rgname"].Value : null;
         }
 
+        public static string GetSubscriptionId(string Id)
+        {
+            if (string.IsNullOrEmpty(Id)) return null;
+            Regex r = new Regex(@"(.*?)/subscriptions/(?<subscriptionid>\S+)/resourcegroups/(.*?)", RegexOptions.IgnoreCase);
+            Match m = r.Match(Id);
+            return m.Success ? m.Groups["subscriptionid"].Value : null;
+        }
+
         public static string GetIotHubName(string Id)
         {
             if (string.IsNullOrEmpty(Id)) return null;

src/IotHub/IotHub/Common/IotHubUtils.cs

@@ -54,7 +54,14 @@ public class PSIotHub
         /// The subscription identifier.
         /// </summary>
         [JsonProperty(PropertyName = "subscriptionid")]
-        public string Subscriptionid { get; set; }
+        public string Subscriptionid
+        {
+            get
+            {
+                return IotHubUtils.GetSubscriptionId(Id);
+            }
+            set { }
+        }
 
         /// <summary>
         /// The resource group name uniquely identifies the resource group