fix add certificate issue microsoft/service-fabric-issues#932

a-santamaria · Oct 22, 2018 · a968fc4 · a968fc4
1 parent 16ac3df
commit a968fc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/ChangeLog.md b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/ChangeLog.md
@@ -20,7 +20,9 @@
 ## Current Release
 * Fix add certificate to Linux Vmss.
 
-* Fix `Add-AzureRmServiceFabricClusterCertificate` to display exception correctly (Azure/service-fabric-issues#1054).
+* Fix `Add-AzureRmServiceFabricClusterCertificate`
+    - Using correct thumbprint from new certificate (Azure/service-fabric-issues#932).
+    - Display exception correctly (Azure/service-fabric-issues#1054).
 
 * Fix `Update-AzureRmServiceFabricDurability` to update cluster configuration before starting Vmss CreateOrUpdate operation.
 

diff --git a/...er/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricClusterCertificateCmdlet.cs b/...er/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricClusterCertificateCmdlet.cs
@@ -632,7 +632,11 @@ private string GetThumbprintFromSecret(string secretUrl)
                                 jsonBlob.Password,
                                 X509KeyStorageFlags.Exportable);
 
-                            return certCollection[0].Thumbprint;
+                            var lastCert = certCollection.Count > 0 ? certCollection[certCollection.Count - 1] : null;
+                            if (lastCert?.Thumbprint != null)
+                            {
+                                return lastCert.Thumbprint;
+                            }
                         }
                     }
                 }