Updated help document, validation rules, and fixed two bugs in Set:

Pooja Adhikari · Pooja Adhikari · commit 77254e078475 · 2019-08-23T16:41:06.000-07:00
1. Modify the accesspolixcyObjectId
2. Enable/Disable SmartOnFhir And AllowCorsCredentials
diff --git a/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs b/src/HealthcareApis/HealthcareApis/HealthcareApis/NewAzureRmHealthcareApisService.cs
@@ -54,7 +54,7 @@ public class NewAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
         [Parameter(
            Mandatory = true,
            ValueFromPipelineByPropertyName = true,
-           HelpMessage = "HealthcareApis Fhir Service Location.")]
+           HelpMessage = "HealthcareApis Service Location.")]
         [ValidateNotNullOrEmpty]
         [LocationCompleter("Microsoft.HealthcareApis/services")]
         public string Location { get; set; }
@@ -94,14 +94,14 @@ public class NewAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
 
         [Parameter(
         Mandatory = false,
-        HelpMessage = "HealthcareApis Fhir Service List of Cors Header.")]
+        HelpMessage = "HealthcareApis Fhir Service List of Cors Header. Specify HTTP headers which can be used during the request. Use \" * \" for any header.")]
         [ValidateNotNullOrEmpty]
         public string[] CorsHeader { get; set; }
 
 
         [Parameter(
             Mandatory = false,
-            HelpMessage = "HealthcareApis Fhir Service Cors Max Age.")]
+            HelpMessage = "HealthcareApis Fhir Service Cors Max Age. Specify how long a result from a request can be cached in seconds. Example: 600 means 10 minutes.")]
         [ValidateNotNullOrEmpty]
         [ValidateRange(0,99999)]
         public int CorsMaxAge { get; set; }
@@ -110,11 +110,12 @@ public class NewAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
         Mandatory = false,
         HelpMessage = "HealthcareApis Fhir Service List of Cors Method.")]
         [ValidateNotNullOrEmpty]
+        [ValidateSet("DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT")]
         public string[] CorsMethod { get; set; }
 
         [Parameter(
             Mandatory = false,
-            HelpMessage = "HealthcareApis Fhir Service List of Cors Origin.")]
+            HelpMessage = "HealthcareApis Fhir Service List of Cors Origin. Specify URLs of origin sites that can access this API, or use \" * \" to allow access from any site.")]
         [ValidateNotNullOrEmpty]
         [ValidatePattern("^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$")]
         public string[] CorsOrigin { get; set; }
diff --git a/src/HealthcareApis/HealthcareApis/HealthcareApis/SetAzureRmHealthcareApisService.cs b/src/HealthcareApis/HealthcareApis/HealthcareApis/SetAzureRmHealthcareApisService.cs
@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.HealthcareApis.Common;
 using Microsoft.Azure.Commands.HealthcareApis.Models;
+using Microsoft.Azure.Commands.HealthcareApis.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.HealthcareApis;
 using Microsoft.Azure.Management.HealthcareApis.Models;
@@ -64,24 +65,30 @@ public class SetAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
         [ValidateNotNullOrEmpty]
         public SwitchParameter EnableSmartProxy { get; set; }
 
-        [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Origins.")]
-        [Parameter(Mandatory = false, ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Origins.")]
+        [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService DisableSmartProxy.")]
+        [Parameter(Mandatory = false, ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService DisableSmartProxy.")]
+        [ValidateNotNullOrEmpty]
+        public SwitchParameter DisableSmartProxy { get; set; }
+
+        [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Origins. Specify URLs of origin sites that can access this API, or use \" * \" to allow access from any site.")]
+        [Parameter(Mandatory = false, ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Origins. Specify URLs of origin sites that can access this API, or use \" * \" to allow access from any site.")]
         [ValidateNotNullOrEmpty]
         [ValidatePattern("^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$")]
         public string[] CorsOrigin { get; set; }
 
-        [Parameter(Mandatory = false,ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Headers.")]
-        [Parameter(Mandatory = false,ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Headers.")]
+        [Parameter(Mandatory = false,ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Headers. Specify HTTP headers which can be used during the request. Use \" * \" for any header.")]
+        [Parameter(Mandatory = false,ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService List of Cors Headers. Specify HTTP headers which can be used during the request. Use \" * \" for any header.")]
         [ValidateNotNullOrEmpty]
         public string[] CorsHeader { get; set; }
 
         [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet,HelpMessage = "HealthcareApis FhirService List of Cors Methods.")]
         [Parameter(Mandatory = false,ParameterSetName = ResourceIdParameterSet,HelpMessage = "HealthcareApis FhirService List of Cors Methods.")]
         [ValidateNotNullOrEmpty]
+        [ValidateSet("DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT")]
         public string[] CorsMethod { get; set; }
 
-        [Parameter(Mandatory = false,ParameterSetName = ServiceNameParameterSet,HelpMessage = "HealthcareApis FhirService Cors Max Age.")]
-        [Parameter(Mandatory = false,ParameterSetName = ResourceIdParameterSet,HelpMessage = "HealthcareApis FhirService Cors Max Age.")]
+        [Parameter(Mandatory = false,ParameterSetName = ServiceNameParameterSet,HelpMessage = "HealthcareApis FhirService Cors Max Age. Specify how long a result from a request can be cached in seconds. Example: 600 means 10 minutes.")]
+        [Parameter(Mandatory = false,ParameterSetName = ResourceIdParameterSet,HelpMessage = "HealthcareApis FhirService Cors Max Age. Specify how long a result from a request can be cached in seconds. Example: 600 means 10 minutes.")]
         [ValidateNotNullOrEmpty]
         [ValidateRange(0, 99999)]
         public int? CorsMaxAge { get; set; }
@@ -91,6 +98,11 @@ public class SetAzureRmHealthcareApisService : HealthcareApisBaseCmdlet
         [ValidateNotNullOrEmpty]
         public SwitchParameter AllowCorsCredential { get; set; }
 
+        [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet, HelpMessage = "HealthcareApis FhirService CorsCredentials Not Allowed.")]
+        [Parameter(Mandatory = false, ParameterSetName = ResourceIdParameterSet, HelpMessage = "HealthcareApis FhirService CorsCredentials Not Allowed.")]
+        [ValidateNotNullOrEmpty]
+        public SwitchParameter DisableCorsCredential { get; set; }
+
         [Parameter(Mandatory = false, ParameterSetName = ServiceNameParameterSet, HelpMessage = "List of Access Policy Object IDs.")]
         [Parameter(Mandatory = false, ParameterSetName = ResourceIdParameterSet, HelpMessage = "List of Access Policy Object IDs.")]
         [ValidateNotNullOrEmpty]
@@ -135,19 +147,21 @@ public override void ExecuteCmdlet()
                     case ServiceNameParameterSet:
                         {
                             List<ServiceAccessPolicyEntry> accessPolicies = new List<ServiceAccessPolicyEntry>();
+                            var healthcareApisAccount = this.HealthcareApisClient.Services.Get(this.ResourceGroupName, this.Name);
+
                             if (AccessPolicyObjectId != null && AccessPolicyObjectId.Length > 0)
                             {
                                 foreach (string objectId in AccessPolicyObjectId)
                                 {
                                     accessPolicies.Add(new ServiceAccessPolicyEntry(objectId));
                                 }
                             }
-
-                            var healthcareApisAccount = this.HealthcareApisClient.Services.Get(this.ResourceGroupName, this.Name);
-
-                            foreach (ServiceAccessPolicyEntry objectId in healthcareApisAccount.Properties.AccessPolicies)
+                            else
                             {
-                                accessPolicies.Add(objectId);
+                                foreach (ServiceAccessPolicyEntry objectId in healthcareApisAccount.Properties.AccessPolicies)
+                                {
+                                    accessPolicies.Add(objectId);
+                                }
                             }
 
                             ServicesDescription servicesDescription = GenerateServiceDescription(healthcareApisAccount, accessPolicies);
@@ -161,6 +175,7 @@ public override void ExecuteCmdlet()
                             string rgName = null;
                             string name = null;
                             ValidateAndExtractName(this.ResourceId, out rgName, out name);
+                            var healthcareApisAccount = this.HealthcareApisClient.Services.Get(rgName, name);
 
                             List<ServiceAccessPolicyEntry> accessPolicies = new List<ServiceAccessPolicyEntry>();
                             if (AccessPolicyObjectId != null && AccessPolicyObjectId.Length > 0)
@@ -170,12 +185,12 @@ public override void ExecuteCmdlet()
                                     accessPolicies.Add(new ServiceAccessPolicyEntry(objectId));
                                 }
                             }
-
-                            var healthcareApisAccount = this.HealthcareApisClient.Services.Get(rgName, name);
-
-                            foreach (ServiceAccessPolicyEntry objectId in healthcareApisAccount.Properties.AccessPolicies)
+                            else
                             {
-                                accessPolicies.Add(objectId);
+                                foreach (ServiceAccessPolicyEntry objectId in healthcareApisAccount.Properties.AccessPolicies)
+                                {
+                                    accessPolicies.Add(objectId);
+                                }
                             }
 
                             ServicesDescription servicesDescription = GenerateServiceDescription(healthcareApisAccount, accessPolicies);
@@ -201,12 +216,6 @@ public override void ExecuteCmdlet()
                             var healthcareApisAccount = this.HealthcareApisClient.Services.Get(InputObject.ResourceGroupName,
                                              InputObject.Name);
 
-                            foreach (ServiceAccessPolicyEntry objectId in healthcareApisAccount.Properties.AccessPolicies)
-                            {
-                                accessPolicies.Add(objectId);
-                            }
-
-                           
 
                             ServicesDescription servicesDescription = InputObjectToServiceDescription(healthcareApisAccount,accessPolicies);
                             var healthcareApisFhirServiceUpdateAccount = this.HealthcareApisClient.Services.CreateOrUpdate(
@@ -232,7 +241,7 @@ private ServicesDescription GenerateServiceDescription(ServicesDescription healt
                     {
                         Authority = Authority ?? healthcareApisAccount.Properties.AuthenticationConfiguration.Authority,
                         Audience = Audience ?? healthcareApisAccount.Properties.AuthenticationConfiguration.Audience,
-                        SmartProxyEnabled = EnableSmartProxy.ToBool() != healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled ? healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled : this.EnableSmartProxy.ToBool()
+                        SmartProxyEnabled = IsSmartOnFhirEnabled(healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled)
                     },
                     CosmosDbConfiguration = new ServiceCosmosDbConfigurationInfo()
                     {
@@ -244,14 +253,48 @@ private ServicesDescription GenerateServiceDescription(ServicesDescription healt
                         Headers = CorsHeader ?? healthcareApisAccount.Properties.CorsConfiguration.Headers,
                         Methods = CorsMethod ?? healthcareApisAccount.Properties.CorsConfiguration.Methods,
                         MaxAge = CorsMaxAge ?? healthcareApisAccount.Properties.CorsConfiguration.MaxAge,
-                        AllowCredentials = AllowCorsCredential != healthcareApisAccount.Properties.CorsConfiguration.AllowCredentials ? healthcareApisAccount.Properties.CorsConfiguration.AllowCredentials : this.AllowCorsCredential.ToBool()
+                        AllowCredentials = IsCorsCredentialsAllowed(healthcareApisAccount.Properties.CorsConfiguration.AllowCredentials)
                     },
                     AccessPolicies = accessPolicies
                 },
                 Kind = healthcareApisAccount.Kind
             };
         }
 
+        private bool? IsSmartOnFhirEnabled(bool? currentSmartOnFhirValue)
+        {
+            if (EnableSmartProxy.IsPresent && DisableSmartProxy.IsPresent)
+            {
+                throw new PSArgumentException(Resources.updatedService_InvalidSmartOnProxyInput);
+            }
+            else if (EnableSmartProxy.IsPresent)
+            {
+                return true;
+            }
+            else if (DisableSmartProxy.IsPresent)
+            {
+                return false;
+            }
+            return currentSmartOnFhirValue;
+        }
+
+        private bool? IsCorsCredentialsAllowed(bool? currentAllowCorsCrendentialsValue)
+        {
+            if (AllowCorsCredential.IsPresent && DisableCorsCredential.IsPresent)
+            {
+                throw new PSArgumentException(Resources.updatedService_InvalidAllowCorsCredentialsInput);
+            }
+            else if (AllowCorsCredential.IsPresent)
+            {
+                return true;
+            }
+            else if (DisableCorsCredential.IsPresent)
+            {
+                return false;
+            }
+            return currentAllowCorsCrendentialsValue;
+        }
+
         private ServicesDescription InputObjectToServiceDescription(ServicesDescription healthcareApisAccount, List<ServiceAccessPolicyEntry> accessPolicies)
         {
             return new ServicesDescription()
@@ -263,7 +306,7 @@ private ServicesDescription InputObjectToServiceDescription(ServicesDescription
                     {
                         Authority = InputObject.Properties.AuthenticationConfiguration.Authority?? healthcareApisAccount.Properties.AuthenticationConfiguration.Authority,
                         Audience = InputObject.Properties.AuthenticationConfiguration.Audience ?? healthcareApisAccount.Properties.AuthenticationConfiguration.Audience,
-                        SmartProxyEnabled = InputObject.Properties.AuthenticationConfiguration.SmartProxyEnabled != healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled ? InputObject.Properties.AuthenticationConfiguration.SmartProxyEnabled : healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled
+                        SmartProxyEnabled = InputObject.Properties.AuthenticationConfiguration.SmartProxyEnabled !=healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled ? InputObject.Properties.AuthenticationConfiguration.SmartProxyEnabled : healthcareApisAccount.Properties.AuthenticationConfiguration.SmartProxyEnabled
                     },
                     CosmosDbConfiguration = new ServiceCosmosDbConfigurationInfo()
                     {
diff --git a/src/HealthcareApis/HealthcareApis/Properties/Resources.Designer.cs b/src/HealthcareApis/HealthcareApis/Properties/Resources.Designer.cs
diff --git a/src/HealthcareApis/HealthcareApis/Properties/Resources.resx b/src/HealthcareApis/HealthcareApis/Properties/Resources.resx
@@ -132,4 +132,10 @@
   <data name="RemoveService_ProcessMessage" xml:space="preserve">
     <value>Removing service</value>
   </data>
+  <data name="updatedService_InvalidAllowCorsCredentialsInput" xml:space="preserve">
+    <value>AllowCorsCredentials and DisableCorsCredentials are mutually exclusive parameters. Please specify only one parameter.</value>
+  </data>
+  <data name="updatedService_InvalidSmartOnProxyInput" xml:space="preserve">
+    <value>EnableSmartProxy and DisableSmartProxy are mutually exclusive parameters. Please specify only one</value>
+  </data>
 </root>
diff --git a/src/HealthcareApis/HealthcareApis/help/New-AzHealthcareApisService.md b/src/HealthcareApis/HealthcareApis/help/New-AzHealthcareApisService.md
@@ -122,7 +122,7 @@ Accept wildcard characters: False
 ```
 
 ### -CorsHeader
-HealthcareApis Fhir Service List of Cors Header.
+HealthcareApis Fhir Service List of Cors Header. Specify HTTP headers which can be used during the request. Use * for any header.
 
 ```yaml
 Type: System.String[]
@@ -137,7 +137,7 @@ Accept wildcard characters: False
 ```
 
 ### -CorsMaxAge
-HealthcareApis Fhir Service Cors Max Age.
+HealthcareApis Fhir Service Cors Max Age. Specify how long a result from a request can be cached in seconds. Example: 600 means 10 minutes.
 
 ```yaml
 Type: System.Int32
@@ -158,6 +158,7 @@ HealthcareApis Fhir Service List of Cors Method.
 Type: System.String[]
 Parameter Sets: (All)
 Aliases:
+Accepted values: DELETE, GET, OPTIONS, PATCH, POST, PUT
 
 Required: False
 Position: Named
@@ -167,7 +168,7 @@ Accept wildcard characters: False
 ```
 
 ### -CorsOrigin
-HealthcareApis Fhir Service List of Cors Origin.
+HealthcareApis Fhir Service List of Cors Origin. Specify URLs of origin sites that can access this API, or use * to allow access from any site.
 
 ```yaml
 Type: System.String[]
@@ -258,7 +259,7 @@ Accept wildcard characters: False
 ```
 
 ### -Location
-HealthcareApis Fhir Service Location.
+HealthcareApis Service Location.
 
 ```yaml
 Type: System.String
diff --git a/src/HealthcareApis/HealthcareApis/help/Set-AzHealthcareApisService.md b/src/HealthcareApis/HealthcareApis/help/Set-AzHealthcareApisService.md
