Merge pull request Azure#9976 from poadhika/master

Bug fix regarding Get-AzHealthcareApisService not showing accurate fhir type

Author: cormacpayne

src/HealthcareApis/HealthcareApis.Test/ScenarioTests/HealthcareApisServiceTests.ps1

@@ -47,6 +47,7 @@ function Test-AzRmHealthcareApisService{
 		# Assert
 		Assert-AreEqual $actual.Name $rname
 		Assert-AreEqual $actual.Properties.CosmosDbConfiguration.OfferThroughput $offerThroughput
+		Assert-AreEqual $actual.Kind $kind
 		#Update using parameters
 		$newOfferThroughput = $offerThroughput - 600
 		$updated = Set-AzHealthcareApisService -ResourceId $actual.Id -CosmosOfferThroughput $newOfferThroughput;

src/HealthcareApis/HealthcareApis.Test/SessionRecords/Microsoft.Azure.Commands.HealthcareApisService.Test.ScenarioTests.HealthcareApisServiceTests/TestAzRmHealthcareApisService.json

@@ -22,6 +22,7 @@
 * Added Error Handling in all cmdlets
 * Fixed few typos
 * Enable Set-AzHealthcareApisService to allow updating tags.
+* Fixed bug around inaccurate kind
 
 ## Version 0.1.0
 

src/HealthcareApis/HealthcareApis/ChangeLog.md

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.HealthcareApis.Models;
+using Microsoft.Azure.Commands.HealthcareApis.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Graph.RBAC.Version1_6.ActiveDirectory;
 using Microsoft.Azure.Management.HealthcareApis;
@@ -193,5 +194,25 @@ public static ErrorRecord WriteErrorforBadrequest(ErrorDetailsException ex)
                 return new ErrorRecord(emptyEx, "Response object was empty", ErrorCategory.OpenError, emptyEx);
             }
         }
+
+        public static Kind ParseKind(string kind)
+        {
+            if (kind.Equals("fhir", StringComparison.OrdinalIgnoreCase))
+            {
+                return Management.HealthcareApis.Models.Kind.Fhir;
+            }
+            else if (kind.Equals("fhir-stu3", StringComparison.OrdinalIgnoreCase) || kind.Equals("stu3", StringComparison.OrdinalIgnoreCase))
+            {
+                return Management.HealthcareApis.Models.Kind.FhirStu3;
+            }
+            else if (kind.Equals("fhir-r4", StringComparison.OrdinalIgnoreCase) || kind.Equals("r4", StringComparison.OrdinalIgnoreCase))
+            {
+                return Management.HealthcareApis.Models.Kind.FhirR4;
+            }
+            else
+            {
+                throw new PSArgumentException(Resources.createService_InvalidKindMessage);
+            }
+        }
     }
 }

src/HealthcareApis/HealthcareApis/Common/HealthcareApisBaseCmdlet.cs

@@ -248,26 +248,6 @@ private Kind ParseKindFromVersion(string fhirVersion)
             return ParseKind(FhirVersion);
         }
 
-        private Kind ParseKind(string kind)
-        {
-            if (kind.Equals("fhir", StringComparison.OrdinalIgnoreCase))
-            {
-                return Management.HealthcareApis.Models.Kind.Fhir;
-            }
-            else if (kind.Equals("fhir-stu3", StringComparison.OrdinalIgnoreCase) || kind.Equals("stu3", StringComparison.OrdinalIgnoreCase))
-            {
-                return Management.HealthcareApis.Models.Kind.FhirStu3;
-            }
-            else if (kind.Equals("fhir-r4", StringComparison.OrdinalIgnoreCase) || kind.Equals("r4", StringComparison.OrdinalIgnoreCase))
-            {
-                return Management.HealthcareApis.Models.Kind.FhirR4;
-            }
-            else
-            {
-                throw new PSArgumentException(Resources.createService_InvalidKindMessage);
-            }
-        }
-
         private int? GetCosmosDBThroughput()
         {
             if (CosmosOfferThroughput == null)

src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs

@@ -345,7 +345,7 @@ private ServicesDescription InputObjectToServiceDescription(ServicesDescription
                     },
                     AccessPolicies = accessPolicies
                 },
-                Kind = InputObject.Kind,
+                Kind = ParseKind(InputObject.Kind),
                 Tags = InputObject.Tags
             };
         }

src/HealthcareApis/HealthcareApis/HealthcareApis/SetAzureRmHealthcareApisService.cs

@@ -30,7 +30,7 @@ public PSHealthcareApisService(ServicesDescription serviceDescription)
             this.Tags = serviceDescription.Tags;
             this.Properties = new PSHealthcareApisServiceConfig(serviceDescription.Properties);
             this.Etag = serviceDescription.Etag;
-            this.Kind = serviceDescription.Kind;
+            this.Kind = GetKindValue(serviceDescription.Kind);
         }
 
         public string ResourceGroupName { get; private set; }
@@ -43,7 +43,7 @@ public PSHealthcareApisService(ServicesDescription serviceDescription)
 
         public string ResourceType { get; private set; }
 
-        public Kind Kind { get; private set; }
+        public string Kind { get; private set; }
 
         public IDictionary<string, string> Tags { get; private set; }
 
@@ -68,6 +68,18 @@ private static string ParseResourceGroupFromId(string idFromServer)
             return null;
         }
 
-
+        private static string GetKindValue(Kind kind)
+        {
+            switch (kind)
+            {
+                case Management.HealthcareApis.Models.Kind.Fhir:
+                    return "fhir";
+                case Management.HealthcareApis.Models.Kind.FhirStu3:
+                    return "fhir-Stu3";
+                case Management.HealthcareApis.Models.Kind.FhirR4:
+                    return "fhir-R4";
+            }
+            return null;
+        }
     }
 }