Merge pull request #3947 from chingchenmsft/release-4.0.1

Fix md file and bugs

Author: markcowl

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/AddAzureRmServiceFabricClientCertificate.cs

@@ -55,7 +55,8 @@ public override void ExecuteCmdlet()
 
                             var patchRequest = new ClusterUpdateParameters
                             {
-                                ClientCertificateThumbprints = allCertThumbprints
+                                ClientCertificateThumbprints = allCertThumbprints,
+                                ClientCertificateCommonNames = cluster.ClientCertificateCommonNames
                             };
 
                             var psCluster = SendPatchRequest(patchRequest);
@@ -76,7 +77,8 @@ public override void ExecuteCmdlet()
 
                             var patchRequest = new ClusterUpdateParameters
                             {
-                                ClientCertificateCommonNames = allNewCommonNames
+                                ClientCertificateCommonNames = allNewCommonNames,
+                                ClientCertificateThumbprints = cluster.ClientCertificateThumbprints
                             };
 
                             var psCluster = SendPatchRequest(patchRequest);

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/RemoveAzureRmServiceFabricClientCertificate.cs

@@ -79,7 +79,8 @@ public override void ExecuteCmdlet()
 
                         var patchRequest = new ClusterUpdateParameters
                         {
-                            ClientCertificateThumbprints = thumbprintList
+                            ClientCertificateThumbprints = thumbprintList ,
+                            ClientCertificateCommonNames = cluster.ClientCertificateCommonNames
                         };
 
                         var psCluster = SendPatchRequest(patchRequest);
@@ -128,7 +129,8 @@ public override void ExecuteCmdlet()
 
                         var patchRequest = new ClusterUpdateParameters
                         {
-                            ClientCertificateCommonNames = commonNames
+                            ClientCertificateCommonNames = commonNames,
+                            ClientCertificateThumbprints = cluster.ClientCertificateThumbprints
                         };
 
                         var psCluster = SendPatchRequest(patchRequest);

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricClientCertificateBase.cs

@@ -96,7 +96,7 @@ protected List<ClientCertificateThumbprint> ParseArgumentsForThumbprint()
                     {
 
                         if ((this.AdminClientThumbprint == null || !this.AdminClientThumbprint.Any()) &&
-                            (this.ReadonlyClientThumbprint == null) || !this.ReadonlyClientThumbprint.Any())
+                           (this.ReadonlyClientThumbprint == null || !this.ReadonlyClientThumbprint.Any()))
                         {
                             throw new PSArgumentException(
                                 "Both AdminClientThumbprints and ReadonlyClientThumbprints are empty");

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricCmdletBase.cs

@@ -460,22 +460,19 @@ protected string GetCurrentUserObjectId()
 
                 objectId = user.ObjectId;
             }
-            catch (GraphErrorException e)
+            catch (GraphErrorException)
             {
-                if (e.Body != null && e.Body.Code == "Authorization_RequestDenied")
-                {
-                    var user = GraphClient.ServicePrincipals.List(
-                        new Rest.Azure.OData.ODataQuery<ServicePrincipal>(
-                            string.Format("$filter=servicePrincipalNames/any(c: c eq '{0}')", DefaultContext.Account.Id))
-                        ).FirstOrDefault();
-
-                    if (user == null)
-                    {
-                        return null;
-                    }
+                var user = GraphClient.ServicePrincipals.List(
+                    new Rest.Azure.OData.ODataQuery<ServicePrincipal>(
+                        string.Format("$filter=servicePrincipalNames/any(c: c eq '{0}')", DefaultContext.Account.Id))
+                    ).FirstOrDefault();
 
-                    objectId = user.ObjectId;
+                if (user == null)
+                {
+                    return null;
                 }
+
+                objectId = user.ObjectId;  
             }
 
             return objectId;

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/help/Add-AzureRmServiceFabricNode.md

@@ -23,7 +23,7 @@ Use **Add-AzureRmServiceFabricNode** to add nodes to the specific node type. You
 
 ### Example 1
 ```
-PS c:> Add-AzureRmServiceFabricNode -ResourceGroupName 'Group1' -Name 'Contoso01SFCluster' -NumberOfNodesToAdd 2 -NodeTypeName 'nt1''
+PS c:> Add-AzureRmServiceFabricNode -ResourceGroupName 'Group1' -Name 'Contoso01SFCluster' -NumberOfNodesToAdd 2 -NodeTypeName 'nt1'
 ```
 
 This command will add 2 nodes to the node type 'n1'.

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/help/New-AzureRmServiceFabricCluster.md

@@ -61,7 +61,7 @@ $pfxfolder="c:\Mycertificates\"
 
 Write-Output "create cluster in " $clusterloc "subject name for cert " $subname "and output the cert into " $pfxfolder
 
-New-AzureRmServiceFabricCluster -ResourceGroupName $RGname -Location $clusterloc -ClusterSize 3 -VmPassword $pwd -CertificateSubjectName $subname -PfxOutputFolder $pfxfolder -CertificatePassword $pwd
+New-AzureRmServiceFabricCluster -ResourceGroupName $RGname -Location $clusterloc -ClusterSize 3 -VmPassword $pwd -CertificateSubjectName $subname -CertificateOutputFolder $pfxfolder -CertificatePassword $pwd
 ```
 
 This command specifies only the cluster size, the cert subject name, and the OS to deploy a cluster.